summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-08-06 13:56:38 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-08-06 13:56:38 +0000
commit5dcdb1d1c3e2fd3b3f71d7d418938bf83a17134c (patch)
tree17a7f72c151618bc0c227ada701df44d03672799
parent4a36b515ed656ccdaffe01af527524503d2d7bf3 (diff)
NOTE: with this change, I have also removed PORT_START and renamed
PORT_START_TAG to PORT_START. From: Fabio Priuli [mailto:doge.fabio@gmail.com] Subject: let's say goodbye to untagged input ports ;) Hi, enclosed please find a few patches against 126u3 source * port01.diff -> port09.diff : these patches continues the cleanup of inputs in drivers starting with C (the remaining ones), D and E. No ambiguous situations this time, so I guess there should be no problem with the changes. Improvements include conditional dips added to dynduke and diplocations for chinagat, chqflag, circus, citycon, cloak, contra and dynduke * tag01.diff -> tag09.diff : these patches add tag to EVERY input port in drivers starting with F->Z. Notice that only tags are added, no AM_READ_PORT, nor PORT_INCLUDE (and I saw a lot of drivers would need it ;) ), nor other cleanups contained in the patches above. I'll keep cleaning input next week, probably, but at least we can definitely remove the untagged version of PORT_START :) Notice I was able to compile the source commenting out the definition of PORT_START, so I guess every occurrence is covered...
-rw-r--r--src/emu/inptport.c4
-rw-r--r--src/emu/inptport.h9
-rw-r--r--src/emu/machine/microtch.c6
-rw-r--r--src/mame/audio/atarijsa.c6
-rw-r--r--src/mame/audio/gottlieb.c4
-rw-r--r--src/mame/audio/seibu.h2
-rw-r--r--src/mame/drivers/1942.c10
-rw-r--r--src/mame/drivers/1943.c10
-rw-r--r--src/mame/drivers/1945kiii.c6
-rw-r--r--src/mame/drivers/20pacgal.c6
-rw-r--r--src/mame/drivers/40love.c12
-rw-r--r--src/mame/drivers/4enraya.c6
-rw-r--r--src/mame/drivers/8080bw.c52
-rw-r--r--src/mame/drivers/88games.c10
-rw-r--r--src/mame/drivers/ace.c26
-rw-r--r--src/mame/drivers/acefruit.c38
-rw-r--r--src/mame/drivers/acommand.c4
-rw-r--r--src/mame/drivers/actfancr.c10
-rw-r--r--src/mame/drivers/aeroboto.c8
-rw-r--r--src/mame/drivers/aerofgt.c56
-rw-r--r--src/mame/drivers/airbustr.c10
-rw-r--r--src/mame/drivers/ajax.c12
-rw-r--r--src/mame/drivers/aleck64.c30
-rw-r--r--src/mame/drivers/alg.c24
-rw-r--r--src/mame/drivers/aliens.c10
-rw-r--r--src/mame/drivers/alpha68k.c112
-rw-r--r--src/mame/drivers/ambush.c6
-rw-r--r--src/mame/drivers/ampoker2.c64
-rw-r--r--src/mame/drivers/amspdwy.c14
-rw-r--r--src/mame/drivers/angelkds.c28
-rw-r--r--src/mame/drivers/appoooh.c8
-rw-r--r--src/mame/drivers/aquarium.c8
-rw-r--r--src/mame/drivers/arabian.c16
-rw-r--r--src/mame/drivers/arcadecl.c32
-rw-r--r--src/mame/drivers/arcadia.c16
-rw-r--r--src/mame/drivers/argus.c10
-rw-r--r--src/mame/drivers/arkanoid.c22
-rw-r--r--src/mame/drivers/armedf.c8
-rw-r--r--src/mame/drivers/artmagic.c16
-rw-r--r--src/mame/drivers/ashnojoe.c6
-rw-r--r--src/mame/drivers/asterix.c4
-rw-r--r--src/mame/drivers/asteroid.c26
-rw-r--r--src/mame/drivers/astinvad.c16
-rw-r--r--src/mame/drivers/astrocde.c92
-rw-r--r--src/mame/drivers/astrocorp.c2
-rw-r--r--src/mame/drivers/astrof.c60
-rw-r--r--src/mame/drivers/asuka.c32
-rw-r--r--src/mame/drivers/atarifb.c46
-rw-r--r--src/mame/drivers/atarig1.c24
-rw-r--r--src/mame/drivers/atarig42.c20
-rw-r--r--src/mame/drivers/atarigt.c24
-rw-r--r--src/mame/drivers/atarigx2.c42
-rw-r--r--src/mame/drivers/atarisy1.c60
-rw-r--r--src/mame/drivers/atarisy2.c26
-rw-r--r--src/mame/drivers/ataxx.c62
-rw-r--r--src/mame/drivers/atetris.c4
-rw-r--r--src/mame/drivers/attckufo.c4
-rw-r--r--src/mame/drivers/avalnche.c6
-rw-r--r--src/mame/drivers/aztarac.c8
-rw-r--r--src/mame/drivers/backfire.c14
-rw-r--r--src/mame/drivers/badlands.c10
-rw-r--r--src/mame/drivers/bagman.c12
-rw-r--r--src/mame/drivers/balsente.c20
-rw-r--r--src/mame/drivers/bankp.c8
-rw-r--r--src/mame/drivers/baraduke.c12
-rw-r--r--src/mame/drivers/batman.c6
-rw-r--r--src/mame/drivers/battlane.c8
-rw-r--r--src/mame/drivers/battlera.c10
-rw-r--r--src/mame/drivers/battlex.c8
-rw-r--r--src/mame/drivers/battlnts.c10
-rw-r--r--src/mame/drivers/bbusters.c38
-rw-r--r--src/mame/drivers/beaminv.c8
-rw-r--r--src/mame/drivers/beathead.c8
-rw-r--r--src/mame/drivers/beezer.c10
-rw-r--r--src/mame/drivers/berzerk.c32
-rw-r--r--src/mame/drivers/bestleag.c10
-rw-r--r--src/mame/drivers/bfcobra.c18
-rw-r--r--src/mame/drivers/bfm_sc2.c26
-rw-r--r--src/mame/drivers/bigevglf.c16
-rw-r--r--src/mame/drivers/bigfghtr.c8
-rw-r--r--src/mame/drivers/bigstrkb.c10
-rw-r--r--src/mame/drivers/bionicc.c8
-rw-r--r--src/mame/drivers/bishi.c12
-rw-r--r--src/mame/drivers/bishjan.c18
-rw-r--r--src/mame/drivers/bking.c18
-rw-r--r--src/mame/drivers/blackt96.c12
-rw-r--r--src/mame/drivers/bladestl.c18
-rw-r--r--src/mame/drivers/blktiger.c14
-rw-r--r--src/mame/drivers/blmbycar.c12
-rw-r--r--src/mame/drivers/blockade.c48
-rw-r--r--src/mame/drivers/blockhl.c10
-rw-r--r--src/mame/drivers/blockout.c10
-rw-r--r--src/mame/drivers/bloodbro.c12
-rw-r--r--src/mame/drivers/blstroid.c8
-rw-r--r--src/mame/drivers/blueprnt.c8
-rw-r--r--src/mame/drivers/bmcbowl.c8
-rw-r--r--src/mame/drivers/bnstars.c14
-rw-r--r--src/mame/drivers/bogeyman.c8
-rw-r--r--src/mame/drivers/bombjack.c10
-rw-r--r--src/mame/drivers/boogwing.c6
-rw-r--r--src/mame/drivers/bottom9.c10
-rw-r--r--src/mame/drivers/boxer.c20
-rw-r--r--src/mame/drivers/brkthru.c8
-rw-r--r--src/mame/drivers/bsktball.c14
-rw-r--r--src/mame/drivers/btime.c92
-rw-r--r--src/mame/drivers/btoads.c12
-rw-r--r--src/mame/drivers/bublbobl.c28
-rw-r--r--src/mame/drivers/buggychl.c12
-rw-r--r--src/mame/drivers/bwidow.c40
-rw-r--r--src/mame/drivers/bwing.c16
-rw-r--r--src/mame/drivers/bzone.c32
-rw-r--r--src/mame/drivers/cabal.c28
-rw-r--r--src/mame/drivers/calomega.c108
-rw-r--r--src/mame/drivers/calorie.c10
-rw-r--r--src/mame/drivers/canyon.c14
-rw-r--r--src/mame/drivers/capbowl.c10
-rw-r--r--src/mame/drivers/cardline.c6
-rw-r--r--src/mame/drivers/carjmbre.c6
-rw-r--r--src/mame/drivers/carpolo.c16
-rw-r--r--src/mame/drivers/carrera.c12
-rw-r--r--src/mame/drivers/cave.c18
-rw-r--r--src/mame/drivers/cball.c12
-rw-r--r--src/mame/drivers/cbasebal.c6
-rw-r--r--src/mame/drivers/cbuster.c6
-rw-r--r--src/mame/drivers/ccastles.c12
-rw-r--r--src/mame/drivers/cchasm.c8
-rw-r--r--src/mame/drivers/cclimber.c62
-rw-r--r--src/mame/drivers/centiped.c94
-rw-r--r--src/mame/drivers/chaknpop.c20
-rw-r--r--src/mame/drivers/cham24.c4
-rw-r--r--src/mame/drivers/champbas.c110
-rw-r--r--src/mame/drivers/champbwl.c12
-rw-r--r--src/mame/drivers/changela.c16
-rw-r--r--src/mame/drivers/cheekyms.c10
-rw-r--r--src/mame/drivers/cherrym.c28
-rw-r--r--src/mame/drivers/cherrym2.c22
-rw-r--r--src/mame/drivers/chinagat.c43
-rw-r--r--src/mame/drivers/chinsan.c28
-rw-r--r--src/mame/drivers/chqflag.c57
-rw-r--r--src/mame/drivers/cidelsa.c22
-rw-r--r--src/mame/drivers/cinemat.c74
-rw-r--r--src/mame/drivers/circus.c86
-rw-r--r--src/mame/drivers/circusc.c20
-rw-r--r--src/mame/drivers/cischeat.c74
-rw-r--r--src/mame/drivers/citycon.c63
-rw-r--r--src/mame/drivers/clayshoo.c14
-rw-r--r--src/mame/drivers/cliffhgr.c42
-rw-r--r--src/mame/drivers/cloak.c32
-rw-r--r--src/mame/drivers/cloud9.c20
-rw-r--r--src/mame/drivers/clshroad.c92
-rw-r--r--src/mame/drivers/cninja.c26
-rw-r--r--src/mame/drivers/cntsteer.c56
-rw-r--r--src/mame/drivers/coinmstr.c70
-rw-r--r--src/mame/drivers/cojag.c195
-rw-r--r--src/mame/drivers/combatsc.c42
-rw-r--r--src/mame/drivers/commando.c52
-rw-r--r--src/mame/drivers/compgolf.c32
-rw-r--r--src/mame/drivers/contra.c49
-rw-r--r--src/mame/drivers/coolpool.c26
-rw-r--r--src/mame/drivers/cop01.c38
-rw-r--r--src/mame/drivers/copsnrob.c16
-rw-r--r--src/mame/drivers/cosmic.c78
-rw-r--r--src/mame/drivers/couple.c107
-rw-r--r--src/mame/drivers/cowrace.c2
-rw-r--r--src/mame/drivers/cps1.c407
-rw-r--r--src/mame/drivers/cps2.c18
-rw-r--r--src/mame/drivers/cps3.c18
-rw-r--r--src/mame/drivers/crbaloon.c14
-rw-r--r--src/mame/drivers/crgolf.c18
-rw-r--r--src/mame/drivers/crimfght.c48
-rw-r--r--src/mame/drivers/crospang.c68
-rw-r--r--src/mame/drivers/crshrace.c224
-rw-r--r--src/mame/drivers/crystal.c93
-rw-r--r--src/mame/drivers/cshooter.c12
-rw-r--r--src/mame/drivers/csk.c54
-rw-r--r--src/mame/drivers/cubocd32.c25
-rw-r--r--src/mame/drivers/cultures.c64
-rw-r--r--src/mame/drivers/cvs.c14
-rw-r--r--src/mame/drivers/cyberbal.c22
-rw-r--r--src/mame/drivers/cybertnk.c53
-rw-r--r--src/mame/drivers/dacholer.c26
-rw-r--r--src/mame/drivers/dambustr.c12
-rw-r--r--src/mame/drivers/darius.c12
-rw-r--r--src/mame/drivers/darkhors.c36
-rw-r--r--src/mame/drivers/darkmist.c26
-rw-r--r--src/mame/drivers/darkseal.c148
-rw-r--r--src/mame/drivers/dassault.c123
-rw-r--r--src/mame/drivers/dblewing.c24
-rw-r--r--src/mame/drivers/dbz.c222
-rw-r--r--src/mame/drivers/dcheese.c36
-rw-r--r--src/mame/drivers/dcon.c92
-rw-r--r--src/mame/drivers/dday.c56
-rw-r--r--src/mame/drivers/ddayjlc.c8
-rw-r--r--src/mame/drivers/ddenlovr.c464
-rw-r--r--src/mame/drivers/ddragon.c30
-rw-r--r--src/mame/drivers/ddragon3.c82
-rw-r--r--src/mame/drivers/ddrible.c24
-rw-r--r--src/mame/drivers/deadang.c16
-rw-r--r--src/mame/drivers/dec0.c68
-rw-r--r--src/mame/drivers/dec8.c120
-rw-r--r--src/mame/drivers/deco156.c8
-rw-r--r--src/mame/drivers/deco32.c56
-rw-r--r--src/mame/drivers/deco_mlc.c4
-rw-r--r--src/mame/drivers/decocass.c22
-rw-r--r--src/mame/drivers/deniam.c69
-rw-r--r--src/mame/drivers/destroyr.c8
-rw-r--r--src/mame/drivers/dgpix.c8
-rw-r--r--src/mame/drivers/dietgo.c6
-rw-r--r--src/mame/drivers/discoboy.c66
-rw-r--r--src/mame/drivers/diverboy.c14
-rw-r--r--src/mame/drivers/djboy.c10
-rw-r--r--src/mame/drivers/djmain.c915
-rw-r--r--src/mame/drivers/dkong.c76
-rw-r--r--src/mame/drivers/dlair.c70
-rw-r--r--src/mame/drivers/dmndrby.c2
-rw-r--r--src/mame/drivers/docastle.c253
-rw-r--r--src/mame/drivers/dogfgt.c16
-rw-r--r--src/mame/drivers/dominob.c22
-rw-r--r--src/mame/drivers/dooyong.c231
-rw-r--r--src/mame/drivers/dorachan.c16
-rw-r--r--src/mame/drivers/dotrikun.c4
-rw-r--r--src/mame/drivers/dragrace.c18
-rw-r--r--src/mame/drivers/dreamwld.c140
-rw-r--r--src/mame/drivers/drgnmst.c20
-rw-r--r--src/mame/drivers/dribling.c8
-rw-r--r--src/mame/drivers/drmicro.c17
-rw-r--r--src/mame/drivers/drtomy.c16
-rw-r--r--src/mame/drivers/dunhuang.c22
-rw-r--r--src/mame/drivers/dwarfd.c13
-rw-r--r--src/mame/drivers/dynadice.c15
-rw-r--r--src/mame/drivers/dynax.c276
-rw-r--r--src/mame/drivers/dynduke.c172
-rw-r--r--src/mame/drivers/egghunt.c24
-rw-r--r--src/mame/drivers/embargo.c18
-rw-r--r--src/mame/drivers/enigma2.c28
-rw-r--r--src/mame/drivers/eolith.c6
-rw-r--r--src/mame/drivers/eolith16.c18
-rw-r--r--src/mame/drivers/epos.c40
-rw-r--r--src/mame/drivers/eprom.c34
-rw-r--r--src/mame/drivers/equites.c46
-rw-r--r--src/mame/drivers/ertictac.c72
-rw-r--r--src/mame/drivers/esd16.c32
-rw-r--r--src/mame/drivers/esh.c8
-rw-r--r--src/mame/drivers/espial.c32
-rw-r--r--src/mame/drivers/ettrivia.c6
-rw-r--r--src/mame/drivers/exedexes.c20
-rw-r--r--src/mame/drivers/exerion.c10
-rw-r--r--src/mame/drivers/exidy.c62
-rw-r--r--src/mame/drivers/exidy440.c142
-rw-r--r--src/mame/drivers/expro02.c16
-rw-r--r--src/mame/drivers/exprraid.c10
-rw-r--r--src/mame/drivers/exterm.c14
-rw-r--r--src/mame/drivers/exzisus.c20
-rw-r--r--src/mame/drivers/f-32.c4
-rw-r--r--src/mame/drivers/f1gp.c16
-rw-r--r--src/mame/drivers/fantland.c56
-rw-r--r--src/mame/drivers/fastfred.c40
-rw-r--r--src/mame/drivers/fastlane.c12
-rw-r--r--src/mame/drivers/fcombat.c10
-rw-r--r--src/mame/drivers/fcrash.c38
-rw-r--r--src/mame/drivers/fgoal.c8
-rw-r--r--src/mame/drivers/filetto.c4
-rw-r--r--src/mame/drivers/finalizr.c24
-rw-r--r--src/mame/drivers/findout.c22
-rw-r--r--src/mame/drivers/firebeat.c30
-rw-r--r--src/mame/drivers/firetrap.c22
-rw-r--r--src/mame/drivers/firetrk.c48
-rw-r--r--src/mame/drivers/fitfight.c24
-rw-r--r--src/mame/drivers/flkatck.c12
-rw-r--r--src/mame/drivers/flower.c8
-rw-r--r--src/mame/drivers/flstory.c40
-rw-r--r--src/mame/drivers/flyball.c12
-rw-r--r--src/mame/drivers/foodf.c12
-rw-r--r--src/mame/drivers/fortecar.c4
-rw-r--r--src/mame/drivers/freekick.c26
-rw-r--r--src/mame/drivers/fromanc2.c12
-rw-r--r--src/mame/drivers/fromance.c66
-rw-r--r--src/mame/drivers/funkybee.c16
-rw-r--r--src/mame/drivers/funkyjet.c20
-rw-r--r--src/mame/drivers/funworld.c80
-rw-r--r--src/mame/drivers/funybubl.c8
-rw-r--r--src/mame/drivers/fuukifg2.c192
-rw-r--r--src/mame/drivers/fuukifg3.c8
-rw-r--r--src/mame/drivers/gaelco.c46
-rw-r--r--src/mame/drivers/gaelco2.c56
-rw-r--r--src/mame/drivers/gaelco3d.c32
-rw-r--r--src/mame/drivers/gaiden.c30
-rw-r--r--src/mame/drivers/galaga.c32
-rw-r--r--src/mame/drivers/galastrm.c10
-rw-r--r--src/mame/drivers/galaxi.c2
-rw-r--r--src/mame/drivers/galaxia.c2
-rw-r--r--src/mame/drivers/galaxold.c148
-rw-r--r--src/mame/drivers/galdrvr.c228
-rw-r--r--src/mame/drivers/galivan.c44
-rw-r--r--src/mame/drivers/galpani2.c8
-rw-r--r--src/mame/drivers/galpani3.c8
-rw-r--r--src/mame/drivers/galpanic.c36
-rw-r--r--src/mame/drivers/galspnbl.c20
-rw-r--r--src/mame/drivers/gamecstl.c16
-rw-r--r--src/mame/drivers/gameplan.c96
-rw-r--r--src/mame/drivers/gaplus.c10
-rw-r--r--src/mame/drivers/gatron.c12
-rw-r--r--src/mame/drivers/gauntlet.c24
-rw-r--r--src/mame/drivers/gberet.c34
-rw-r--r--src/mame/drivers/gbusters.c12
-rw-r--r--src/mame/drivers/gcpinbal.c6
-rw-r--r--src/mame/drivers/getrivia.c14
-rw-r--r--src/mame/drivers/gijoe.c8
-rw-r--r--src/mame/drivers/ginganin.c4
-rw-r--r--src/mame/drivers/gladiatr.c16
-rw-r--r--src/mame/drivers/glass.c8
-rw-r--r--src/mame/drivers/gng.c20
-rw-r--r--src/mame/drivers/go2000.c4
-rw-r--r--src/mame/drivers/goal92.c10
-rw-r--r--src/mame/drivers/goindol.c12
-rw-r--r--src/mame/drivers/goldstar.c20
-rw-r--r--src/mame/drivers/gomoku.c16
-rw-r--r--src/mame/drivers/good.c6
-rw-r--r--src/mame/drivers/goodejan.c12
-rw-r--r--src/mame/drivers/gotcha.c6
-rw-r--r--src/mame/drivers/gottlieb.c174
-rw-r--r--src/mame/drivers/gotya.c6
-rw-r--r--src/mame/drivers/gpworld.c12
-rw-r--r--src/mame/drivers/gradius3.c12
-rw-r--r--src/mame/drivers/grchamp.c10
-rw-r--r--src/mame/drivers/gridlee.c16
-rw-r--r--src/mame/drivers/groundfx.c14
-rw-r--r--src/mame/drivers/gstream.c9
-rw-r--r--src/mame/drivers/gstriker.c18
-rw-r--r--src/mame/drivers/gsword.c26
-rw-r--r--src/mame/drivers/gticlub.c56
-rw-r--r--src/mame/drivers/guab.c12
-rw-r--r--src/mame/drivers/gumbo.c16
-rw-r--r--src/mame/drivers/gunbustr.c14
-rw-r--r--src/mame/drivers/gundealr.c30
-rw-r--r--src/mame/drivers/gunsmoke.c10
-rw-r--r--src/mame/drivers/gyruss.c16
-rw-r--r--src/mame/drivers/hal21.c20
-rw-r--r--src/mame/drivers/halleys.c30
-rw-r--r--src/mame/drivers/hanaawas.c10
-rw-r--r--src/mame/drivers/hanaroku.c12
-rw-r--r--src/mame/drivers/harddriv.c196
-rw-r--r--src/mame/drivers/hcastle.c12
-rw-r--r--src/mame/drivers/hexa.c4
-rw-r--r--src/mame/drivers/hexion.c12
-rw-r--r--src/mame/drivers/higemaru.c10
-rw-r--r--src/mame/drivers/hikaru.c2
-rw-r--r--src/mame/drivers/hitme.c30
-rw-r--r--src/mame/drivers/hnayayoi.c42
-rw-r--r--src/mame/drivers/hng64.c10
-rw-r--r--src/mame/drivers/holeland.c16
-rw-r--r--src/mame/drivers/homedata.c50
-rw-r--r--src/mame/drivers/homerun.c16
-rw-r--r--src/mame/drivers/hornet.c16
-rw-r--r--src/mame/drivers/hotblock.c4
-rw-r--r--src/mame/drivers/hshavoc.c2
-rw-r--r--src/mame/drivers/hyhoo.c24
-rw-r--r--src/mame/drivers/hyperspt.c20
-rw-r--r--src/mame/drivers/hyprduel.c8
-rw-r--r--src/mame/drivers/igs009.c18
-rw-r--r--src/mame/drivers/igs_180.c14
-rw-r--r--src/mame/drivers/igs_blit.c134
-rw-r--r--src/mame/drivers/ikki.c10
-rw-r--r--src/mame/drivers/imolagp.c8
-rw-r--r--src/mame/drivers/inufuku.c12
-rw-r--r--src/mame/drivers/iqblock.c10
-rw-r--r--src/mame/drivers/irobot.c14
-rw-r--r--src/mame/drivers/ironhors.c24
-rw-r--r--src/mame/drivers/istellar.c6
-rw-r--r--src/mame/drivers/itech32.c66
-rw-r--r--src/mame/drivers/itech8.c170
-rw-r--r--src/mame/drivers/itgambl2.c2
-rw-r--r--src/mame/drivers/itgambl3.c2
-rw-r--r--src/mame/drivers/itgamble.c2
-rw-r--r--src/mame/drivers/jack.c98
-rw-r--r--src/mame/drivers/jackal.c14
-rw-r--r--src/mame/drivers/jailbrek.c12
-rw-r--r--src/mame/drivers/jalmah.c16
-rw-r--r--src/mame/drivers/jchan.c8
-rw-r--r--src/mame/drivers/jcross.c10
-rw-r--r--src/mame/drivers/jedi.c8
-rw-r--r--src/mame/drivers/jollyjgr.c8
-rw-r--r--src/mame/drivers/jongkyo.c26
-rw-r--r--src/mame/drivers/jpmimpct.c32
-rw-r--r--src/mame/drivers/jrpacman.c6
-rw-r--r--src/mame/drivers/junofrst.c10
-rw-r--r--src/mame/drivers/kaneko16.c96
-rw-r--r--src/mame/drivers/kangaroo.c16
-rw-r--r--src/mame/drivers/karnov.c28
-rw-r--r--src/mame/drivers/kchamp.c16
-rw-r--r--src/mame/drivers/kickgoal.c4
-rw-r--r--src/mame/drivers/kingobox.c24
-rw-r--r--src/mame/drivers/kingpin.c8
-rw-r--r--src/mame/drivers/kinst.c20
-rw-r--r--src/mame/drivers/kinstb.c28
-rw-r--r--src/mame/drivers/klax.c4
-rw-r--r--src/mame/drivers/kncljoe.c10
-rw-r--r--src/mame/drivers/koftball.c3
-rw-r--r--src/mame/drivers/koikoi.c6
-rw-r--r--src/mame/drivers/konamigq.c18
-rw-r--r--src/mame/drivers/konamigv.c28
-rw-r--r--src/mame/drivers/konamigx.c44
-rw-r--r--src/mame/drivers/kopunch.c8
-rw-r--r--src/mame/drivers/ksayakyu.c72
-rw-r--r--src/mame/drivers/ksys573.c22
-rw-r--r--src/mame/drivers/kyugo.c24
-rw-r--r--src/mame/drivers/labyrunr.c12
-rw-r--r--src/mame/drivers/ladybug.c60
-rw-r--r--src/mame/drivers/ladyfrog.c8
-rw-r--r--src/mame/drivers/laserbas.c38
-rw-r--r--src/mame/drivers/laserbat.c30
-rw-r--r--src/mame/drivers/lasso.c8
-rw-r--r--src/mame/drivers/lastduel.c16
-rw-r--r--src/mame/drivers/lastfght.c6
-rw-r--r--src/mame/drivers/lazercmd.c30
-rw-r--r--src/mame/drivers/legionna.c52
-rw-r--r--src/mame/drivers/leland.c242
-rw-r--r--src/mame/drivers/lemmings.c16
-rw-r--r--src/mame/drivers/lethal.c24
-rw-r--r--src/mame/drivers/lethalj.c74
-rw-r--r--src/mame/drivers/lgp.c12
-rw-r--r--src/mame/drivers/liberate.c12
-rw-r--r--src/mame/drivers/liberatr.c10
-rw-r--r--src/mame/drivers/limenko.c18
-rw-r--r--src/mame/drivers/littlerb.c6
-rw-r--r--src/mame/drivers/lkage.c12
-rw-r--r--src/mame/drivers/lockon.c12
-rw-r--r--src/mame/drivers/looping.c6
-rw-r--r--src/mame/drivers/lordgun.c18
-rw-r--r--src/mame/drivers/lsasquad.c32
-rw-r--r--src/mame/drivers/ltcasino.c46
-rw-r--r--src/mame/drivers/lucky74.c18
-rw-r--r--src/mame/drivers/lucky8.c18
-rw-r--r--src/mame/drivers/lvcards.c30
-rw-r--r--src/mame/drivers/lwings.c22
-rw-r--r--src/mame/drivers/m10.c30
-rw-r--r--src/mame/drivers/m107.c10
-rw-r--r--src/mame/drivers/m52.c20
-rw-r--r--src/mame/drivers/m57.c10
-rw-r--r--src/mame/drivers/m58.c10
-rw-r--r--src/mame/drivers/m62.c120
-rw-r--r--src/mame/drivers/m63.c14
-rw-r--r--src/mame/drivers/m72.c42
-rw-r--r--src/mame/drivers/m79amb.c8
-rw-r--r--src/mame/drivers/m90.c30
-rw-r--r--src/mame/drivers/m92.c8
-rw-r--r--src/mame/drivers/m92.h6
-rw-r--r--src/mame/drivers/macrossp.c8
-rw-r--r--src/mame/drivers/macs.c24
-rw-r--r--src/mame/drivers/madalien.c6
-rw-r--r--src/mame/drivers/madmotor.c6
-rw-r--r--src/mame/drivers/magic10.c12
-rw-r--r--src/mame/drivers/magicfly.c20
-rw-r--r--src/mame/drivers/magmax.c8
-rw-r--r--src/mame/drivers/mainevt.c64
-rw-r--r--src/mame/drivers/mainsnk.c24
-rw-r--r--src/mame/drivers/malzak.c12
-rw-r--r--src/mame/drivers/mappy.c50
-rw-r--r--src/mame/drivers/marineb.c40
-rw-r--r--src/mame/drivers/marinedt.c10
-rw-r--r--src/mame/drivers/mario.c8
-rw-r--r--src/mame/drivers/markham.c10
-rw-r--r--src/mame/drivers/marvins.c30
-rw-r--r--src/mame/drivers/mastboy.c8
-rw-r--r--src/mame/drivers/matmania.c8
-rw-r--r--src/mame/drivers/maxaflex.c12
-rw-r--r--src/mame/drivers/mayumi.c26
-rw-r--r--src/mame/drivers/mazerbla.c40
-rw-r--r--src/mame/drivers/mcatadv.c16
-rw-r--r--src/mame/drivers/mcr.c208
-rw-r--r--src/mame/drivers/mcr3.c114
-rw-r--r--src/mame/drivers/mcr68.c76
-rw-r--r--src/mame/drivers/meadows.c18
-rw-r--r--src/mame/drivers/mediagx.c18
-rw-r--r--src/mame/drivers/megadriv.c50
-rw-r--r--src/mame/drivers/megaplay.c34
-rw-r--r--src/mame/drivers/megasys1.c204
-rw-r--r--src/mame/drivers/megatech.c10
-rw-r--r--src/mame/drivers/megazone.c10
-rw-r--r--src/mame/drivers/meijinsn.c8
-rw-r--r--src/mame/drivers/merit.c46
-rw-r--r--src/mame/drivers/meritm.c10
-rw-r--r--src/mame/drivers/mermaid.c6
-rw-r--r--src/mame/drivers/metlclsh.c8
-rw-r--r--src/mame/drivers/metro.c194
-rw-r--r--src/mame/drivers/mexico86.c24
-rw-r--r--src/mame/drivers/mgolf.c12
-rw-r--r--src/mame/drivers/mhavoc.c30
-rw-r--r--src/mame/drivers/micro3d.c20
-rw-r--r--src/mame/drivers/midas.c12
-rw-r--r--src/mame/drivers/midtunit.c40
-rw-r--r--src/mame/drivers/midvunit.c44
-rw-r--r--src/mame/drivers/midwunit.c40
-rw-r--r--src/mame/drivers/midxunit.c20
-rw-r--r--src/mame/drivers/midyunit.c102
-rw-r--r--src/mame/drivers/midzeus.c54
-rw-r--r--src/mame/drivers/mikie.c12
-rw-r--r--src/mame/drivers/minivadr.c2
-rw-r--r--src/mame/drivers/mirage.c4
-rw-r--r--src/mame/drivers/missb2.c8
-rw-r--r--src/mame/drivers/missile.c32
-rw-r--r--src/mame/drivers/mitchell.c78
-rw-r--r--src/mame/drivers/mjkjidai.c32
-rw-r--r--src/mame/drivers/mjsister.c18
-rw-r--r--src/mame/drivers/mlanding.c18
-rw-r--r--src/mame/drivers/model1.c90
-rw-r--r--src/mame/drivers/model2.c48
-rw-r--r--src/mame/drivers/model3.c118
-rw-r--r--src/mame/drivers/mogura.c12
-rw-r--r--src/mame/drivers/mole.c8
-rw-r--r--src/mame/drivers/momoko.c10
-rw-r--r--src/mame/drivers/moo.c12
-rw-r--r--src/mame/drivers/mosaic.c12
-rw-r--r--src/mame/drivers/mouser.c8
-rw-r--r--src/mame/drivers/mpu4.c32
-rw-r--r--src/mame/drivers/mpu4drvr.c32
-rw-r--r--src/mame/drivers/mquake.c16
-rw-r--r--src/mame/drivers/mrdo.c8
-rw-r--r--src/mame/drivers/mrflea.c8
-rw-r--r--src/mame/drivers/mrjong.c6
-rw-r--r--src/mame/drivers/ms32.c32
-rw-r--r--src/mame/drivers/msisaac.c12
-rw-r--r--src/mame/drivers/mugsmash.c18
-rw-r--r--src/mame/drivers/multigam.c10
-rw-r--r--src/mame/drivers/munchmo.c10
-rw-r--r--src/mame/drivers/murogem.c4
-rw-r--r--src/mame/drivers/mustache.c20
-rw-r--r--src/mame/drivers/mw8080bw.c212
-rw-r--r--src/mame/drivers/mwarr.c6
-rw-r--r--src/mame/drivers/mystston.c8
-rw-r--r--src/mame/drivers/mystwarr.c60
-rw-r--r--src/mame/drivers/n8080.c52
-rw-r--r--src/mame/drivers/namcofl.c14
-rw-r--r--src/mame/drivers/namcona1.c44
-rw-r--r--src/mame/drivers/namconb1.c44
-rw-r--r--src/mame/drivers/namcond1.c4
-rw-r--r--src/mame/drivers/namcos1.c36
-rw-r--r--src/mame/drivers/namcos10.c8
-rw-r--r--src/mame/drivers/namcos11.c24
-rw-r--r--src/mame/drivers/namcos12.c26
-rw-r--r--src/mame/drivers/namcos2.c256
-rw-r--r--src/mame/drivers/namcos21.c128
-rw-r--r--src/mame/drivers/namcos22.c84
-rw-r--r--src/mame/drivers/namcos86.c70
-rw-r--r--src/mame/drivers/naomi.c12
-rw-r--r--src/mame/drivers/naughtyb.c16
-rw-r--r--src/mame/drivers/nbmj8688.c206
-rw-r--r--src/mame/drivers/nbmj8891.c184
-rw-r--r--src/mame/drivers/nbmj8991.c102
-rw-r--r--src/mame/drivers/nbmj9195.c168
-rw-r--r--src/mame/drivers/nemesis.c162
-rw-r--r--src/mame/drivers/neodrvr.c50
-rw-r--r--src/mame/drivers/neogeo.c10
-rw-r--r--src/mame/drivers/news.c8
-rw-r--r--src/mame/drivers/ninjakd2.c32
-rw-r--r--src/mame/drivers/ninjaw.c10
-rw-r--r--src/mame/drivers/nitedrvr.c14
-rw-r--r--src/mame/drivers/niyanpai.c28
-rw-r--r--src/mame/drivers/nmg5.c42
-rw-r--r--src/mame/drivers/nmk16.c184
-rw-r--r--src/mame/drivers/nova2001.c36
-rw-r--r--src/mame/drivers/nss.c18
-rw-r--r--src/mame/drivers/nwk-tr.c18
-rw-r--r--src/mame/drivers/nycaptor.c28
-rw-r--r--src/mame/drivers/nyny.c12
-rw-r--r--src/mame/drivers/offtwall.c14
-rw-r--r--src/mame/drivers/ohmygod.c16
-rw-r--r--src/mame/drivers/ojankohs.c66
-rw-r--r--src/mame/drivers/olibochu.c12
-rw-r--r--src/mame/drivers/omegrace.c12
-rw-r--r--src/mame/drivers/oneshot.c28
-rw-r--r--src/mame/drivers/onetwo.c10
-rw-r--r--src/mame/drivers/opwolf.c12
-rw-r--r--src/mame/drivers/orbit.c10
-rw-r--r--src/mame/drivers/othldrby.c10
-rw-r--r--src/mame/drivers/othunder.c20
-rw-r--r--src/mame/drivers/overdriv.c6
-rw-r--r--src/mame/drivers/pacland.c10
-rw-r--r--src/mame/drivers/pacman.c254
-rw-r--r--src/mame/drivers/pandoras.c12
-rw-r--r--src/mame/drivers/panicr.c12
-rw-r--r--src/mame/drivers/paradise.c41
-rw-r--r--src/mame/drivers/paranoia.c2
-rw-r--r--src/mame/drivers/parodius.c10
-rw-r--r--src/mame/drivers/pasha2.c6
-rw-r--r--src/mame/drivers/pass.c4
-rw-r--r--src/mame/drivers/pastelg.c8
-rw-r--r--src/mame/drivers/pbaction.c10
-rw-r--r--src/mame/drivers/pcktgal.c6
-rw-r--r--src/mame/drivers/pengo.c14
-rw-r--r--src/mame/drivers/peplus.c42
-rw-r--r--src/mame/drivers/pgm.c64
-rw-r--r--src/mame/drivers/phoenix.c26
-rw-r--r--src/mame/drivers/pingpong.c28
-rw-r--r--src/mame/drivers/pipedrm.c20
-rw-r--r--src/mame/drivers/pipeline.c6
-rw-r--r--src/mame/drivers/pirates.c4
-rw-r--r--src/mame/drivers/pitnrun.c6
-rw-r--r--src/mame/drivers/pkscram.c4
-rw-r--r--src/mame/drivers/pktgaldx.c6
-rw-r--r--src/mame/drivers/playch10.c18
-rw-r--r--src/mame/drivers/playmark.c50
-rw-r--r--src/mame/drivers/plygonet.c10
-rw-r--r--src/mame/drivers/pmpoker.c50
-rw-r--r--src/mame/drivers/pntnpuzl.c10
-rw-r--r--src/mame/drivers/pokechmp.c6
-rw-r--r--src/mame/drivers/polepos.c48
-rw-r--r--src/mame/drivers/policetr.c14
-rw-r--r--src/mame/drivers/polyplay.c2
-rw-r--r--src/mame/drivers/poolshrk.c16
-rw-r--r--src/mame/drivers/pooyan.c10
-rw-r--r--src/mame/drivers/popeye.c30
-rw-r--r--src/mame/drivers/popper.c12
-rw-r--r--src/mame/drivers/portrait.c8
-rw-r--r--src/mame/drivers/powerbal.c20
-rw-r--r--src/mame/drivers/powerins.c8
-rw-r--r--src/mame/drivers/ppmast93.c10
-rw-r--r--src/mame/drivers/prehisle.c10
-rw-r--r--src/mame/drivers/progolf.c6
-rw-r--r--src/mame/drivers/psikyo.c76
-rw-r--r--src/mame/drivers/psikyo4.c56
-rw-r--r--src/mame/drivers/psikyosh.c60
-rw-r--r--src/mame/drivers/psychic5.c10
-rw-r--r--src/mame/drivers/pturn.c10
-rw-r--r--src/mame/drivers/puckpkmn.c10
-rw-r--r--src/mame/drivers/punchout.c8
-rw-r--r--src/mame/drivers/pushman.c12
-rw-r--r--src/mame/drivers/qdrmfgp.c12
-rw-r--r--src/mame/drivers/qix.c74
-rw-r--r--src/mame/drivers/quantum.c10
-rw-r--r--src/mame/drivers/quasar.c12
-rw-r--r--src/mame/drivers/quizdna.c36
-rw-r--r--src/mame/drivers/quizo.c6
-rw-r--r--src/mame/drivers/quizpani.c8
-rw-r--r--src/mame/drivers/quizpun2.c6
-rw-r--r--src/mame/drivers/r2dtank.c8
-rw-r--r--src/mame/drivers/rabbit.c8
-rw-r--r--src/mame/drivers/raiden.c4
-rw-r--r--src/mame/drivers/raiden2.c24
-rw-r--r--src/mame/drivers/rainbow.c16
-rw-r--r--src/mame/drivers/rallyx.c47
-rw-r--r--src/mame/drivers/rampart.c36
-rw-r--r--src/mame/drivers/rastan.c12
-rw-r--r--src/mame/drivers/rbmk.c12
-rw-r--r--src/mame/drivers/rcasino.c8
-rw-r--r--src/mame/drivers/rcorsair.c2
-rw-r--r--src/mame/drivers/realbrk.c42
-rw-r--r--src/mame/drivers/redalert.c16
-rw-r--r--src/mame/drivers/redclash.c20
-rw-r--r--src/mame/drivers/relief.c8
-rw-r--r--src/mame/drivers/renegade.c8
-rw-r--r--src/mame/drivers/retofinv.c12
-rw-r--r--src/mame/drivers/rmhaihai.c18
-rw-r--r--src/mame/drivers/rockola.c16
-rw-r--r--src/mame/drivers/rockrage.c10
-rw-r--r--src/mame/drivers/rocnrope.c12
-rw-r--r--src/mame/drivers/rohga.c30
-rw-r--r--src/mame/drivers/rollerg.c10
-rw-r--r--src/mame/drivers/rollrace.c10
-rw-r--r--src/mame/drivers/rotaryf.c10
-rw-r--r--src/mame/drivers/route16.c36
-rw-r--r--src/mame/drivers/royalmah.c114
-rw-r--r--src/mame/drivers/rpunch.c8
-rw-r--r--src/mame/drivers/runaway.c20
-rw-r--r--src/mame/drivers/rungun.c12
-rw-r--r--src/mame/drivers/safarir.c4
-rw-r--r--src/mame/drivers/sandscrp.c15
-rw-r--r--src/mame/drivers/sangho.c6
-rw-r--r--src/mame/drivers/sauro.c8
-rw-r--r--src/mame/drivers/sbasketb.c10
-rw-r--r--src/mame/drivers/sbowling.c12
-rw-r--r--src/mame/drivers/sbrkout.c14
-rw-r--r--src/mame/drivers/sbugger.c8
-rw-r--r--src/mame/drivers/scobra.c78
-rw-r--r--src/mame/drivers/scotrsht.c12
-rw-r--r--src/mame/drivers/scramble.c150
-rw-r--r--src/mame/drivers/scregg.c8
-rw-r--r--src/mame/drivers/sderby.c8
-rw-r--r--src/mame/drivers/seattle.c84
-rw-r--r--src/mame/drivers/segac2.c16
-rw-r--r--src/mame/drivers/segae.c58
-rw-r--r--src/mame/drivers/segag80r.c12
-rw-r--r--src/mame/drivers/segag80v.c20
-rw-r--r--src/mame/drivers/segahang.c40
-rw-r--r--src/mame/drivers/segald.c8
-rw-r--r--src/mame/drivers/segaorun.c14
-rw-r--r--src/mame/drivers/segas16a.c66
-rw-r--r--src/mame/drivers/segas16b.c104
-rw-r--r--src/mame/drivers/segas18.c46
-rw-r--r--src/mame/drivers/segas24.c54
-rw-r--r--src/mame/drivers/segas32.c138
-rw-r--r--src/mame/drivers/segaxbd.c58
-rw-r--r--src/mame/drivers/segaybd.c50
-rw-r--r--src/mame/drivers/seibuspi.c42
-rw-r--r--src/mame/drivers/seicross.c32
-rw-r--r--src/mame/drivers/sengokmj.c16
-rw-r--r--src/mame/drivers/senjyo.c36
-rw-r--r--src/mame/drivers/seta.c370
-rw-r--r--src/mame/drivers/seta2.c100
-rw-r--r--src/mame/drivers/sf.c40
-rw-r--r--src/mame/drivers/sfkick.c2
-rw-r--r--src/mame/drivers/sg1000a.c6
-rw-r--r--src/mame/drivers/sgladiat.c10
-rw-r--r--src/mame/drivers/shadfrce.c24
-rw-r--r--src/mame/drivers/shangha3.c20
-rw-r--r--src/mame/drivers/shanghai.c28
-rw-r--r--src/mame/drivers/shangkid.c24
-rw-r--r--src/mame/drivers/shaolins.c12
-rw-r--r--src/mame/drivers/shisen.c10
-rw-r--r--src/mame/drivers/shootout.c8
-rw-r--r--src/mame/drivers/shougi.c6
-rw-r--r--src/mame/drivers/shuuz.c16
-rw-r--r--src/mame/drivers/sidearms.c48
-rw-r--r--src/mame/drivers/sidepckt.c8
-rw-r--r--src/mame/drivers/silkroad.c8
-rw-r--r--src/mame/drivers/simpl156.c4
-rw-r--r--src/mame/drivers/simpsons.c24
-rw-r--r--src/mame/drivers/skullxbo.c4
-rw-r--r--src/mame/drivers/skyarmy.c69
-rw-r--r--src/mame/drivers/skydiver.c32
-rw-r--r--src/mame/drivers/skyfox.c10
-rw-r--r--src/mame/drivers/skykid.c36
-rw-r--r--src/mame/drivers/skylncr.c16
-rw-r--r--src/mame/drivers/skyraid.c12
-rw-r--r--src/mame/drivers/slapfght.c8
-rw-r--r--src/mame/drivers/slapshot.c32
-rw-r--r--src/mame/drivers/sliver.c8
-rw-r--r--src/mame/drivers/snk.c218
-rw-r--r--src/mame/drivers/snk68.c52
-rw-r--r--src/mame/drivers/snookr10.c24
-rw-r--r--src/mame/drivers/snowbros.c94
-rw-r--r--src/mame/drivers/solomon.c10
-rw-r--r--src/mame/drivers/sonson.c10
-rw-r--r--src/mame/drivers/spacefb.c16
-rw-r--r--src/mame/drivers/spaceg.c10
-rw-r--r--src/mame/drivers/spbactn.c10
-rw-r--r--src/mame/drivers/spcforce.c12
-rw-r--r--src/mame/drivers/spdodgeb.c10
-rw-r--r--src/mame/drivers/speedatk.c6
-rw-r--r--src/mame/drivers/speedbal.c8
-rw-r--r--src/mame/drivers/speedspn.c10
-rw-r--r--src/mame/drivers/speglsht.c9
-rw-r--r--src/mame/drivers/spiders.c12
-rw-r--r--src/mame/drivers/splash.c16
-rw-r--r--src/mame/drivers/sprcros2.c10
-rw-r--r--src/mame/drivers/sprint2.c48
-rw-r--r--src/mame/drivers/sprint4.c36
-rw-r--r--src/mame/drivers/sprint8.c76
-rw-r--r--src/mame/drivers/spy.c10
-rw-r--r--src/mame/drivers/srmp2.c48
-rw-r--r--src/mame/drivers/srmp5.c25
-rw-r--r--src/mame/drivers/srmp6.c10
-rw-r--r--src/mame/drivers/srumbler.c10
-rw-r--r--src/mame/drivers/ssfindo.c14
-rw-r--r--src/mame/drivers/sshangha.c10
-rw-r--r--src/mame/drivers/ssingles.c8
-rw-r--r--src/mame/drivers/sslam.c24
-rw-r--r--src/mame/drivers/ssozumo.c8
-rw-r--r--src/mame/drivers/sspeedr.c8
-rw-r--r--src/mame/drivers/ssrj.c8
-rw-r--r--src/mame/drivers/sstrangr.c12
-rw-r--r--src/mame/drivers/ssv.c100
-rw-r--r--src/mame/drivers/st0016.c12
-rw-r--r--src/mame/drivers/stactics.c10
-rw-r--r--src/mame/drivers/stadhero.c10
-rw-r--r--src/mame/drivers/starcrus.c72
-rw-r--r--src/mame/drivers/starfire.c18
-rw-r--r--src/mame/drivers/starshp1.c12
-rw-r--r--src/mame/drivers/starwars.c24
-rw-r--r--src/mame/drivers/statriv2.c86
-rw-r--r--src/mame/drivers/stfight.c12
-rw-r--r--src/mame/drivers/stlforce.c4
-rw-r--r--src/mame/drivers/strnskil.c20
-rw-r--r--src/mame/drivers/stv.c48
-rw-r--r--src/mame/drivers/subs.c10
-rw-r--r--src/mame/drivers/subsino.c14
-rw-r--r--src/mame/drivers/suna16.c32
-rw-r--r--src/mame/drivers/suna8.c48
-rw-r--r--src/mame/drivers/supbtime.c20
-rw-r--r--src/mame/drivers/supdrapo.c18
-rw-r--r--src/mame/drivers/superchs.c14
-rw-r--r--src/mame/drivers/superdq.c8
-rw-r--r--src/mame/drivers/superqix.c36
-rw-r--r--src/mame/drivers/supertnk.c8
-rw-r--r--src/mame/drivers/suprgolf.c15
-rw-r--r--src/mame/drivers/suprloco.c10
-rw-r--r--src/mame/drivers/suprnova.c36
-rw-r--r--src/mame/drivers/suprridr.c10
-rw-r--r--src/mame/drivers/suprslam.c10
-rw-r--r--src/mame/drivers/surpratk.c10
-rw-r--r--src/mame/drivers/system1.c358
-rw-r--r--src/mame/drivers/system16.c42
-rw-r--r--src/mame/drivers/system18.c12
-rw-r--r--src/mame/drivers/tagteam.c12
-rw-r--r--src/mame/drivers/tail2nos.c6
-rw-r--r--src/mame/drivers/taito_b.c234
-rw-r--r--src/mame/drivers/taito_f2.c316
-rw-r--r--src/mame/drivers/taito_f3.c14
-rw-r--r--src/mame/drivers/taito_h.c38
-rw-r--r--src/mame/drivers/taito_l.c152
-rw-r--r--src/mame/drivers/taito_x.c10
-rw-r--r--src/mame/drivers/taito_z.c138
-rw-r--r--src/mame/drivers/taitoair.c32
-rw-r--r--src/mame/drivers/taitojc.c60
-rw-r--r--src/mame/drivers/taitosj.c194
-rw-r--r--src/mame/drivers/taitowlf.c16
-rw-r--r--src/mame/drivers/tank8.c27
-rw-r--r--src/mame/drivers/tankbatt.c6
-rw-r--r--src/mame/drivers/tankbust.c6
-rw-r--r--src/mame/drivers/taotaido.c18
-rw-r--r--src/mame/drivers/targeth.c16
-rw-r--r--src/mame/drivers/tatsumi.c48
-rw-r--r--src/mame/drivers/tattack.c6
-rw-r--r--src/mame/drivers/taxidrvr.c12
-rw-r--r--src/mame/drivers/tbowl.c36
-rw-r--r--src/mame/drivers/tceptor.c14
-rw-r--r--src/mame/drivers/tcl.c2
-rw-r--r--src/mame/drivers/tecmo.c66
-rw-r--r--src/mame/drivers/tecmo16.c22
-rw-r--r--src/mame/drivers/tecmosys.c4
-rw-r--r--src/mame/drivers/tehkanwc.c66
-rw-r--r--src/mame/drivers/tempest.c18
-rw-r--r--src/mame/drivers/terracre.c24
-rw-r--r--src/mame/drivers/tetrisp2.c26
-rw-r--r--src/mame/drivers/thayers.c26
-rw-r--r--src/mame/drivers/thedeep.c10
-rw-r--r--src/mame/drivers/thepit.c36
-rw-r--r--src/mame/drivers/thief.c24
-rw-r--r--src/mame/drivers/thoop2.c10
-rw-r--r--src/mame/drivers/thunderj.c6
-rw-r--r--src/mame/drivers/thunderx.c24
-rw-r--r--src/mame/drivers/tiamc1.c6
-rw-r--r--src/mame/drivers/tickee.c32
-rw-r--r--src/mame/drivers/tigeroad.c18
-rw-r--r--src/mame/drivers/timelimt.c12
-rw-r--r--src/mame/drivers/timeplt.c10
-rw-r--r--src/mame/drivers/tmaster.c18
-rw-r--r--src/mame/drivers/tmnt.c168
-rw-r--r--src/mame/drivers/tnzs.c112
-rw-r--r--src/mame/drivers/toaplan1.c82
-rw-r--r--src/mame/drivers/toaplan2.c56
-rw-r--r--src/mame/drivers/toki.c12
-rw-r--r--src/mame/drivers/toobin.c4
-rw-r--r--src/mame/drivers/topshoot.c2
-rw-r--r--src/mame/drivers/topspeed.c14
-rw-r--r--src/mame/drivers/toratora.c4
-rw-r--r--src/mame/drivers/tourtabl.c20
-rw-r--r--src/mame/drivers/toypop.c24
-rw-r--r--src/mame/drivers/tp84.c20
-rw-r--r--src/mame/drivers/trackfld.c48
-rw-r--r--src/mame/drivers/travrusa.c20
-rw-r--r--src/mame/drivers/triplhnt.c22
-rw-r--r--src/mame/drivers/truco.c6
-rw-r--r--src/mame/drivers/trucocl.c2
-rw-r--r--src/mame/drivers/trvmadns.c2
-rw-r--r--src/mame/drivers/trvquest.c8
-rw-r--r--src/mame/drivers/tryout.c8
-rw-r--r--src/mame/drivers/tsamurai.c24
-rw-r--r--src/mame/drivers/ttchamp.c5
-rw-r--r--src/mame/drivers/tubep.c22
-rw-r--r--src/mame/drivers/tugboat.c12
-rw-r--r--src/mame/drivers/tumbleb.c132
-rw-r--r--src/mame/drivers/tumblep.c10
-rw-r--r--src/mame/drivers/tunhunt.c8
-rw-r--r--src/mame/drivers/turbo.c32
-rw-r--r--src/mame/drivers/turbosub.c2
-rw-r--r--src/mame/drivers/tutankhm.c10
-rw-r--r--src/mame/drivers/twin16.c88
-rw-r--r--src/mame/drivers/twincobr.c59
-rw-r--r--src/mame/drivers/twins.c4
-rw-r--r--src/mame/drivers/tx1.c36
-rw-r--r--src/mame/drivers/uapce.c6
-rw-r--r--src/mame/drivers/ultraman.c10
-rw-r--r--src/mame/drivers/ultratnk.c24
-rw-r--r--src/mame/drivers/ultrsprt.c14
-rw-r--r--src/mame/drivers/undrfire.c24
-rw-r--r--src/mame/drivers/unico.c38
-rw-r--r--src/mame/drivers/upscope.c4
-rw-r--r--src/mame/drivers/usgames.c10
-rw-r--r--src/mame/drivers/vamphalf.c4
-rw-r--r--src/mame/drivers/vaportra.c10
-rw-r--r--src/mame/drivers/vastar.c10
-rw-r--r--src/mame/drivers/vball.c28
-rw-r--r--src/mame/drivers/vegaeo.c4
-rw-r--r--src/mame/drivers/vegas.c104
-rw-r--r--src/mame/drivers/vendetta.c24
-rw-r--r--src/mame/drivers/vertigo.c10
-rw-r--r--src/mame/drivers/vicdual.c174
-rw-r--r--src/mame/drivers/victory.c12
-rw-r--r--src/mame/drivers/videopin.c8
-rw-r--r--src/mame/drivers/vigilant.c30
-rw-r--r--src/mame/drivers/vindictr.c6
-rw-r--r--src/mame/drivers/vmetal.c8
-rw-r--r--src/mame/drivers/volfied.c12
-rw-r--r--src/mame/drivers/vroulet.c10
-rw-r--r--src/mame/drivers/vsnes.c120
-rw-r--r--src/mame/drivers/vulgus.c14
-rw-r--r--src/mame/drivers/wallc.c8
-rw-r--r--src/mame/drivers/wardner.c28
-rw-r--r--src/mame/drivers/warpwarp.c66
-rw-r--r--src/mame/drivers/warriorb.c10
-rw-r--r--src/mame/drivers/wc90.c10
-rw-r--r--src/mame/drivers/wc90b.c8
-rw-r--r--src/mame/drivers/wecleman.c24
-rw-r--r--src/mame/drivers/welltris.c36
-rw-r--r--src/mame/drivers/wgp.c16
-rw-r--r--src/mame/drivers/wheelfir.c8
-rw-r--r--src/mame/drivers/williams.c174
-rw-r--r--src/mame/drivers/wink.c12
-rw-r--r--src/mame/drivers/wiping.c32
-rw-r--r--src/mame/drivers/witch.c16
-rw-r--r--src/mame/drivers/wiz.c30
-rw-r--r--src/mame/drivers/wldarrow.c16
-rw-r--r--src/mame/drivers/wolfpack.c6
-rw-r--r--src/mame/drivers/wrally.c8
-rw-r--r--src/mame/drivers/wwfsstar.c10
-rw-r--r--src/mame/drivers/wwfwfest.c16
-rw-r--r--src/mame/drivers/xain.c10
-rw-r--r--src/mame/drivers/xexex.c8
-rw-r--r--src/mame/drivers/xmen.c20
-rw-r--r--src/mame/drivers/xorworld.c6
-rw-r--r--src/mame/drivers/xtheball.c18
-rw-r--r--src/mame/drivers/xxmissio.c10
-rw-r--r--src/mame/drivers/xybots.c4
-rw-r--r--src/mame/drivers/xyonix.c6
-rw-r--r--src/mame/drivers/yiear.c12
-rw-r--r--src/mame/drivers/yumefuda.c14
-rw-r--r--src/mame/drivers/yunsun16.c32
-rw-r--r--src/mame/drivers/yunsung8.c30
-rw-r--r--src/mame/drivers/zac2650.c24
-rw-r--r--src/mame/drivers/zaccaria.c14
-rw-r--r--src/mame/drivers/zaxxon.c38
-rw-r--r--src/mame/drivers/zerozone.c10
-rw-r--r--src/mame/drivers/zn.c16
-rw-r--r--src/mame/drivers/zodiack.c40
-rw-r--r--src/mame/drivers/zr107.c42
-rw-r--r--src/mame/includes/megasys1.h2
-rw-r--r--src/mame/includes/mw8080bw.h6
-rw-r--r--src/mame/machine/nb1413m3.c20
-rw-r--r--src/mame/machine/pckeybrd.c32
940 files changed, 15438 insertions, 16197 deletions
diff --git a/src/emu/inptport.c b/src/emu/inptport.c
index 00d78d329ef..e83e0db2ed3 100644
--- a/src/emu/inptport.c
+++ b/src/emu/inptport.c
@@ -2405,14 +2405,12 @@ static input_port_config *port_config_detokenize(input_port_config *listhead, co
/* start of a new input port */
case INPUT_TOKEN_START:
- case INPUT_TOKEN_START_TAG:
if (curfield != NULL)
field_config_insert(curfield, &maskbits, errorbuf, errorbuflen);
maskbits = 0;
curport = port_config_alloc((const input_port_config **)&listhead);
- if (entrytype == INPUT_TOKEN_START_TAG)
- curport->tag = TOKEN_GET_STRING(ipt);
+ curport->tag = TOKEN_GET_STRING(ipt);
curfield = NULL;
cursetting = NULL;
break;
diff --git a/src/emu/inptport.h b/src/emu/inptport.h
index 0ee7703ae90..10084bcb0da 100644
--- a/src/emu/inptport.h
+++ b/src/emu/inptport.h
@@ -326,7 +326,6 @@ enum
INPUT_TOKEN_END,
INPUT_TOKEN_INCLUDE,
INPUT_TOKEN_START,
- INPUT_TOKEN_START_TAG,
INPUT_TOKEN_MODIFY,
INPUT_TOKEN_FIELD,
INPUT_TOKEN_SPECIAL_ONOFF,
@@ -702,13 +701,9 @@ struct _inp_header
TOKEN_UINT32_PACK1(INPUT_TOKEN_INCLUDE, 8), \
TOKEN_PTR(tokenptr, &ipt_##_name[0]),
-/* start of a new input port */
-#define PORT_START \
- TOKEN_UINT32_PACK1(INPUT_TOKEN_START, 8),
-
/* start of a new input port (with included tag) */
-#define PORT_START_TAG(_tag) \
- TOKEN_UINT32_PACK1(INPUT_TOKEN_START_TAG, 8), \
+#define PORT_START(_tag) \
+ TOKEN_UINT32_PACK1(INPUT_TOKEN_START, 8), \
TOKEN_STRING(_tag),
/* modify an existing port */
diff --git a/src/emu/machine/microtch.c b/src/emu/machine/microtch.c
index a6e407afd25..f98639ccf74 100644
--- a/src/emu/machine/microtch.c
+++ b/src/emu/machine/microtch.c
@@ -175,11 +175,11 @@ void microtouch_rx(int count, UINT8* data)
};
INPUT_PORTS_START(microtouch)
- PORT_START_TAG("TOUCH")
+ PORT_START("TOUCH")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_IMPULSE(10) PORT_NAME( "Touch screen" )
- PORT_START_TAG("TOUCH_X")
+ PORT_START("TOUCH_X")
PORT_BIT( 0x3fff, 0x2000, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(45) PORT_KEYDELTA(15)
- PORT_START_TAG("TOUCH_Y")
+ PORT_START("TOUCH_Y")
PORT_BIT( 0x3fff, 0x2000, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(45) PORT_KEYDELTA(15)
INPUT_PORTS_END
diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c
index a6fe984d3e1..d5cf7b0209e 100644
--- a/src/mame/audio/atarijsa.c
+++ b/src/mame/audio/atarijsa.c
@@ -941,7 +941,7 @@ MACHINE_DRIVER_END
*************************************/
INPUT_PORTS_START( atarijsa_i )
- PORT_START_TAG("JSAI")
+ PORT_START("JSAI")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -953,7 +953,7 @@ INPUT_PORTS_START( atarijsa_i )
INPUT_PORTS_END
INPUT_PORTS_START( atarijsa_ii )
- PORT_START_TAG("JSAII")
+ PORT_START("JSAII")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -965,7 +965,7 @@ INPUT_PORTS_START( atarijsa_ii )
INPUT_PORTS_END
INPUT_PORTS_START( atarijsa_iii )
- PORT_START_TAG("JSAIII")
+ PORT_START("JSAIII")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_TILT )
diff --git a/src/mame/audio/gottlieb.c b/src/mame/audio/gottlieb.c
index 37546ce0d77..089727b614e 100644
--- a/src/mame/audio/gottlieb.c
+++ b/src/mame/audio/gottlieb.c
@@ -348,7 +348,7 @@ MACHINE_DRIVER_END
*************************************/
INPUT_PORTS_START( gottlieb1_sound )
- PORT_START_TAG("SB1")
+ PORT_START("SB1")
PORT_DIPUNKNOWN_DIPLOC( 0x01, 0x01, "SB1:7" )
PORT_DIPUNKNOWN_DIPLOC( 0x02, 0x02, "SB1:6" )
PORT_DIPUNKNOWN_DIPLOC( 0x04, 0x04, "SB1:5" )
@@ -641,7 +641,7 @@ MACHINE_DRIVER_END
*************************************/
INPUT_PORTS_START( gottlieb2_sound )
- PORT_START_TAG("GOTTLIEB2")
+ PORT_START("GOTTLIEB2")
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_DIPUNKNOWN( 0x10, 0x10 )
PORT_DIPUNKNOWN( 0x20, 0x20 )
diff --git a/src/mame/audio/seibu.h b/src/mame/audio/seibu.h
index 6ceeeb73b3a..fc005ad4323 100644
--- a/src/mame/audio/seibu.h
+++ b/src/mame/audio/seibu.h
@@ -70,7 +70,7 @@ extern const struct YM2203interface seibu_ym2203_interface;
/**************************************************************************/
#define SEIBU_COIN_INPUTS \
- PORT_START_TAG("COIN") \
+ PORT_START("COIN") \
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(4) \
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(4)
diff --git a/src/mame/drivers/1942.c b/src/mame/drivers/1942.c
index 2840d78e577..604921bca3c 100644
--- a/src/mame/drivers/1942.c
+++ b/src/mame/drivers/1942.c
@@ -145,7 +145,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( 1942 )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -154,7 +154,7 @@ static INPUT_PORTS_START( 1942 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -163,7 +163,7 @@ static INPUT_PORTS_START( 1942 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -172,7 +172,7 @@ static INPUT_PORTS_START( 1942 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SWA:8,7,6")
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
@@ -196,7 +196,7 @@ static INPUT_PORTS_START( 1942 )
PORT_DIPSETTING( 0xc0, "3" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SWB:8,7,6")
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/1943.c b/src/mame/drivers/1943.c
index 4a79d300891..20559388a4f 100644
--- a/src/mame/drivers/1943.c
+++ b/src/mame/drivers/1943.c
@@ -94,7 +94,7 @@ ADDRESS_MAP_END
/* Input Ports */
static INPUT_PORTS_START( 1943 )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -103,7 +103,7 @@ static INPUT_PORTS_START( 1943 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -112,7 +112,7 @@ static INPUT_PORTS_START( 1943 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -121,7 +121,7 @@ static INPUT_PORTS_START( 1943 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x0f, 0x08, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SWA:5,6,7,8")
PORT_DIPSETTING( 0x0f, "1 (Easy)" )
PORT_DIPSETTING( 0x0e, "2" )
@@ -150,7 +150,7 @@ static INPUT_PORTS_START( 1943 )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE_DIPLOC(0x80, IP_ACTIVE_LOW, "SWA:1" )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SWB:6,7,8")
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ))
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c
index 34ad5de12b7..fffd1a02504 100644
--- a/src/mame/drivers/1945kiii.c
+++ b/src/mame/drivers/1945kiii.c
@@ -151,7 +151,7 @@ static ADDRESS_MAP_START( k3_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
static INPUT_PORTS_START( k3 )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -169,7 +169,7 @@ static INPUT_PORTS_START( k3 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -177,7 +177,7 @@ static INPUT_PORTS_START( k3 )
PORT_BIT( 0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Are these used at all? */
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x0002, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) )
diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c
index bf6d4daca0e..ec58b746dde 100644
--- a/src/mame/drivers/20pacgal.c
+++ b/src/mame/drivers/20pacgal.c
@@ -251,7 +251,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( 20pacgal )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
@@ -261,7 +261,7 @@ static INPUT_PORTS_START( 20pacgal )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
@@ -271,7 +271,7 @@ static INPUT_PORTS_START( 20pacgal )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 ) PORT_NAME( "Left 2 Players Start" )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4 ) PORT_NAME( "Right 2 Players Start" )
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c
index 2cec1baeadc..a0ef56db766 100644
--- a/src/mame/drivers/40love.c
+++ b/src/mame/drivers/40love.c
@@ -806,7 +806,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( 40love )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPUNKNOWN_DIPLOC( 0x01, 0x01, "SW1:1" )
PORT_DIPUNKNOWN_DIPLOC( 0x02, 0x02, "SW1:2" )
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW1:3")
@@ -825,7 +825,7 @@ static INPUT_PORTS_START( 40love )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2") /* All OK */
+ PORT_START("DSW2") /* All OK */
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3,4")
PORT_DIPSETTING( 0x0f, DEF_STR( 9C_1C ) )
PORT_DIPSETTING( 0x0e, DEF_STR( 8C_1C ) )
@@ -861,7 +861,7 @@ static INPUT_PORTS_START( 40love )
PORT_DIPSETTING( 0x60, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x70, DEF_STR( 1C_8C ) )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPUNKNOWN_DIPLOC( 0x01, 0x01, "SW3:1" )
PORT_DIPUNKNOWN_DIPLOC( 0x02, 0x02, "SW3:2" )
PORT_DIPUNKNOWN_DIPLOC( 0x04, 0x04, "SW3:3" )
@@ -879,7 +879,7 @@ static INPUT_PORTS_START( 40love )
PORT_DIPSETTING( 0x00, "Single Slot" )
PORT_DIPSETTING( 0x80, "Double Slot" )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) //??
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) //??
PORT_BIT( 0x04, IP_ACTIVE_HIGH,IPT_COIN1 ) //OK
@@ -889,7 +889,7 @@ static INPUT_PORTS_START( 40love )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) //OK
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_TILT ) //OK
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
@@ -899,7 +899,7 @@ static INPUT_PORTS_START( 40love )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
diff --git a/src/mame/drivers/4enraya.c b/src/mame/drivers/4enraya.c
index 95aac860543..4dc98e5e90c 100644
--- a/src/mame/drivers/4enraya.c
+++ b/src/mame/drivers/4enraya.c
@@ -95,7 +95,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( 4enraya )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hard ) )
@@ -119,7 +119,7 @@ static INPUT_PORTS_START( 4enraya )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("P1 Down") // "drop" ("down")
@@ -129,7 +129,7 @@ static INPUT_PORTS_START( 4enraya )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("P1 Shot") // "fire" ("shot")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 Shot") // "fire" ("shot")
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c
index 019c469eead..0acd6bdc87f 100644
--- a/src/mame/drivers/8080bw.c
+++ b/src/mame/drivers/8080bw.c
@@ -98,7 +98,7 @@
/*******************************************************/
static INPUT_PORTS_START( sicv )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -108,7 +108,7 @@ static INPUT_PORTS_START( sicv )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -116,7 +116,7 @@ static INPUT_PORTS_START( sicv )
PORT_BIT( 0x70, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(invaders_in1_control_r, 0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -408,7 +408,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( invrvnge )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -418,7 +418,7 @@ static INPUT_PORTS_START( invrvnge )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -428,7 +428,7 @@ static INPUT_PORTS_START( invrvnge )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -736,7 +736,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( schaser )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2)
@@ -746,7 +746,7 @@ static INPUT_PORTS_START( schaser )
PORT_DIPUNKNOWN_DIPLOC( 0x40, 0x00, "SW1:7" )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY
@@ -756,7 +756,7 @@ static INPUT_PORTS_START( schaser )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("DSW0") // port 2
+ PORT_START("DSW0") // port 2
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -776,18 +776,18 @@ static INPUT_PORTS_START( schaser )
// port 3 (all 8 bits) connected to custom chip MB14241 driven by out port 2 and 4
// To get cocktail mode, turn this on, and choose 2 controllers.
- PORT_START_TAG(CABINET_PORT_TAG) /* Dummy port for cocktail mode */
+ PORT_START(CABINET_PORT_TAG) /* Dummy port for cocktail mode */
PORT_CONFNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_CONFSETTING( 0x00, DEF_STR( Upright ) )
PORT_CONFSETTING( 0x01, DEF_STR( Cocktail ) )
- PORT_START_TAG("VR1")
+ PORT_START("VR1")
PORT_ADJUSTER( 70, "VR1 - Music Volume" )
- PORT_START_TAG("VR2")
+ PORT_START("VR2")
PORT_ADJUSTER( 90, "VR2 - Explosion/Effect Volume" )
- PORT_START_TAG("VR3")
+ PORT_START("VR3")
PORT_ADJUSTER( 70, "VR3 - Dot Volume" )
INPUT_PORTS_END
@@ -924,7 +924,7 @@ static MACHINE_DRIVER_START( sflush )
MACHINE_DRIVER_END
static INPUT_PORTS_START( sflush )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START2 )
@@ -933,7 +933,7 @@ static INPUT_PORTS_START( sflush )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -946,7 +946,7 @@ static INPUT_PORTS_START( sflush )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
- PORT_START_TAG("PADDLE")
+ PORT_START("PADDLE")
PORT_BIT( 0xff, 0x6a, IPT_PADDLE ) PORT_MINMAX(0x16,0xbf) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_CENTERDELTA(0)
INPUT_PORTS_END
@@ -1290,7 +1290,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( yosakdon )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -1298,7 +1298,7 @@ static INPUT_PORTS_START( yosakdon )
PORT_BIT( 0x70, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(invaders_in1_control_r, 0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -1320,7 +1320,7 @@ static INPUT_PORTS_START( yosakdon )
INVADERS_CONTROL_PORT_P2
/* Dummy port for cocktail mode (not used) */
- PORT_START_TAG(CABINET_PORT_TAG)
+ PORT_START(CABINET_PORT_TAG)
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -1346,7 +1346,7 @@ MACHINE_DRIVER_END
/*******************************************************/
static INPUT_PORTS_START( indianbt )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -1356,7 +1356,7 @@ static INPUT_PORTS_START( indianbt )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -1373,7 +1373,7 @@ static INPUT_PORTS_START( indianbt )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG(CABINET_PORT_TAG) /* Dummy port for cocktail mode */
+ PORT_START(CABINET_PORT_TAG) /* Dummy port for cocktail mode */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -1464,7 +1464,7 @@ g 2x SN75452
******************************************************/
static INPUT_PORTS_START( shuttlei )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -1489,7 +1489,7 @@ static INPUT_PORTS_START( shuttlei )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1589,7 +1589,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( darthvdr )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
@@ -1605,7 +1605,7 @@ static INPUT_PORTS_START( darthvdr )
PORT_DIPSETTING( 0x00, "4" )
PORT_DIPSETTING( 0x80, "6" )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c
index b4db2ffafaf..6ab192434ea 100644
--- a/src/mame/drivers/88games.c
+++ b/src/mame/drivers/88games.c
@@ -161,7 +161,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( 88games )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -179,7 +179,7 @@ static INPUT_PORTS_START( 88games )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -189,7 +189,7 @@ static INPUT_PORTS_START( 88games )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
@@ -199,7 +199,7 @@ static INPUT_PORTS_START( 88games )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -235,7 +235,7 @@ static INPUT_PORTS_START( 88games )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Disabled" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW2:1" )
PORT_DIPNAME( 0x06, 0x02, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:2,3")
PORT_DIPSETTING( 0x06, DEF_STR( Cocktail ) )
diff --git a/src/mame/drivers/ace.c b/src/mame/drivers/ace.c
index e911032ad35..c1dc3a5d23f 100644
--- a/src/mame/drivers/ace.c
+++ b/src/mame/drivers/ace.c
@@ -195,45 +195,45 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( ace )
- PORT_START_TAG("c008") /* player thrust */
+ PORT_START("c008") /* player thrust */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_NAME("P1 Thrust")
- PORT_START_TAG("c009") /* player slowdown */
+ PORT_START("c009") /* player slowdown */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_NAME("P1 Slowdown")
- PORT_START_TAG("c00a") /* player left */
+ PORT_START("c00a") /* player left */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
- PORT_START_TAG("c00b") /* player right */
+ PORT_START("c00b") /* player right */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
- PORT_START_TAG("c00c") /* player fire */
+ PORT_START("c00c") /* player fire */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("P1 Fire")
- PORT_START_TAG("c00d") /* enemy thrust */
+ PORT_START("c00d") /* enemy thrust */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_NAME("P2 Thrust")
- PORT_START_TAG("c00e") /* enemy slowdown */
+ PORT_START("c00e") /* enemy slowdown */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_NAME("P2 Slowdown")
- PORT_START_TAG("c00f") /* enemy left */
+ PORT_START("c00f") /* enemy left */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("c010") /* enemy right */
+ PORT_START("c010") /* enemy right */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("c011") /* enemy fire */
+ PORT_START("c011") /* enemy fire */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 Fire")
//c012
- PORT_START_TAG("c014") /* VBLANK??? */
+ PORT_START("c014") /* VBLANK??? */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("c015") /* coin input */
+ PORT_START("c015") /* coin input */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("c016") /* game start */
+ PORT_START("c016") /* game start */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
INPUT_PORTS_END
diff --git a/src/mame/drivers/acefruit.c b/src/mame/drivers/acefruit.c
index 6c7cf8f5f06..9c2e259b4a8 100644
--- a/src/mame/drivers/acefruit.c
+++ b/src/mame/drivers/acefruit.c
@@ -279,14 +279,14 @@ static ADDRESS_MAP_START( acefruit_io, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( sidewndr )
- PORT_START_TAG("IN0") // 0
+ PORT_START("IN0") // 0
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME( "Stop Nudge/Nudge Up or Down" )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME( "Gamble" )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) /* "Cash in" */
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_VBLANK ) /* active low or high?? */
PORT_BIT( 0xd8, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") // 1
+ PORT_START("IN1") // 1
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME( "Sidewind" )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME( "Collect" )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 ) /* "Cash in" */
@@ -295,21 +295,21 @@ static INPUT_PORTS_START( sidewndr )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") // 2
+ PORT_START("IN2") // 2
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME( "Cancel/Clear" )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME( "Refill" ) PORT_TOGGLE
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) /* "Token in" - also "Refill" when "Refill" mode ON */
PORT_BIT( 0x08, 0x00, IPT_SPECIAL) PORT_CUSTOM(sidewndr_payout_r, (void *)0x01)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3") // 3
+ PORT_START("IN3") // 3
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME( "Hold/Nudge 1" )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME( "Accountancy System" ) PORT_TOGGLE
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN4 ) /* "50P in" */
PORT_BIT( 0x08, 0x00, IPT_SPECIAL) PORT_CUSTOM(sidewndr_payout_r, (void *)0x02)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN4") // 4
+ PORT_START("IN4") // 4
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_NAME( "Hold/Nudge 2" )
PORT_DIPNAME( 0x02, 0x00, "Allow Clear Data" ) /* in "Accountancy System" mode */
PORT_DIPSETTING( 0x02, DEF_STR( No ) )
@@ -322,12 +322,12 @@ static INPUT_PORTS_START( sidewndr )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN5") // 5
+ PORT_START("IN5") // 5
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_NAME( "Hold/Nudge 3" )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME( "Test Program" ) PORT_TOGGLE
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN6") // 6
+ PORT_START("IN6") // 6
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON10 ) PORT_NAME( "Hold/Nudge 4" )
/* I don't know exactly what this bit is supposed to do :(
I only found that when bit is LOW, no data is updated
@@ -339,14 +339,14 @@ static INPUT_PORTS_START( sidewndr )
PORT_DIPSETTING( 0x02, DEF_STR( On ) )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN7") // 7
+ PORT_START("IN7") // 7
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) /* next in "Accountancy System" mode */
PORT_DIPNAME( 0x02, 0x00, "Clear Credits on Reset" ) /* also affects rolls */
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("PAYOUT") // fake port to handle settings via multiple input ports
+ PORT_START("PAYOUT") // fake port to handle settings via multiple input ports
PORT_DIPNAME( 0x03, 0x00, "Payout %" )
PORT_DIPSETTING( 0x00, "74%" )
PORT_DIPSETTING( 0x02, "78%" )
@@ -399,14 +399,14 @@ INPUT_PORTS_END
/* I've only mapped the known inputs after comparaison with 'spellbnd' and the ones known to do something */
static INPUT_PORTS_START( starspnr )
- PORT_START_TAG("IN0") // 0
+ PORT_START("IN0") // 0
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME( "Gamble" )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
/* tested at 0xef77 after IN5 bit 1 and before IN2 bit 2 - after coins are tested - table at 0xefa5 (3 bytes) */
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_VBLANK ) /* active low or high?? */
- PORT_START_TAG("IN1") // 1
+ PORT_START("IN1") // 1
/* tested at 0xe77c - call from 0x012c */
/* tested at 0xeffb after IN6 bit 2 - invalid code after 0xf000 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -415,7 +415,7 @@ static INPUT_PORTS_START( starspnr )
/* tested at 0xeed7 with IN1 bit 3 - before coins are tested - table at 0xef55 (4 * 3 bytes) */
PORT_BIT( 0x08, 0x00, IPT_SPECIAL) PORT_CUSTOM(starspnr_coinage_r, (void *)0x08) /* to be confirmed */
- PORT_START_TAG("IN2") // 2
+ PORT_START("IN2") // 2
/* tested at 0xe83c */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
/* tested at 0xe5ab - after "Collect" and "Gamble" buttons */
@@ -427,7 +427,7 @@ static INPUT_PORTS_START( starspnr )
/* tested at 0x1b0f */
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3") // 3
+ PORT_START("IN3") // 3
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME( "Hold 1" )
/* tested at 0xe8ea and 0xecbe */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -436,7 +436,7 @@ static INPUT_PORTS_START( starspnr )
/* tested at 0x0178 */
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN4") // 4
+ PORT_START("IN4") // 4
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_NAME( "Hold 2" )
/* tested at 0x064e */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -445,7 +445,7 @@ static INPUT_PORTS_START( starspnr )
/* tested at 0xeed7 with IN1 bit 3 - before coins are tested - table at 0xef55 (4 * 3 bytes) */
PORT_BIT( 0x08, 0x00, IPT_SPECIAL) PORT_CUSTOM(starspnr_coinage_r, (void *)0x04) /* to be confirmed */
- PORT_START_TAG("IN5") // 5
+ PORT_START("IN5") // 5
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_NAME( "Hold 3" )
/* tested at 0xef68 before IN1 bit 3 and before IN2 bit 2 - after coins are tested - table at 0xefa2 (3 bytes) */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -456,7 +456,7 @@ static INPUT_PORTS_START( starspnr )
/* tested at 0xe312 and 0xe377 */
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN6") // 6
+ PORT_START("IN6") // 6
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON10 ) PORT_NAME( "Hold 4" )
/* tested at 0xee42, 0xee5e and 0xeff5 before IN1 bit 0 - invalid code after 0xf000 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -465,7 +465,7 @@ static INPUT_PORTS_START( starspnr )
/* tested at 0xe8dd and 0xec1c */
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN7") // 7
+ PORT_START("IN7") // 7
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_DIPNAME( 0x02, 0x00, "Clear Credits on Reset" )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -477,7 +477,7 @@ static INPUT_PORTS_START( starspnr )
/* tested at 0xec2a */
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("COINAGE") // fake port to handle settings via multiple input ports
+ PORT_START("COINAGE") // fake port to handle settings via multiple input ports
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_4C ) )
@@ -489,7 +489,7 @@ static INPUT_PORTS_START( starspnr )
PORT_DIPSETTING( 0x08, "1 Coin/10 Credits" )
PORT_DIPSETTING( 0x0c, "1 Coin/25 Credits" )
- PORT_START_TAG("PAYOUT") // fake port to handle settings via multiple input ports
+ PORT_START("PAYOUT") // fake port to handle settings via multiple input ports
PORT_DIPNAME( 0x07, 0x07, "Payout %" )
PORT_DIPSETTING( 0x00, "30%" )
PORT_DIPSETTING( 0x01, "40%" )
diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c
index 6f467f5c9d7..ff597941987 100644
--- a/src/mame/drivers/acommand.c
+++ b/src/mame/drivers/acommand.c
@@ -375,7 +375,7 @@ static ADDRESS_MAP_START( acommand, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
static INPUT_PORTS_START( acommand )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -425,7 +425,7 @@ static INPUT_PORTS_START( acommand )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c
index 5a5995b4bb4..741aed84f35 100644
--- a/src/mame/drivers/actfancr.c
+++ b/src/mame/drivers/actfancr.c
@@ -126,7 +126,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( actfancr )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -136,7 +136,7 @@ static INPUT_PORTS_START( actfancr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -146,7 +146,7 @@ static INPUT_PORTS_START( actfancr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -156,7 +156,7 @@ static INPUT_PORTS_START( actfancr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -178,7 +178,7 @@ static INPUT_PORTS_START( actfancr )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
diff --git a/src/mame/drivers/aeroboto.c b/src/mame/drivers/aeroboto.c
index 65b682b1847..60e1a52eac4 100644
--- a/src/mame/drivers/aeroboto.c
+++ b/src/mame/drivers/aeroboto.c
@@ -110,7 +110,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( formatz )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
@@ -120,7 +120,7 @@ static INPUT_PORTS_START( formatz )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
@@ -130,7 +130,7 @@ static INPUT_PORTS_START( formatz )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -153,7 +153,7 @@ static INPUT_PORTS_START( formatz )
stay low for exactly 2 frames to be consistently recognized. */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2) PORT_DIPLOCATION("SW1:8") /* "Screen Inversion" */
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW2:1,2,3")
PORT_DIPSETTING( 0x07, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 4C_1C ) )
diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c
index c3787443423..d9a9bc67704 100644
--- a/src/mame/drivers/aerofgt.c
+++ b/src/mame/drivers/aerofgt.c
@@ -443,7 +443,7 @@ static ADDRESS_MAP_START( wbbc97_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( pspikes )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -461,7 +461,7 @@ static INPUT_PORTS_START( pspikes )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -471,7 +471,7 @@ static INPUT_PORTS_START( pspikes )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 2C_1C ) )
@@ -516,7 +516,7 @@ static INPUT_PORTS_START( pspikes )
INPUT_PORTS_END
static INPUT_PORTS_START( pspikesb )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -534,7 +534,7 @@ static INPUT_PORTS_START( pspikesb )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -544,7 +544,7 @@ static INPUT_PORTS_START( pspikesb )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
/* Dips bank 1 */
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) )
@@ -598,7 +598,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( karatblz )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -616,7 +616,7 @@ static INPUT_PORTS_START( karatblz )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -626,7 +626,7 @@ static INPUT_PORTS_START( karatblz )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -644,7 +644,7 @@ static INPUT_PORTS_START( karatblz )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SERVICE2 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
@@ -654,7 +654,7 @@ static INPUT_PORTS_START( karatblz )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(4)
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3") /* It affects Coin 1, 2, 3 and 4 */
PORT_DIPSETTING( 0x0004, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0005, DEF_STR( 3C_1C ) )
@@ -709,7 +709,7 @@ static INPUT_PORTS_START( karatblz )
INPUT_PORTS_END
static INPUT_PORTS_START( spinlbrk )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -727,7 +727,7 @@ static INPUT_PORTS_START( spinlbrk )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -737,7 +737,7 @@ static INPUT_PORTS_START( spinlbrk )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x000f, "1 Credit 1 Health Pack" ) /* I chose "Health Packs" as the actual value can change */
PORT_DIPSETTING( 0x000e, "1 Credit 2 Health Packs" ) /* via dipswitch 2-7 (0x4000) see below */
@@ -815,7 +815,7 @@ static INPUT_PORTS_START( spinlbru )
INPUT_PORTS_END
static INPUT_PORTS_START( turbofrc )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -833,7 +833,7 @@ static INPUT_PORTS_START( turbofrc )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN3 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -843,7 +843,7 @@ static INPUT_PORTS_START( turbofrc )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* START1 */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -853,7 +853,7 @@ static INPUT_PORTS_START( turbofrc )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3") /* It affects Coin 1, 2 and 3 */
PORT_DIPSETTING( 0x0004, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0005, DEF_STR( 3C_1C ) )
@@ -901,7 +901,7 @@ static INPUT_PORTS_START( turbofrc )
INPUT_PORTS_END
static INPUT_PORTS_START( aerofgtb )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -919,7 +919,7 @@ static INPUT_PORTS_START( aerofgtb )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -929,7 +929,7 @@ static INPUT_PORTS_START( aerofgtb )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
/* Dips bank 1 */
/* "Free Play mode: Have SW1:1-8 ON." */
PORT_DIPNAME( 0x0001, 0x0001, "Coin Slot" ) PORT_DIPLOCATION("SW1:1")
@@ -980,7 +980,7 @@ static INPUT_PORTS_START( aerofgtb )
PORT_SERVICE( 0x8000, IP_ACTIVE_LOW )
/* Dips bank 3 (not documented) */
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0001, 0x0000, "Country" ) PORT_DIPLOCATION("SW3:1")
PORT_DIPSETTING( 0x0000, DEF_STR( Japan ) )
PORT_DIPSETTING( 0x0001, "Taiwan" )
@@ -989,7 +989,7 @@ static INPUT_PORTS_START( aerofgtb )
INPUT_PORTS_END
static INPUT_PORTS_START( aerofgt )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -999,7 +999,7 @@ static INPUT_PORTS_START( aerofgt )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1009,7 +1009,7 @@ static INPUT_PORTS_START( aerofgt )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -1019,7 +1019,7 @@ static INPUT_PORTS_START( aerofgt )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
/* "Free Play mode: Have SW1:1-8 ON." */
PORT_DIPNAME( 0x0001, 0x0001, "Coin Slot" ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x0001, "Same" )
@@ -1046,7 +1046,7 @@ static INPUT_PORTS_START( aerofgt )
PORT_DIPSETTING( 0x0080, "Start 1 Coin/Continue 1 Coin" )
PORT_DIPSETTING( 0x0000, "Start 2 Coin/Continue 1 Coin" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1069,7 +1069,7 @@ static INPUT_PORTS_START( aerofgt )
PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW2:8" )
/* This DSW3 is not documented in the Aero Fighters manual */
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x000f, 0x0000, "Country" )
PORT_DIPSETTING( 0x0000, "Any" )
PORT_DIPSETTING( 0x000f, "USA/Canada" )
diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c
index 7ad00470527..38512227423 100644
--- a/src/mame/drivers/airbustr.c
+++ b/src/mame/drivers/airbustr.c
@@ -427,7 +427,7 @@ ADDRESS_MAP_END
/* Input Ports */
static INPUT_PORTS_START( airbustr )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -437,7 +437,7 @@ static INPUT_PORTS_START( airbustr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -447,7 +447,7 @@ static INPUT_PORTS_START( airbustr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -457,7 +457,7 @@ static INPUT_PORTS_START( airbustr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) // used
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPUNUSED_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW1:1" )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:2")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -485,7 +485,7 @@ static INPUT_PORTS_START( airbustr )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_3C ) ) PORT_CONDITION("DSW1", 0x08, PORTCOND_EQUALS, 0x00)
PORT_DIPSETTING( 0x00, DEF_STR( 1C_4C ) ) PORT_CONDITION("DSW1", 0x08, PORTCOND_EQUALS, 0x00)
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
diff --git a/src/mame/drivers/ajax.c b/src/mame/drivers/ajax.c
index 620bdb2fb57..b5e41cc61a5 100644
--- a/src/mame/drivers/ajax.c
+++ b/src/mame/drivers/ajax.c
@@ -58,7 +58,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( ajax )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -94,7 +94,7 @@ static INPUT_PORTS_START( ajax )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Coin Slot 2 Invalid" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -117,7 +117,7 @@ static INPUT_PORTS_START( ajax )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW3:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -130,7 +130,7 @@ static INPUT_PORTS_START( ajax )
PORT_DIPSETTING( 0x00, "Inverted" )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SYSTEM") /* COINSW & START */
+ PORT_START("SYSTEM") /* COINSW & START */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) /* service */
@@ -140,7 +140,7 @@ static INPUT_PORTS_START( ajax )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -150,7 +150,7 @@ static INPUT_PORTS_START( ajax )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/aleck64.c b/src/mame/drivers/aleck64.c
index ff92e7c04a4..8672f5c3fb4 100644
--- a/src/mame/drivers/aleck64.c
+++ b/src/mame/drivers/aleck64.c
@@ -212,7 +212,7 @@ static ADDRESS_MAP_START( rsp_map, ADDRESS_SPACE_PROGRAM, 32 )
ADDRESS_MAP_END
static INPUT_PORTS_START( aleck64 )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) // Button A
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) // Button B
PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) // Button Z
@@ -229,13 +229,13 @@ static INPUT_PORTS_START( aleck64 )
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_BUTTON8 ) PORT_PLAYER(1) // C Button Left
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_BUTTON9 ) PORT_PLAYER(1) // C Button Right
- PORT_START_TAG("P1_ANALOG_X")
+ PORT_START("P1_ANALOG_X")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_PLAYER(1)
- PORT_START_TAG("P1_ANALOG_Y")
+ PORT_START("P1_ANALOG_Y")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(0xff,0x00) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_PLAYER(1)
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_DIPNAME( 0x80000000, 0x80000000, "DIPSW1 #8" )
PORT_DIPSETTING( 0x80000000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
@@ -286,7 +286,7 @@ static INPUT_PORTS_START( aleck64 )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
PORT_BIT(0x0000ffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff00ffff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE_NO_TOGGLE( 0x00200000, IP_ACTIVE_LOW )
PORT_BIT( 0x00100000, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service Button") PORT_CODE(KEYCODE_7)
@@ -296,11 +296,11 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mtetrisc )
// The basic N64 controls are unused in this game
- PORT_START_TAG("P1")
- PORT_START_TAG("P1_ANALOG_X")
- PORT_START_TAG("P1_ANALOG_Y")
+ PORT_START("P1")
+ PORT_START("P1_ANALOG_X")
+ PORT_START("P1_ANALOG_Y")
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0xffff0000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x00008000, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x00004000, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -319,7 +319,7 @@ static INPUT_PORTS_START( mtetrisc )
PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xffcc, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE_NO_TOGGLE( 0x0020, IP_ACTIVE_LOW )
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service Button") PORT_CODE(KEYCODE_7)
@@ -329,7 +329,7 @@ static INPUT_PORTS_START( mtetrisc )
INPUT_PORTS_END
static INPUT_PORTS_START( starsldr )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) // Button A
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) // Button B
PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -346,13 +346,13 @@ static INPUT_PORTS_START( starsldr )
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_PLAYER(1) // Button D
- PORT_START_TAG("P1_ANALOG_X")
+ PORT_START("P1_ANALOG_X")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_PLAYER(1)
- PORT_START_TAG("P1_ANALOG_Y")
+ PORT_START("P1_ANALOG_Y")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(0xff,0x00) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_PLAYER(1)
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_DIPNAME( 0x80000000, 0x00000000, DEF_STR(Joystick) ) // DIPSW1 #8
PORT_DIPSETTING( 0x00000000, DEF_STR(Joystick) )
PORT_DIPSETTING( 0x80000000, "3D" )
@@ -399,7 +399,7 @@ static INPUT_PORTS_START( starsldr )
PORT_DIPSETTING( 0x00000000, "Hard2" )
PORT_BIT(0x0000ffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff00ffff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE_NO_TOGGLE( 0x00200000, IP_ACTIVE_LOW )
PORT_BIT( 0x00100000, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service Button") PORT_CODE(KEYCODE_7)
diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c
index 0ada6de434a..8ddf95afa1f 100644
--- a/src/mame/drivers/alg.c
+++ b/src/mame/drivers/alg.c
@@ -373,44 +373,44 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( alg )
- PORT_START_TAG("JOY0DAT") /* read by Amiga core */
+ PORT_START("JOY0DAT") /* read by Amiga core */
PORT_BIT( 0x0303, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(amiga_joystick_convert, "P1JOY")
PORT_BIT( 0xfcfc, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("JOY1DAT") /* read by Amiga core */
+ PORT_START("JOY1DAT") /* read by Amiga core */
PORT_BIT( 0x0303, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(amiga_joystick_convert, "P2JOY")
PORT_BIT( 0xfcfc, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("POTGO") /* read by Amiga core */
+ PORT_START("POTGO") /* read by Amiga core */
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xaaff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("HVPOS") /* read by Amiga core */
+ PORT_START("HVPOS") /* read by Amiga core */
PORT_BIT( 0x1ffff, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(lightgun_pos_r, NULL)
- PORT_START_TAG("FIRE")
+ PORT_START("FIRE")
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P1JOY") /* referenced by JOY0DAT */
+ PORT_START("P1JOY") /* referenced by JOY0DAT */
PORT_SERVICE_NO_TOGGLE( 0x01, IP_ACTIVE_HIGH )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_COIN2 )
- PORT_START_TAG("P2JOY") /* referenced by JOY1DAT */
+ PORT_START("P2JOY") /* referenced by JOY1DAT */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("GUN1X") /* referenced by lightgun_pos_r */
+ PORT_START("GUN1X") /* referenced by lightgun_pos_r */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("GUN1Y") /* referenced by lightgun_pos_r */
+ PORT_START("GUN1Y") /* referenced by lightgun_pos_r */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) PORT_PLAYER(1)
INPUT_PORTS_END
@@ -428,13 +428,13 @@ static INPUT_PORTS_START( alg_2p )
PORT_MODIFY("P2JOY")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(lightgun_holster_r, NULL)
- PORT_START_TAG("GUN2X") /* referenced by lightgun_pos_r */
+ PORT_START("GUN2X") /* referenced by lightgun_pos_r */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("GUN2Y") /* referenced by lightgun_pos_r */
+ PORT_START("GUN2Y") /* referenced by lightgun_pos_r */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("TRIGGERS") /* referenced by lightgun_trigger_r and lightgun_holster_r */
+ PORT_START("TRIGGERS") /* referenced by lightgun_trigger_r and lightgun_holster_r */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1)
diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c
index d4fcae6dfab..fa19a10333a 100644
--- a/src/mame/drivers/aliens.c
+++ b/src/mame/drivers/aliens.c
@@ -121,7 +121,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( aliens )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -157,7 +157,7 @@ static INPUT_PORTS_START( aliens )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -175,7 +175,7 @@ static INPUT_PORTS_START( aliens )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW3:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -187,7 +187,7 @@ static INPUT_PORTS_START( aliens )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -197,7 +197,7 @@ static INPUT_PORTS_START( aliens )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c
index f0e4b1d3715..6d9eef4611e 100644
--- a/src/mame/drivers/alpha68k.c
+++ b/src/mame/drivers/alpha68k.c
@@ -941,17 +941,17 @@ ADDRESS_MAP_END
PORT_DIPSETTING( 0x00, "A 3C/2C B 8C/1C" )
#define ALPHA68K_MCU \
- PORT_START_TAG("IN2") /* Coin input to microcontroller */\
+ PORT_START("IN2") /* Coin input to microcontroller */\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )\
static INPUT_PORTS_START( sstingry )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
ALPHA68K_PLAYER_INPUT_SWAP_LR_LSB( 1, IPT_UNKNOWN, IPT_START1, IP_ACTIVE_HIGH )
ALPHA68K_PLAYER_INPUT_SWAP_LR_MSB( 2, IPT_UNKNOWN, IPT_START2, IP_ACTIVE_HIGH )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -972,11 +972,11 @@ static INPUT_PORTS_START( sstingry )
INPUT_PORTS_END
static INPUT_PORTS_START( kyros )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
ALPHA68K_PLAYER_INPUT_SWAP_LR_LSB( 1, IPT_UNKNOWN, IPT_START1, IP_ACTIVE_HIGH )
ALPHA68K_PLAYER_INPUT_SWAP_LR_MSB( 2, IPT_UNKNOWN, IPT_START2, IP_ACTIVE_HIGH )
- PORT_START_TAG("IN1") /* dipswitches */
+ PORT_START("IN1") /* dipswitches */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1006,14 +1006,14 @@ static INPUT_PORTS_START( kyros )
INPUT_PORTS_END
static INPUT_PORTS_START( jongbou )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0fff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "5" )
@@ -1040,19 +1040,19 @@ static INPUT_PORTS_START( jongbou )
ALPHA68K_MCU
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x0f, 0, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(20)
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x0f, 0, IPT_DIAL ) PORT_MINMAX(0, 15) PORT_SENSITIVITY(50) PORT_KEYDELTA(20) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( paddlema )
- PORT_START_TAG("IN0") // (bottom players)
+ PORT_START("IN0") // (bottom players)
ALPHA68K_PLAYER_INPUT_LSB( 1, IPT_UNKNOWN, IPT_UNKNOWN, IP_ACTIVE_LOW )
ALPHA68K_PLAYER_INPUT_MSB( 2, IPT_UNKNOWN, IPT_UNKNOWN, IP_ACTIVE_LOW )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1070,11 +1070,11 @@ static INPUT_PORTS_START( paddlema )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") // (top players)
+ PORT_START("IN2") // (top players)
ALPHA68K_PLAYER_INPUT_LSB( 3, IPT_UNKNOWN, IPT_UNKNOWN, IP_ACTIVE_LOW )
ALPHA68K_PLAYER_INPUT_MSB( 4, IPT_UNKNOWN, IPT_UNKNOWN, IP_ACTIVE_LOW )
- PORT_START_TAG("IN3") //DSW0
+ PORT_START("IN3") //DSW0
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_3C ) )
@@ -1096,7 +1096,7 @@ static INPUT_PORTS_START( paddlema )
PORT_DIPSETTING( 0x40, "A to E" )
// PORT_DIPSETTING( 0xc0, "A to B" ) // Possibility of "A only" in another version ?
- PORT_START_TAG("IN4") // DSW1
+ PORT_START("IN4") // DSW1
PORT_SERVICE( 0x01, IP_ACTIVE_HIGH )
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -1121,15 +1121,15 @@ static INPUT_PORTS_START( paddlema )
INPUT_PORTS_END
static INPUT_PORTS_START( timesold )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
ALPHA68K_PLAYER_INPUT_LSB( 1, IPT_UNKNOWN, IPT_START1, IP_ACTIVE_LOW )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
ALPHA68K_PLAYER_INPUT_LSB( 2, IPT_UNKNOWN, IPT_START2, IP_ACTIVE_LOW )
ALPHA68K_MCU
- PORT_START_TAG("IN3") /* Service + dip */
+ PORT_START("IN3") /* Service + dip */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE_NO_TOGGLE(0x02, IP_ACTIVE_LOW)
@@ -1150,7 +1150,7 @@ static INPUT_PORTS_START( timesold )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN4") /* A 6 way dip switch */
+ PORT_START("IN4") /* A 6 way dip switch */
ALPHA68K_COINAGE_BITS_0TO2
PORT_DIPNAME( 0x08, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
@@ -1162,24 +1162,24 @@ static INPUT_PORTS_START( timesold )
PORT_DIPSETTING( 0x00, "6" )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN5") /* player 1 12-way rotary control - converted in controls_r() */
+ PORT_START("IN5") /* player 1 12-way rotary control - converted in controls_r() */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(8) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X) PORT_REVERSE
- PORT_START_TAG("IN6") /* player 2 12-way rotary control - converted in controls_r() */
+ PORT_START("IN6") /* player 2 12-way rotary control - converted in controls_r() */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(8) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M) PORT_REVERSE PORT_PLAYER(2)
INPUT_PORTS_END
/* Same as 'timesold' but different default settings for the "Language" Dip Switch */
static INPUT_PORTS_START( btlfield )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
ALPHA68K_PLAYER_INPUT_LSB( 1, IPT_UNKNOWN, IPT_START1, IP_ACTIVE_LOW )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
ALPHA68K_PLAYER_INPUT_LSB( 2, IPT_UNKNOWN, IPT_START2, IP_ACTIVE_LOW )
ALPHA68K_MCU
- PORT_START_TAG("IN3") /* Service + dip */
+ PORT_START("IN3") /* Service + dip */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE_NO_TOGGLE(0x02, IP_ACTIVE_LOW)
@@ -1200,7 +1200,7 @@ static INPUT_PORTS_START( btlfield )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN4") /* A 6 way dip switch */
+ PORT_START("IN4") /* A 6 way dip switch */
ALPHA68K_COINAGE_BITS_0TO2
PORT_DIPNAME( 0x08, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:3")
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
@@ -1212,10 +1212,10 @@ static INPUT_PORTS_START( btlfield )
PORT_DIPSETTING( 0x00, "6" )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN5") /* player 1 12-way rotary control - converted in controls_r() */
+ PORT_START("IN5") /* player 1 12-way rotary control - converted in controls_r() */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(8) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X) PORT_REVERSE
- PORT_START_TAG("IN6") /* player 2 12-way rotary control - converted in controls_r() */
+ PORT_START("IN6") /* player 2 12-way rotary control - converted in controls_r() */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(8) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M) PORT_REVERSE PORT_PLAYER(2)
INPUT_PORTS_END
@@ -1246,15 +1246,15 @@ static INPUT_PORTS_START( btlfildb )
INPUT_PORTS_END
static INPUT_PORTS_START( skysoldr )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
ALPHA68K_PLAYER_INPUT_LSB( 1, IPT_UNKNOWN, IPT_START1, IP_ACTIVE_LOW )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
ALPHA68K_PLAYER_INPUT_LSB( 2, IPT_UNKNOWN, IPT_START2, IP_ACTIVE_LOW )
ALPHA68K_MCU
- PORT_START_TAG("IN3") /* Service + dip */
+ PORT_START("IN3") /* Service + dip */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE_NO_TOGGLE(0x02, IP_ACTIVE_LOW)
@@ -1277,7 +1277,7 @@ static INPUT_PORTS_START( skysoldr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN4") /* A 6 way dip switch */
+ PORT_START("IN4") /* A 6 way dip switch */
ALPHA68K_COINAGE_BITS_0TO2
PORT_DIPNAME( 0x08, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
@@ -1289,15 +1289,15 @@ static INPUT_PORTS_START( skysoldr )
PORT_DIPSETTING( 0x00, "6" )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN5") /* player 1 12-way rotary control */
+ PORT_START("IN5") /* player 1 12-way rotary control */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN6") /* player 2 12-way rotary control */
+ PORT_START("IN6") /* player 2 12-way rotary control */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( goldmedl )
- PORT_START_TAG("IN0") /* 3 buttons per player, no joystick */
+ PORT_START("IN0") /* 3 buttons per player, no joystick */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
@@ -1307,7 +1307,7 @@ static INPUT_PORTS_START( goldmedl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* START3 is mapped elsewhere */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1") /* 3 buttons per player, no joystick */
+ PORT_START("IN1") /* 3 buttons per player, no joystick */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
@@ -1319,7 +1319,7 @@ static INPUT_PORTS_START( goldmedl )
ALPHA68K_MCU
- PORT_START_TAG("IN3") /* Service + dip */
+ PORT_START("IN3") /* Service + dip */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE_NO_TOGGLE(0x02, IP_ACTIVE_LOW)
@@ -1340,7 +1340,7 @@ static INPUT_PORTS_START( goldmedl )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
- PORT_START_TAG("IN4") /* A 6 way dip switch */
+ PORT_START("IN4") /* A 6 way dip switch */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:5,6")
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -1352,23 +1352,23 @@ static INPUT_PORTS_START( goldmedl )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN5") /* player 1 12-way rotary control */
+ PORT_START("IN5") /* player 1 12-way rotary control */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN6") /* player 2 12-way rotary control */
+ PORT_START("IN6") /* player 2 12-way rotary control */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( skyadvnt )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
ALPHA68K_PLAYER_INPUT_LSB( 1, IPT_UNKNOWN, IPT_START1, IP_ACTIVE_LOW )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
ALPHA68K_PLAYER_INPUT_LSB( 2, IPT_UNKNOWN, IPT_START2, IP_ACTIVE_LOW )
ALPHA68K_MCU
- PORT_START_TAG("IN3") /* Service + dip */
+ PORT_START("IN3") /* Service + dip */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE_NO_TOGGLE(0x02, IP_ACTIVE_LOW)
@@ -1388,7 +1388,7 @@ static INPUT_PORTS_START( skyadvnt )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN4") /* A 6 way dip switch */
+ PORT_START("IN4") /* A 6 way dip switch */
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW1:6" ) /* Listed as "Unused" */
ALPHA68K_COINAGE_BITS_1TO3
PORT_DIPNAME( 0x10, 0x10, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:2")
@@ -1419,15 +1419,15 @@ static INPUT_PORTS_START( skyadvnu )
INPUT_PORTS_END
static INPUT_PORTS_START( gangwars )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
ALPHA68K_PLAYER_INPUT_LSB( 1, IPT_BUTTON3, IPT_START1, IP_ACTIVE_LOW )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
ALPHA68K_PLAYER_INPUT_LSB( 2, IPT_BUTTON3, IPT_START2, IP_ACTIVE_LOW )
ALPHA68K_MCU
- PORT_START_TAG("IN3") /* Service + dip */
+ PORT_START("IN3") /* Service + dip */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE_NO_TOGGLE(0x02, IP_ACTIVE_LOW)
@@ -1449,7 +1449,7 @@ static INPUT_PORTS_START( gangwars )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN4") /* A 6 way dip switch */
+ PORT_START("IN4") /* A 6 way dip switch */
PORT_DIPNAME( 0x01, 0x00, "Price to Continue" ) PORT_DIPLOCATION("SW1:6")
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x00, "Same as Start" )
@@ -1496,13 +1496,13 @@ static INPUT_PORTS_START( gangwarb )
INPUT_PORTS_END
static INPUT_PORTS_START( sbasebal )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
ALPHA68K_PLAYER_INPUT_LSB( 1, IPT_BUTTON3, IPT_START1, IP_ACTIVE_LOW )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
ALPHA68K_PLAYER_INPUT_LSB( 2, IPT_BUTTON3, IPT_START2, IP_ACTIVE_LOW )
- PORT_START_TAG("IN2") /* Coin input to microcontroller */
+ PORT_START("IN2") /* Coin input to microcontroller */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
#if SBASEBAL_HACK
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -1510,7 +1510,7 @@ static INPUT_PORTS_START( sbasebal )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN2 - unused due to code at 0x0002b4
#endif
- PORT_START_TAG("IN3") /* Service + dip */
+ PORT_START("IN3") /* Service + dip */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE_NO_TOGGLE(0x02, IP_ACTIVE_LOW)
@@ -1540,7 +1540,7 @@ static INPUT_PORTS_START( sbasebal )
PORT_DIPSETTING( 0xc0, "2:00" )
#endif
- PORT_START_TAG("IN4") /* A 6 way dip switch */
+ PORT_START("IN4") /* A 6 way dip switch */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) // Check code at 0x009d3a
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -1565,13 +1565,13 @@ static INPUT_PORTS_START( sbasebal )
INPUT_PORTS_END
static INPUT_PORTS_START( tnexspce )
- PORT_START_TAG("P1")
+ PORT_START("P1")
ALPHA68K_PLAYER_INPUT_LSB( 1, IPT_UNKNOWN, IPT_START1, IP_ACTIVE_LOW )
- PORT_START_TAG("P2")
+ PORT_START("P2")
ALPHA68K_PLAYER_INPUT_LSB( 2, IPT_UNKNOWN, IPT_START2, IP_ACTIVE_LOW )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1581,7 +1581,7 @@ static INPUT_PORTS_START( tnexspce )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1601,7 +1601,7 @@ static INPUT_PORTS_START( tnexspce )
PORT_DIPSETTING( 0x40, "4" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
diff --git a/src/mame/drivers/ambush.c b/src/mame/drivers/ambush.c
index 15fb10e26a9..6a24b9563bd 100644
--- a/src/mame/drivers/ambush.c
+++ b/src/mame/drivers/ambush.c
@@ -82,7 +82,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( ambush )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -92,7 +92,7 @@ static INPUT_PORTS_START( ambush )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -102,7 +102,7 @@ static INPUT_PORTS_START( ambush )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c
index f59d979f896..65378384623 100644
--- a/src/mame/drivers/ampoker2.c
+++ b/src/mame/drivers/ampoker2.c
@@ -604,7 +604,7 @@ ADDRESS_MAP_END
*************************/
static INPUT_PORTS_START( ampoker2 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -615,7 +615,7 @@ static INPUT_PORTS_START( ampoker2 )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(2)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -626,7 +626,7 @@ static INPUT_PORTS_START( ampoker2 )
PORT_DIPSETTING( 0x00, "Mode 2" )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Hold 4") PORT_CODE(KEYCODE_V)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -637,7 +637,7 @@ static INPUT_PORTS_START( ampoker2 )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_NAME("Payout") PORT_CODE(KEYCODE_Q)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Hopper Out") PORT_CODE(KEYCODE_I)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Supervisor Key") PORT_TOGGLE PORT_CODE(KEYCODE_0)
PORT_DIPNAME( 0x08, 0x08, "Remote Credits" ) PORT_DIPLOCATION("SW1:1") /* DSW1 */
@@ -647,7 +647,7 @@ static INPUT_PORTS_START( ampoker2 )
PORT_DIPSETTING( 0x00, "Remote Off" ) PORT_CONDITION("IN1",0x08,PORTCOND_EQUALS,0x00)
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Black Card") PORT_CODE(KEYCODE_S)
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) /* not used */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Hopper Low") PORT_CODE(KEYCODE_H)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Hold 2") PORT_CODE(KEYCODE_X)
@@ -656,7 +656,7 @@ static INPUT_PORTS_START( ampoker2 )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Deal / Take") PORT_CODE(KEYCODE_1)
- PORT_START_TAG("IN5")
+ PORT_START("IN5")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -667,7 +667,7 @@ static INPUT_PORTS_START( ampoker2 )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Hold 3") PORT_CODE(KEYCODE_C)
- PORT_START_TAG("IN6")
+ PORT_START("IN6")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -678,7 +678,7 @@ static INPUT_PORTS_START( ampoker2 )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
- PORT_START_TAG("IN7")
+ PORT_START("IN7")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE ) /* not used */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Remote Credits") PORT_IMPULSE(12) PORT_CODE(KEYCODE_3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_IMPULSE(2)
@@ -689,7 +689,7 @@ static INPUT_PORTS_START( ampoker2 )
INPUT_PORTS_END
static INPUT_PORTS_START( ampkr95 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -700,7 +700,7 @@ static INPUT_PORTS_START( ampkr95 )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(2)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -711,7 +711,7 @@ static INPUT_PORTS_START( ampkr95 )
PORT_DIPSETTING( 0x00, "Mode 2" )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Hold 4") PORT_CODE(KEYCODE_V)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -722,7 +722,7 @@ static INPUT_PORTS_START( ampkr95 )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_NAME("Payout") PORT_CODE(KEYCODE_Q)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Hopper Out") PORT_CODE(KEYCODE_I)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Supervisor Key") PORT_TOGGLE PORT_CODE(KEYCODE_0)
PORT_DIPNAME( 0x08, 0x08, "Remote Credits" ) PORT_DIPLOCATION("SW1:1") /* DSW1 */
@@ -732,7 +732,7 @@ static INPUT_PORTS_START( ampkr95 )
PORT_DIPSETTING( 0x00, "Remote Off" ) PORT_CONDITION("IN1",0x08,PORTCOND_EQUALS,0x00)
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Black Card") PORT_CODE(KEYCODE_S)
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) /* not used */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Hopper Low") PORT_CODE(KEYCODE_H)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Hold 2") PORT_CODE(KEYCODE_X)
@@ -741,7 +741,7 @@ static INPUT_PORTS_START( ampkr95 )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Deal / Take") PORT_CODE(KEYCODE_1)
- PORT_START_TAG("IN5")
+ PORT_START("IN5")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -752,7 +752,7 @@ static INPUT_PORTS_START( ampkr95 )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Hold 3") PORT_CODE(KEYCODE_C)
- PORT_START_TAG("IN6")
+ PORT_START("IN6")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -763,7 +763,7 @@ static INPUT_PORTS_START( ampkr95 )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
- PORT_START_TAG("IN7")
+ PORT_START("IN7")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE ) /* not used */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Remote Credits") PORT_IMPULSE(12) PORT_CODE(KEYCODE_3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_IMPULSE(2)
@@ -774,7 +774,7 @@ static INPUT_PORTS_START( ampkr95 )
INPUT_PORTS_END
static INPUT_PORTS_START( sigmapkr )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -785,7 +785,7 @@ static INPUT_PORTS_START( sigmapkr )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(2)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -796,7 +796,7 @@ static INPUT_PORTS_START( sigmapkr )
PORT_DIPSETTING( 0x00, "Mode 2" )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Hold 4") PORT_CODE(KEYCODE_V)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -807,7 +807,7 @@ static INPUT_PORTS_START( sigmapkr )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_NAME("Payout") PORT_CODE(KEYCODE_Q)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Hopper Out") PORT_CODE(KEYCODE_I)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Supervisor Key") PORT_TOGGLE PORT_CODE(KEYCODE_0)
PORT_DIPNAME( 0x08, 0x08, "Remote Credits" ) PORT_DIPLOCATION("SW1:1") /* DSW1 */
@@ -817,7 +817,7 @@ static INPUT_PORTS_START( sigmapkr )
PORT_DIPSETTING( 0x00, "Remote Off" ) PORT_CONDITION("IN1",0x08,PORTCOND_EQUALS,0x00)
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Double") PORT_CODE(KEYCODE_S)
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) /* not used */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Hopper Low") PORT_CODE(KEYCODE_H)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Hold 2") PORT_CODE(KEYCODE_X)
@@ -826,7 +826,7 @@ static INPUT_PORTS_START( sigmapkr )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Deal / Take") PORT_CODE(KEYCODE_1)
- PORT_START_TAG("IN5")
+ PORT_START("IN5")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -837,7 +837,7 @@ static INPUT_PORTS_START( sigmapkr )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Hold 3") PORT_CODE(KEYCODE_C)
- PORT_START_TAG("IN6")
+ PORT_START("IN6")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -848,7 +848,7 @@ static INPUT_PORTS_START( sigmapkr )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
- PORT_START_TAG("IN7")
+ PORT_START("IN7")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE ) /* not used */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Remote Credits") PORT_IMPULSE(12) PORT_CODE(KEYCODE_3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_IMPULSE(2)
@@ -859,7 +859,7 @@ static INPUT_PORTS_START( sigmapkr )
INPUT_PORTS_END
static INPUT_PORTS_START( sigma2k )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -871,7 +871,7 @@ static INPUT_PORTS_START( sigma2k )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Hold 1") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Operator Key") PORT_TOGGLE PORT_CODE(KEYCODE_9)
@@ -883,7 +883,7 @@ static INPUT_PORTS_START( sigma2k )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -895,7 +895,7 @@ static INPUT_PORTS_START( sigma2k )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Supervisor Key") PORT_TOGGLE PORT_CODE(KEYCODE_0)
@@ -907,7 +907,7 @@ static INPUT_PORTS_START( sigma2k )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Hold 2") PORT_CODE(KEYCODE_X)
@@ -919,7 +919,7 @@ static INPUT_PORTS_START( sigma2k )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN5")
+ PORT_START("IN5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -931,7 +931,7 @@ static INPUT_PORTS_START( sigma2k )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN6")
+ PORT_START("IN6")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Bet") PORT_CODE(KEYCODE_A)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_NAME("Hold 5") PORT_CODE(KEYCODE_B)
@@ -943,7 +943,7 @@ static INPUT_PORTS_START( sigma2k )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN7")
+ PORT_START("IN7")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Credits IN") PORT_CODE(KEYCODE_5)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c
index 066467c8351..44c32d816dc 100644
--- a/src/mame/drivers/amspdwy.c
+++ b/src/mame/drivers/amspdwy.c
@@ -133,7 +133,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( amspdwy )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, "Character Test" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -151,7 +151,7 @@ static INPUT_PORTS_START( amspdwy )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x00, "SW1:2" ) /* Listed as "Unused" */
PORT_DIPUNUSED_DIPLOC( 0x80, 0x00, "SW1:1" ) /* Listed as "Unused" */
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW2:7,8")
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
// PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) )
@@ -170,24 +170,24 @@ static INPUT_PORTS_START( amspdwy )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x00, "SW2:2" ) /* Listed as "Unused" */
PORT_DIPUNUSED_DIPLOC( 0x80, 0x00, "SW2:1" ) /* Listed as "Unused" */
- PORT_START_TAG("WHEEL1") // Player 1 Wheel + Coins
+ PORT_START("WHEEL1") // Player 1 Wheel + Coins
PORT_BIT( 0x1f, IP_ACTIVE_HIGH, IPT_SPECIAL ) // wheel
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(2) // 2-3f
- PORT_START_TAG("WHEEL2") // Player 2 Wheel + Coins
+ PORT_START("WHEEL2") // Player 2 Wheel + Coins
PORT_BIT( 0x1f, IP_ACTIVE_HIGH, IPT_SPECIAL )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(2)
- PORT_START_TAG("IN0") // Player 1&2 Pedals + YM2151 Sound Status
+ PORT_START("IN0") // Player 1&2 Pedals + YM2151 Sound Status
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_SPECIAL )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_SPECIAL )
- PORT_START_TAG("AN1") // Player 1 Analog Fake Port
+ PORT_START("AN1") // Player 1 Analog Fake Port
PORT_BIT( 0xffff, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(15) PORT_KEYDELTA(20) PORT_CODE_DEC(KEYCODE_LEFT) PORT_CODE_INC(KEYCODE_RIGHT) PORT_PLAYER(1)
- PORT_START_TAG("AN2") // Player 2 Analog Fake Port
+ PORT_START("AN2") // Player 2 Analog Fake Port
PORT_BIT( 0xffff, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(15) PORT_KEYDELTA(20) PORT_CODE_DEC(KEYCODE_D) PORT_CODE_INC(KEYCODE_G) PORT_PLAYER(2)
INPUT_PORTS_END
diff --git a/src/mame/drivers/angelkds.c b/src/mame/drivers/angelkds.c
index a8498a24f11..bb8cc5bce30 100644
--- a/src/mame/drivers/angelkds.c
+++ b/src/mame/drivers/angelkds.c
@@ -300,7 +300,7 @@ static INPUT_PORTS_START( angelkds )
Joystick Test: Set SW1:1-7 ON & SW1:8 OFF (A:Free Play & B:3C_1C), hold test switch and reboot.
Joystick Test Coin_A & Coin_B seem to be switched, only works when setting A to 3C_1C and B to Free Play.
*/
- PORT_START_TAG("I40") /* inport $40 */
+ PORT_START("I40") /* inport $40 */
PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x70, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 3C_1C ) )
@@ -337,7 +337,7 @@ static INPUT_PORTS_START( angelkds )
PORT_DIPSETTING( 0x0a, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
- PORT_START_TAG("I41") /* inport $41 */
+ PORT_START("I41") /* inport $41 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -360,7 +360,7 @@ static INPUT_PORTS_START( angelkds )
PORT_DIPSETTING( 0x80, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Very_Hard ) )
- PORT_START_TAG("I42") /* inport $42 */
+ PORT_START("I42") /* inport $42 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -370,7 +370,7 @@ static INPUT_PORTS_START( angelkds )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("I80") /* inport $80 */
+ PORT_START("I80") /* inport $80 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -380,22 +380,22 @@ static INPUT_PORTS_START( angelkds )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("I81") /* inport $81 */
+ PORT_START("I81") /* inport $81 */
ANGELDSK_PLAYERS_INPUT( 1 )
- PORT_START_TAG("I82") /* inport $82 */
+ PORT_START("I82") /* inport $82 */
ANGELDSK_PLAYERS_INPUT( 2 )
#if FAKEINPUTS
/* Fake inputs to allow to play the game with 1 joystick instead of 2 */
- PORT_START_TAG("FAKE1")
+ PORT_START("FAKE1")
PORT_DIPNAME( 0x01, 0x00, "FAKE (for debug) Joysticks (Player 1)" )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x00, "2" )
ANGELDSK_FAKE_PLAYERS_INPUT( 1 )
- PORT_START_TAG("FAKE2")
+ PORT_START("FAKE2")
PORT_DIPNAME( 0x01, 0x00, "FAKE (for debug) Joysticks (Player 2)" )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x00, "2" )
@@ -406,7 +406,7 @@ static INPUT_PORTS_START( angelkds )
INPUT_PORTS_END
static INPUT_PORTS_START( spcpostn )
- PORT_START_TAG("I40") /* inport $40 */
+ PORT_START("I40") /* inport $40 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -442,7 +442,7 @@ static INPUT_PORTS_START( spcpostn )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
- PORT_START_TAG("I41") /* inport $41 */
+ PORT_START("I41") /* inport $41 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR(Allow_Continue ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
@@ -464,7 +464,7 @@ static INPUT_PORTS_START( spcpostn )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW2:8" ) /* Listed as "Unused" */
- PORT_START_TAG("I42") /* inport $42 */
+ PORT_START("I42") /* inport $42 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -474,7 +474,7 @@ static INPUT_PORTS_START( spcpostn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("I80") /* inport $80 */
+ PORT_START("I80") /* inport $80 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -484,7 +484,7 @@ static INPUT_PORTS_START( spcpostn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("I81") /* inport $81 */
+ PORT_START("I81") /* inport $81 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_8WAY
@@ -494,7 +494,7 @@ static INPUT_PORTS_START( spcpostn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_PLAYER(1) // probably unused
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_PLAYER(1) // probably unused
- PORT_START_TAG("I82") /* inport $82 */
+ PORT_START("I82") /* inport $82 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) PORT_8WAY
diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c
index 3c5e2303cdf..feb340c4c29 100644
--- a/src/mame/drivers/appoooh.c
+++ b/src/mame/drivers/appoooh.c
@@ -115,7 +115,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( appoooh )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -125,7 +125,7 @@ static INPUT_PORTS_START( appoooh )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON2 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -135,13 +135,13 @@ static INPUT_PORTS_START( appoooh )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_START_TAG("BUTTON3")
+ PORT_START("BUTTON3")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON3 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
PORT_BIT( 0xf8, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c
index 810a4e9227a..a0895cf072d 100644
--- a/src/mame/drivers/aquarium.c
+++ b/src/mame/drivers/aquarium.c
@@ -178,7 +178,7 @@ static ADDRESS_MAP_START( snd_portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( aquarium )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
@@ -215,7 +215,7 @@ static INPUT_PORTS_START( aquarium )
PORT_DIPUNUSED( 0x4000, IP_ACTIVE_LOW )
PORT_DIPUNUSED( 0x8000, IP_ACTIVE_LOW )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -233,7 +233,7 @@ static INPUT_PORTS_START( aquarium )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* untested */
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -245,7 +245,7 @@ static INPUT_PORTS_START( aquarium )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* sound status */
#if AQUARIUS_HACK
- PORT_START_TAG("FAKE") /* FAKE DSW to support language */
+ PORT_START("FAKE") /* FAKE DSW to support language */
PORT_DIPNAME( 0xffff, 0x0001, DEF_STR( Language ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Japanese ) )
PORT_DIPSETTING( 0x0001, DEF_STR( English ) ) // This is a guess of what should be the value
diff --git a/src/mame/drivers/arabian.c b/src/mame/drivers/arabian.c
index 0c5f959f36d..cfc89c85d16 100644
--- a/src/mame/drivers/arabian.c
+++ b/src/mame/drivers/arabian.c
@@ -242,13 +242,13 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( arabian )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_SERVICE( 0x04, IP_ACTIVE_HIGH )
PORT_BIT( 0xf8, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Lives )) PORT_DIPLOCATION("SW1:!1")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "5" )
@@ -279,37 +279,37 @@ static INPUT_PORTS_START( arabian )
PORT_DIPSETTING( 0xf0, DEF_STR( Free_Play ))
/* 0xe0 gives A 1/2 B 1/6 */
- PORT_START_TAG("COM0")
+ PORT_START("COM0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_COIN3 ) /* IN3 */
- PORT_START_TAG("COM1")
+ PORT_START("COM1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
- PORT_START_TAG("COM2")
+ PORT_START("COM2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* IN9 */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* IN10 */
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* IN11 */
- PORT_START_TAG("COM3")
+ PORT_START("COM3")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("COM4")
+ PORT_START("COM4")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* IN17 */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* IN18 */
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* IN19 */
- PORT_START_TAG("COM5")
+ PORT_START("COM5")
PORT_DIPNAME( 0x01, 0x01, "Coin Counters" ) PORT_DIPLOCATION("SW2:!1")
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x00, "2" )
diff --git a/src/mame/drivers/arcadecl.c b/src/mame/drivers/arcadecl.c
index dc803d5b18a..18a3f578e2f 100644
--- a/src/mame/drivers/arcadecl.c
+++ b/src/mame/drivers/arcadecl.c
@@ -201,7 +201,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( arcadecl )
- PORT_START_TAG("PLAYER1")
+ PORT_START("PLAYER1")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -209,7 +209,7 @@ static INPUT_PORTS_START( arcadecl )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("PLAYER2")
+ PORT_START("PLAYER2")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
@@ -217,7 +217,7 @@ static INPUT_PORTS_START( arcadecl )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("STATUS")
+ PORT_START("STATUS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -228,7 +228,7 @@ static INPUT_PORTS_START( arcadecl )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x000c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -236,26 +236,26 @@ static INPUT_PORTS_START( arcadecl )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE2 )
PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("TRACKX2")
+ PORT_START("TRACKX2")
PORT_BIT( 0x00ff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(32) PORT_REVERSE PORT_PLAYER(2)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("TRACKY2")
+ PORT_START("TRACKY2")
PORT_BIT( 0x00ff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(32) PORT_PLAYER(2)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("TRACKX1")
+ PORT_START("TRACKX1")
PORT_BIT( 0x00ff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(32) PORT_REVERSE PORT_PLAYER(1)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("TRACKY1")
+ PORT_START("TRACKY1")
PORT_BIT( 0x00ff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(32) PORT_PLAYER(1)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( sparkz )
- PORT_START_TAG("PLAYER1")
+ PORT_START("PLAYER1")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -266,7 +266,7 @@ static INPUT_PORTS_START( sparkz )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_START_TAG("PLAYER2")
+ PORT_START("PLAYER2")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
@@ -277,7 +277,7 @@ static INPUT_PORTS_START( sparkz )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
- PORT_START_TAG("STATUS")
+ PORT_START("STATUS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -288,7 +288,7 @@ static INPUT_PORTS_START( sparkz )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x000c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -296,16 +296,16 @@ static INPUT_PORTS_START( sparkz )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE2 ) /* not in "test mode" */
PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("TRACKX2")
+ PORT_START("TRACKX2")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("TRACKY2")
+ PORT_START("TRACKY2")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("TRACKX1")
+ PORT_START("TRACKX1")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("TRACKY1")
+ PORT_START("TRACKY1")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/arcadia.c b/src/mame/drivers/arcadia.c
index 163ae345f67..cbdb253bb21 100644
--- a/src/mame/drivers/arcadia.c
+++ b/src/mame/drivers/arcadia.c
@@ -212,12 +212,12 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( arcadia )
- PORT_START_TAG("CIA0PORTA")
+ PORT_START("CIA0PORTA")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_SPECIAL )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("CIA0PORTB")
+ PORT_START("CIA0PORTB")
PORT_DIPNAME( 0x01, 0x01, "DSW1 1" )
PORT_DIPSETTING( 0x01, "Reset" )
PORT_DIPSETTING( 0x00, "Set" )
@@ -227,34 +227,34 @@ static INPUT_PORTS_START( arcadia )
PORT_BIT( 0x30, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(coin_counter_r, &coin_counter[0])
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(coin_counter_r, &coin_counter[1])
- PORT_START_TAG("JOY0DAT")
+ PORT_START("JOY0DAT")
PORT_BIT( 0x0303, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(amiga_joystick_convert, "P1JOY")
PORT_BIT( 0xfcfc, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("JOY1DAT")
+ PORT_START("JOY1DAT")
PORT_BIT( 0x0303, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(amiga_joystick_convert, "P2JOY")
PORT_BIT( 0xfcfc, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("POTGO")
+ PORT_START("POTGO")
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0xaaff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("P1JOY")
+ PORT_START("P1JOY")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
- PORT_START_TAG("P2JOY")
+ PORT_START("P2JOY")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_START_TAG("COINS")
+ PORT_START("COINS")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED(coin_changed_callback, &coin_counter[0])
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_CHANGED(coin_changed_callback, &coin_counter[1])
INPUT_PORTS_END
diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c
index a23a5f06dd3..56392e81319 100644
--- a/src/mame/drivers/argus.c
+++ b/src/mame/drivers/argus.c
@@ -424,7 +424,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( argus )
- PORT_START_TAG("SYSTEM") /* System control */
+ PORT_START("SYSTEM") /* System control */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -435,7 +435,7 @@ static INPUT_PORTS_START( argus )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("P1") /* Player 1 control */
+ PORT_START("P1") /* Player 1 control */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -445,7 +445,7 @@ static INPUT_PORTS_START( argus )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2") /* Player 2 control */
+ PORT_START("P2") /* Player 2 control */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -455,7 +455,7 @@ static INPUT_PORTS_START( argus )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )\
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -479,7 +479,7 @@ static INPUT_PORTS_START( argus )
PORT_DIPSETTING( 0x40, "4" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW2:8" ) /* Listed as "Unused" */
PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "SW2:7" ) /* Listed as "Unused" */
PORT_DIPNAME( 0x1c, 0x1c, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW2:4,5,6")
diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c
index e3768debd3c..0b425a88610 100644
--- a/src/mame/drivers/arkanoid.c
+++ b/src/mame/drivers/arkanoid.c
@@ -528,7 +528,7 @@ ADDRESS_MAP_END
/* Input Ports */
static INPUT_PORTS_START( arkanoid )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -538,19 +538,19 @@ static INPUT_PORTS_START( arkanoid )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SPECIAL ) /* input from the 68705, some bootlegs need it to be 1 */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from the 68705 */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* Spinner Player 1 */
+ PORT_START("IN2") /* Spinner Player 1 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15)
- PORT_START_TAG("IN3") /* Spinner Player 2 */
+ PORT_START("IN3") /* Spinner Player 2 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15) PORT_COCKTAIL
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x01, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
@@ -668,19 +668,19 @@ INPUT_PORTS_END
static INPUT_PORTS_START( tetrsark )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
@@ -697,7 +697,7 @@ static INPUT_PORTS_START( tetrsark )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_5C ) )
- PORT_START_TAG("IN5")
+ PORT_START("IN5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c
index f22be7787d5..26073f5513e 100644
--- a/src/mame/drivers/armedf.c
+++ b/src/mame/drivers/armedf.c
@@ -475,7 +475,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
static INPUT_PORTS_START( armedf )
- PORT_START_TAG("P1")
+ PORT_START("P1")
NIHON_SINGLE_JOYSTICK(1)
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
@@ -483,14 +483,14 @@ static INPUT_PORTS_START( armedf )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2")
+ PORT_START("P2")
NIHON_SINGLE_JOYSTICK(2)
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x0200, IP_ACTIVE_LOW )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0xf800, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -520,7 +520,7 @@ static INPUT_PORTS_START( armedf )
PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
diff --git a/src/mame/drivers/artmagic.c b/src/mame/drivers/artmagic.c
index 98f5ff0fdf9..8ccf0d91751 100644
--- a/src/mame/drivers/artmagic.c
+++ b/src/mame/drivers/artmagic.c
@@ -497,7 +497,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( cheesech )
- PORT_START_TAG("300000")
+ PORT_START("300000")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -508,7 +508,7 @@ static INPUT_PORTS_START( cheesech )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("300002")
+ PORT_START("300002")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -519,7 +519,7 @@ static INPUT_PORTS_START( cheesech )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("300004")
+ PORT_START("300004")
PORT_DIPUNUSED_DIPLOC( 0x0001, 0x0001, "SWB:8" ) /* Listed as "Unused" */
PORT_DIPNAME( 0x0006, 0x0004, DEF_STR( Language ) ) PORT_DIPLOCATION("SWB:6,7")
PORT_DIPSETTING( 0x0000, DEF_STR( French ) )
@@ -541,7 +541,7 @@ static INPUT_PORTS_START( cheesech )
PORT_DIPSETTING( 0x0000, DEF_STR( Very_Hard ) )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("300006")
+ PORT_START("300006")
PORT_DIPNAME( 0x0007, 0x0007, "Right Coinage" ) PORT_DIPLOCATION("SWA:6,7,8")
PORT_DIPSETTING( 0x0002, DEF_STR( 6C_1C ))
PORT_DIPSETTING( 0x0006, DEF_STR( 5C_1C ))
@@ -566,7 +566,7 @@ static INPUT_PORTS_START( cheesech )
PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SWA:1" )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("300008")
+ PORT_START("300008")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -574,7 +574,7 @@ static INPUT_PORTS_START( cheesech )
PORT_BIT( 0x00f0, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("30000a")
+ PORT_START("30000a")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* protection data */
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* protection ready */
PORT_BIT( 0x00fc, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -655,7 +655,7 @@ static INPUT_PORTS_START( stonebal )
PORT_DIPSETTING( 0x0080, "4 Players" )
PORT_DIPSETTING( 0x0000, "2 Players" )
- PORT_START_TAG("30000c")
+ PORT_START("30000c")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(3)
@@ -666,7 +666,7 @@ static INPUT_PORTS_START( stonebal )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("30000e")
+ PORT_START("30000e")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(4)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(4)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(4)
diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c
index f4430838a77..3e03bc44c00 100644
--- a/src/mame/drivers/ashnojoe.c
+++ b/src/mame/drivers/ashnojoe.c
@@ -171,7 +171,7 @@ static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( ashnojoe )
- PORT_START_TAG("P1") /* player 1 16-bit */
+ PORT_START("P1") /* player 1 16-bit */
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
@@ -190,7 +190,7 @@ static INPUT_PORTS_START( ashnojoe )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("P2") /* player 2 16-bit */
+ PORT_START("P2") /* player 2 16-bit */
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
@@ -210,7 +210,7 @@ static INPUT_PORTS_START( ashnojoe )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW") /* 16-bit */
+ PORT_START("DSW") /* 16-bit */
PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Cocktail ) )
diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c
index 33ab3dfac95..55b40a5c0e7 100644
--- a/src/mame/drivers/asterix.c
+++ b/src/mame/drivers/asterix.c
@@ -217,7 +217,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( asterix )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -231,7 +231,7 @@ static INPUT_PORTS_START( asterix )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0xf800, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/asteroid.c b/src/mame/drivers/asteroid.c
index 7fbf8291a66..502b3fb5f9d 100644
--- a/src/mame/drivers/asteroid.c
+++ b/src/mame/drivers/asteroid.c
@@ -288,7 +288,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( asteroid )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
/* Bit 2 and 3 are handled in the machine dependent part. */
/* Bit 2 is the 3 KHz source and Bit 3 the VG_HALT bit */
@@ -300,7 +300,7 @@ static INPUT_PORTS_START( asteroid )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_TILT )
PORT_SERVICE( 0x80, IP_ACTIVE_HIGH )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -310,7 +310,7 @@ static INPUT_PORTS_START( asteroid )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_CODE(KEYCODE_RIGHT) PORT_CODE(JOYCODE_X_RIGHT_SWITCH)/* right */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_CODE(KEYCODE_LEFT) PORT_CODE(JOYCODE_X_LEFT_SWITCH) /* left */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Language ) ) PORT_DIPLOCATION("SW:1,2")
PORT_DIPSETTING ( 0x00, DEF_STR( English ) )
PORT_DIPSETTING ( 0x01, DEF_STR( German ) )
@@ -361,7 +361,7 @@ static INPUT_PORTS_START( asteroib )
PORT_DIPUNKNOWN_DIPLOC( 0x10, 0x10, "SW:5" )
PORT_DIPUNKNOWN_DIPLOC( 0x20, 0x20, "SW:6" )
- PORT_START_TAG("HS") /* hyperspace */
+ PORT_START("HS") /* hyperspace */
PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_CODE(KEYCODE_SPACE) PORT_CODE(JOYCODE_BUTTON3) /* hyperspace */
INPUT_PORTS_END
@@ -409,7 +409,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( astdelux )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) /* According to schematics */
/* Bit 2 and 3 are handled in the machine dependent part. */
/* Bit 2 is the 3 KHz source and Bit 3 the VG_HALT bit */
@@ -421,7 +421,7 @@ static INPUT_PORTS_START( astdelux )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_TILT )
PORT_SERVICE( 0x80, IP_ACTIVE_HIGH )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) /* Coin Left */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) /* Coin Center */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 ) /* Coin Right */
@@ -431,7 +431,7 @@ static INPUT_PORTS_START( astdelux )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_CODE(KEYCODE_RIGHT) PORT_CODE(JOYCODE_X_RIGHT_SWITCH)/* right */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_CODE(KEYCODE_LEFT) PORT_CODE(JOYCODE_X_LEFT_SWITCH) /* left */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Language ) ) PORT_DIPLOCATION("R5:1,2")
PORT_DIPSETTING ( 0x00, DEF_STR( English ) )
PORT_DIPSETTING ( 0x01, DEF_STR( German ) )
@@ -456,7 +456,7 @@ static INPUT_PORTS_START( astdelux )
PORT_DIPSETTING ( 0x80, "15000" )
PORT_DIPSETTING ( 0xc0, DEF_STR( None ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) ) PORT_DIPLOCATION("L8:1,2")
PORT_DIPSETTING ( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING ( 0x01, DEF_STR( 1C_1C ) )
@@ -478,7 +478,7 @@ static INPUT_PORTS_START( astdelux )
PORT_DIPSETTING ( 0xe0, DEF_STR( None ) )
/* The manual includes a 3rd DIP controlling the number & configuration of coin counters, defined as:
- PORT_START_TAG("DSW3") // 4-Toggle switch located on game PCB at M12
+ PORT_START("DSW3") // 4-Toggle switch located on game PCB at M12
PORT_DIPNAME( 0x03, 0x00, "Coin Counters" ) PORT_DIPLOCATION("M12:1,2")
PORT_DIPSETTING ( 0x00, "1=Left, Center & Right" ) // "For games having these coin doors: Thai 1Baht/1Baht, German 1DM/1DM, US 25c/25c,
// Belgian or French 5Fr/5Fr, Swiss or French 1Fr/1Fr, US 25c/25c/25c,
@@ -493,7 +493,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( llander )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
/* Bit 0 is VG_HALT, handled in the machine dependent part */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_SERVICE( 0x02, IP_ACTIVE_LOW )
@@ -502,7 +502,7 @@ static INPUT_PORTS_START( llander )
PORT_BIT( 0x78, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Diagnostic Step") PORT_CODE(KEYCODE_F1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN2 )
@@ -512,7 +512,7 @@ static INPUT_PORTS_START( llander )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_CODE(KEYCODE_RIGHT) PORT_CODE(JOYCODE_X_RIGHT_SWITCH) /* right */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_CODE(KEYCODE_LEFT) PORT_CODE(JOYCODE_X_LEFT_SWITCH) /* left */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, "Right Coin" ) PORT_DIPLOCATION("P8:1,2") /* "Left Coin Mech always registers X 1" */
PORT_DIPSETTING ( 0x00, "X 1" )
PORT_DIPSETTING ( 0x01, "X 4" )
@@ -540,7 +540,7 @@ static INPUT_PORTS_START( llander )
/* The way the DAC/counter circuit always trys to self center at the voltage derived from the thrust control, */
/* I don't think it ever expected to get to 0xff. We can not emulate the external DAC circuit exactly, */
/* so changing the range to 0xfe seems to solve the problem. */
- PORT_START_TAG("PADDLE")
+ PORT_START("PADDLE")
PORT_BIT( 0xff, 0x00, IPT_PADDLE ) PORT_MINMAX(0,254) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_UP) PORT_CODE_DEC(JOYCODE_Y_UP_SWITCH) PORT_CODE_INC(KEYCODE_DOWN) PORT_CODE_INC(JOYCODE_Y_DOWN_SWITCH) PORT_REVERSE
INPUT_PORTS_END
diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c
index 3811847f344..36294cd8483 100644
--- a/src/mame/drivers/astinvad.c
+++ b/src/mame/drivers/astinvad.c
@@ -362,7 +362,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( kamikaze )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -372,7 +372,7 @@ static INPUT_PORTS_START( kamikaze )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -388,11 +388,11 @@ static INPUT_PORTS_START( kamikaze )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("CABINET")
+ PORT_START("CABINET")
PORT_DIPNAME( 0xff, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0xff, DEF_STR( Cocktail ) )
@@ -437,7 +437,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( spaceint )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
@@ -447,7 +447,7 @@ static INPUT_PORTS_START( spaceint )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -459,10 +459,10 @@ static INPUT_PORTS_START( spaceint )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 1C_2C ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED(spaceint_coin_inserted, 0)
- PORT_START_TAG("CABINET")
+ PORT_START("CABINET")
PORT_DIPNAME( 0xff, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0xff, DEF_STR( Cocktail ) )
diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c
index 92318ae2a07..c34d64d8944 100644
--- a/src/mame/drivers/astrocde.c
+++ b/src/mame/drivers/astrocde.c
@@ -742,19 +742,19 @@ static const UINT32 controller_table[64] =
};
static INPUT_PORTS_START( seawolf2 )
- PORT_START_TAG("P1HANDLE")
+ PORT_START("P1HANDLE")
PORT_BIT( 0x3f, 0x1f, IPT_POSITIONAL ) PORT_PLAYER(2) PORT_POSITIONS(64) PORT_REMAP_TABLE(controller_table) PORT_SENSITIVITY(20) PORT_KEYDELTA(4) PORT_CENTERDELTA(0) PORT_CROSSHAIR(X, 2.0, -0.40, 34.0 / 240.0)
PORT_DIPNAME( 0x40, 0x00, "Language 1" ) PORT_DIPLOCATION("S2:!1")
PORT_DIPSETTING( 0x00, "Language 2" )
PORT_DIPSETTING( 0x40, DEF_STR( French ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START_TAG("P2HANDLE")
+ PORT_START("P2HANDLE")
PORT_BIT( 0x3f, 0x1f, IPT_POSITIONAL ) PORT_PLAYER(1) PORT_POSITIONS(64) PORT_REMAP_TABLE(controller_table) PORT_SENSITIVITY(20) PORT_KEYDELTA(4) PORT_CENTERDELTA(0) PORT_CROSSHAIR(X, 2.0, -0.45, 34.0 / 240.0)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_START_TAG("P3HANDLE")
+ PORT_START("P3HANDLE")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START2 )
@@ -763,7 +763,7 @@ static INPUT_PORTS_START( seawolf2 )
PORT_DIPSETTING( 0x08, DEF_STR( German ) )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("P4HANDLE")
+ PORT_START("P4HANDLE")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Coinage ) ) PORT_DIPLOCATION("S1:!2")
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -788,7 +788,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( ebases )
- PORT_START_TAG("P1HANDLE")
+ PORT_START("P1HANDLE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -796,7 +796,7 @@ static INPUT_PORTS_START( ebases )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("P2HANDLE")
+ PORT_START("P2HANDLE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT )
@@ -810,10 +810,10 @@ static INPUT_PORTS_START( ebases )
PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("P3HANDLE")
+ PORT_START("P3HANDLE")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(ebases_trackball_r, 0)
- PORT_START_TAG("P4HANDLE")
+ PORT_START("P4HANDLE")
PORT_DIPNAME( 0x01, 0x00, "2 Players Game" ) PORT_DIPLOCATION( "S1:1" )
PORT_DIPSETTING( 0x00, "1 Credit" )
PORT_DIPSETTING( 0x01, "2 Credits" )
@@ -825,22 +825,22 @@ static INPUT_PORTS_START( ebases )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x00, "S1:7" )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x00, "S1:8" )
- PORT_START_TAG("TRACKX1")
+ PORT_START("TRACKX1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_RESET
- PORT_START_TAG("TRACKY1")
+ PORT_START("TRACKY1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_RESET
- PORT_START_TAG("TRACKX2")
+ PORT_START("TRACKX2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_RESET PORT_PLAYER(2)
- PORT_START_TAG("TRACKY2")
+ PORT_START("TRACKY2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_RESET PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( spacezap )
- PORT_START_TAG("P1HANDLE")
+ PORT_START("P1HANDLE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT )
@@ -849,7 +849,7 @@ static INPUT_PORTS_START( spacezap )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) // starts a 1 player game if 1 credit
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2HANDLE")
+ PORT_START("P2HANDLE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
@@ -858,7 +858,7 @@ static INPUT_PORTS_START( spacezap )
PORT_DIPUNUSED_DIPLOC( 0x20, 0x20, "JU:1" )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P3HANDLE")
+ PORT_START("P3HANDLE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
@@ -869,7 +869,7 @@ static INPUT_PORTS_START( spacezap )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P4HANDLE")
+ PORT_START("P4HANDLE")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Coin_A ) ) PORT_DIPLOCATION( "S1:1" )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -887,7 +887,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( wow )
- PORT_START_TAG("P1HANDLE")
+ PORT_START("P1HANDLE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -899,7 +899,7 @@ static INPUT_PORTS_START( wow )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("P2HANDLE")
+ PORT_START("P2HANDLE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -908,7 +908,7 @@ static INPUT_PORTS_START( wow )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P3HANDLE")
+ PORT_START("P3HANDLE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -918,7 +918,7 @@ static INPUT_PORTS_START( wow )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(wow_speech_status_r, 0)
- PORT_START_TAG("P4HANDLE")
+ PORT_START("P4HANDLE")
/* "If S1:1,2,3 are all ON or all OFF, only coin meter number 1 will count." */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("S1:1")
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
@@ -947,7 +947,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( gorf )
- PORT_START_TAG("P1HANDLE")
+ PORT_START("P1HANDLE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE( 0x04, IP_ACTIVE_LOW )
@@ -961,7 +961,7 @@ static INPUT_PORTS_START( gorf )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("P2HANDLE")
+ PORT_START("P2HANDLE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -969,7 +969,7 @@ static INPUT_PORTS_START( gorf )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P3HANDLE")
+ PORT_START("P3HANDLE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -978,7 +978,7 @@ static INPUT_PORTS_START( gorf )
PORT_BIT( 0x60, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(gorf_speech_status_r, 0)
- PORT_START_TAG("P4HANDLE")
+ PORT_START("P4HANDLE")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("S1:1")
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -1006,7 +1006,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( robby )
- PORT_START_TAG("P1HANDLE")
+ PORT_START("P1HANDLE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -1016,7 +1016,7 @@ static INPUT_PORTS_START( robby )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_DIPUNUSED( 0x80, 0x00 )
- PORT_START_TAG("P2HANDLE")
+ PORT_START("P2HANDLE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
@@ -1025,7 +1025,7 @@ static INPUT_PORTS_START( robby )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P3HANDLE")
+ PORT_START("P3HANDLE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
@@ -1034,7 +1034,7 @@ static INPUT_PORTS_START( robby )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P4HANDLE")
+ PORT_START("P4HANDLE")
PORT_DIPNAME( 0x01, 0x01, "Use NVRAM" ) PORT_DIPLOCATION("S1:1")
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x01, DEF_STR( Yes ) )
@@ -1057,7 +1057,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( profpac )
- PORT_START_TAG("P1HANDLE")
+ PORT_START("P1HANDLE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE( 0x04, IP_ACTIVE_LOW )
@@ -1066,7 +1066,7 @@ static INPUT_PORTS_START( profpac )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("P2HANDLE")
+ PORT_START("P2HANDLE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) /* Left A */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) /* Left B */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) /* Left C */
@@ -1076,10 +1076,10 @@ static INPUT_PORTS_START( profpac )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) /* Right C */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("P3HANDLE")
+ PORT_START("P3HANDLE")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("P4HANDLE")
+ PORT_START("P4HANDLE")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("S1:1")
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) ) /* Upright or Mini */
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -1102,7 +1102,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( demndrgn )
- PORT_START_TAG("P1HANDLE")
+ PORT_START("P1HANDLE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE( 0x04, IP_ACTIVE_LOW )
@@ -1112,13 +1112,13 @@ static INPUT_PORTS_START( demndrgn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2HANDLE")
+ PORT_START("P2HANDLE")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_SPECIAL) PORT_CUSTOM(demndragn_joystick_r, 0)
- PORT_START_TAG("P3HANDLE")
+ PORT_START("P3HANDLE")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("P4HANDLE")
+ PORT_START("P4HANDLE")
PORT_DIPUNUSED_DIPLOC( 0x01, 0x00, "S1:1" )
PORT_DIPUNUSED_DIPLOC( 0x02, 0x00, "S1:2" )
PORT_DIPUNUSED_DIPLOC( 0x04, 0x00, "S1:3" )
@@ -1128,22 +1128,22 @@ static INPUT_PORTS_START( demndrgn )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x00, "S1:7" )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x00, "S1:8" )
- PORT_START_TAG("MOVEX")
+ PORT_START("MOVEX")
PORT_BIT( 0xff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(2) PORT_RESET
- PORT_START_TAG("MOVEY")
+ PORT_START("MOVEY")
PORT_BIT( 0xff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(2) PORT_RESET
- PORT_START_TAG("FIREX")
+ PORT_START("FIREX")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(100) PORT_REVERSE
- PORT_START_TAG("FIREY")
+ PORT_START("FIREY")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(100) PORT_REVERSE
INPUT_PORTS_END
static INPUT_PORTS_START( tenpindx )
- PORT_START_TAG("P60")
+ PORT_START("P60")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE( 0x04, IP_ACTIVE_LOW )
@@ -1153,7 +1153,7 @@ static INPUT_PORTS_START( tenpindx )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 ) /* start game */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P61")
+ PORT_START("P61")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("S1:1")
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -1177,16 +1177,16 @@ static INPUT_PORTS_START( tenpindx )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x00, "S1:8" )
- PORT_START_TAG("P62")
+ PORT_START("P62")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_SPECIAL ) /* F1-F8 */
- PORT_START_TAG("P63")
+ PORT_START("P63")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_SPECIAL ) /* F9-F0,P1-P6 */
- PORT_START_TAG("P64")
+ PORT_START("P64")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_SPECIAL ) /* P7-P0 */
- PORT_START_TAG("DIPSW")
+ PORT_START("DIPSW")
PORT_DIPUNUSED_DIPLOC( 0x01, 0x00, "S2:1" )
PORT_DIPUNUSED_DIPLOC( 0x02, 0x00, "S2:2" )
PORT_DIPUNUSED_DIPLOC( 0x04, 0x00, "S2:3" )
diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c
index de0400090f3..4bc0174f146 100644
--- a/src/mame/drivers/astrocorp.c
+++ b/src/mame/drivers/astrocorp.c
@@ -187,7 +187,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( showhand )
- PORT_START_TAG("INPUTS") // 54000
+ PORT_START("INPUTS") // 54000
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1) // coin
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Payout") PORT_CODE(KEYCODE_F1) // payout (must be 0 on startup)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ?
diff --git a/src/mame/drivers/astrof.c b/src/mame/drivers/astrof.c
index fe388618381..830d84d8dbf 100644
--- a/src/mame/drivers/astrof.c
+++ b/src/mame/drivers/astrof.c
@@ -559,25 +559,25 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( astrof )
- PORT_START_TAG("IN")
+ PORT_START("IN")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x1c, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(astrof_p1_controls_r, 0)
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(astrof_p2_controls_r, 0)
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xf8, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xf8, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW:1,2")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -598,13 +598,13 @@ static INPUT_PORTS_START( astrof )
PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("CAB")
+ PORT_START("CAB")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW:8")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED(service_coin_inserted, 0)
PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -612,25 +612,25 @@ INPUT_PORTS_END
static INPUT_PORTS_START( abattle )
- PORT_START_TAG("IN")
+ PORT_START("IN")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x1c, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(astrof_p1_controls_r, 0)
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(astrof_p2_controls_r, 0)
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0xf8, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xf8, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW:1,2")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -651,13 +651,13 @@ static INPUT_PORTS_START( abattle )
PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("CAB")
+ PORT_START("CAB")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW:8")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED(service_coin_inserted, 0)
PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -665,25 +665,25 @@ INPUT_PORTS_END
static INPUT_PORTS_START( spfghmk2 )
- PORT_START_TAG("IN")
+ PORT_START("IN")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x1c, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(astrof_p1_controls_r, 0)
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(astrof_p2_controls_r, 0)
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xf8, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xf8, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW:1") /* most likely not used */
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -705,13 +705,13 @@ static INPUT_PORTS_START( spfghmk2 )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("CAB")
+ PORT_START("CAB")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW:8")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED(service_coin_inserted, 0)
PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -719,25 +719,25 @@ INPUT_PORTS_END
static INPUT_PORTS_START( spfgmk22 )
- PORT_START_TAG("IN")
+ PORT_START("IN")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x1c, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(astrof_p1_controls_r, 0)
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(astrof_p2_controls_r, 0)
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xf8, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xf8, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW:1") /* used */
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -759,13 +759,13 @@ static INPUT_PORTS_START( spfgmk22 )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("CAB")
+ PORT_START("CAB")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW:8")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED(service_coin_inserted, 0)
PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -773,13 +773,13 @@ INPUT_PORTS_END
static INPUT_PORTS_START( tomahawk )
- PORT_START_TAG("IN")
+ PORT_START("IN")
PORT_BIT( 0x1f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(tomahawk_controls_r, 0)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
@@ -787,7 +787,7 @@ static INPUT_PORTS_START( tomahawk )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
@@ -795,7 +795,7 @@ static INPUT_PORTS_START( tomahawk )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW:1,2")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -816,13 +816,13 @@ static INPUT_PORTS_START( tomahawk )
PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("CAB")
+ PORT_START("CAB")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW:8")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED(service_coin_inserted, 0)
PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNUSED )
diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c
index ce98767f889..6761399e2d9 100644
--- a/src/mame/drivers/asuka.c
+++ b/src/mame/drivers/asuka.c
@@ -435,12 +435,12 @@ ADDRESS_MAP_END
/* different players and system inputs than 'asuka' */
static INPUT_PORTS_START( bonzeadv )
/* 0x390000 -> 0x10cb7c ($b7c,A5) */
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_COCKTAIL_LOC(SWA)
TAITO_COINAGE_WORLD_LOC(SWA)
/* 0x3b0000 -> 0x10cb7e ($b7e,A5) */
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY_LOC(SWB)
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SWB:3,4") /* see notes */
PORT_DIPSETTING( 0x08, "40k 100k" ) /* 300k 1000k 1500k 2000k 2500k 3000k 3500k 5000k */
@@ -457,16 +457,16 @@ static INPUT_PORTS_START( bonzeadv )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SWB:8" ) /* see notes */
- PORT_START_TAG("800007")
+ PORT_START("800007")
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("800009")
+ PORT_START("800009")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(1)
- PORT_START_TAG("80000B")
+ PORT_START("80000B")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -476,7 +476,7 @@ static INPUT_PORTS_START( bonzeadv )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_START_TAG("80000D")
+ PORT_START("80000D")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -496,12 +496,12 @@ INPUT_PORTS_END
static INPUT_PORTS_START( asuka )
/* 0x400000 -> 0x103618 */
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_NO_COCKTAIL_LOC(SWA)
TAITO_COINAGE_JAPAN_OLD_LOC(SWA)
/* 0x400002 -> 0x10361c */
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY_LOC(SWB)
PORT_DIPNAME( 0x0c, 0x0c, "Bonus Points" ) PORT_DIPLOCATION("SWB:3,4") /* for each plane shot after each end of level boss */
PORT_DIPSETTING( 0x0c, "500" )
@@ -519,13 +519,13 @@ static INPUT_PORTS_START( asuka )
PORT_DIPSETTING( 0x80, "Up To Level 3" )
PORT_DIPSETTING( 0x40, DEF_STR( Yes ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS( 2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -567,12 +567,12 @@ INPUT_PORTS_END
/* different players and system inputs than 'asuka' */
static INPUT_PORTS_START( cadash )
/* 0x900000 -> 0x10317a ($317a,A5) */
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_NO_COCKTAIL_LOC(SWA)
TAITO_COINAGE_WORLD_LOC(SWA)
/* 0x900002 -> 0x10317c ($317c,A5) */
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY_LOC(SWB)
PORT_DIPNAME( 0x0c, 0x0c, "Starting Time" ) PORT_DIPLOCATION("SWB:3,4")
PORT_DIPSETTING( 0x00, "5:00" )
@@ -596,13 +596,13 @@ static INPUT_PORTS_START( cadash )
PORT_DIPSETTING( 0x00, "Slave" )
// PORT_DIPSETTING( 0x40, "Stand alone" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
CADASH_PLAYERS_INPUT( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
CADASH_PLAYERS_INPUT( 2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
diff --git a/src/mame/drivers/atarifb.c b/src/mame/drivers/atarifb.c
index 09477b6a052..f6629197b8d 100644
--- a/src/mame/drivers/atarifb.c
+++ b/src/mame/drivers/atarifb.c
@@ -241,14 +241,14 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( atarifb )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT ( 0x0f, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT ( 0x40, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x00, "Time Per Coin" ) PORT_DIPLOCATION("K10:1,2")
PORT_DIPSETTING( 0x00, "1:30" )
PORT_DIPSETTING( 0x01, "2:00" )
@@ -263,19 +263,19 @@ static INPUT_PORTS_START( atarifb )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("IN2") /* IN2 - Player 1 trackball, y */
+ PORT_START("IN2") /* IN2 - Player 1 trackball, y */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE
/* The lower 4 bits are the input */
- PORT_START_TAG("IN3") /* IN3 - Player 1 trackball, x */
+ PORT_START("IN3") /* IN3 - Player 1 trackball, x */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
/* The lower 4 bits are the input */
- PORT_START_TAG("IN4") /* IN4 - Player 2 trackball, y */
+ PORT_START("IN4") /* IN4 - Player 2 trackball, y */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2)
/* The lower 4 bits are the input */
- PORT_START_TAG("IN5") /* IN5 - Player 2 trackball, x */
+ PORT_START("IN5") /* IN5 - Player 2 trackball, x */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
/* The lower 4 bits are the input */
INPUT_PORTS_END
@@ -293,23 +293,23 @@ static INPUT_PORTS_START( atarifb4 )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN6") /* IN6 - Player 3 trackball, y */
+ PORT_START("IN6") /* IN6 - Player 3 trackball, y */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(3)
/* The lower 4 bits are the input */
- PORT_START_TAG("IN7") /* IN7 - Player 3 trackball, x */
+ PORT_START("IN7") /* IN7 - Player 3 trackball, x */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(3)
/* The lower 4 bits are the input */
- PORT_START_TAG("IN8") /* IN8 - Player 4 trackball, y */
+ PORT_START("IN8") /* IN8 - Player 4 trackball, y */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(4)
/* The lower 4 bits are the input */
- PORT_START_TAG("IN9") /* IN9 - Player 4 trackball, x */
+ PORT_START("IN9") /* IN9 - Player 4 trackball, x */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(4)
/* The lower 4 bits are the input */
- PORT_START_TAG("EXTRA")
+ PORT_START("EXTRA")
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -334,10 +334,10 @@ INPUT_PORTS_END
static INPUT_PORTS_START( soccer )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT ( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("2/4 Player Toggle") PORT_DIPLOCATION("SW2:4") /* Listed as "Unused" */
PORT_DIPNAME( 0x02, 0x00, "Rule Switch" ) PORT_DIPLOCATION("SW2:3") /* Listed as "Unused" */
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -352,39 +352,39 @@ static INPUT_PORTS_START( soccer )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START_TAG("IN2") /* IN2 - Player 1 trackball, y */
+ PORT_START("IN2") /* IN2 - Player 1 trackball, y */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE
/* The lower 4 bits are the input */
- PORT_START_TAG("IN3") /* IN3 - Player 1 trackball, x */
+ PORT_START("IN3") /* IN3 - Player 1 trackball, x */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
/* The lower 4 bits are the input */
- PORT_START_TAG("IN4") /* IN4 - Player 2 trackball, y */
+ PORT_START("IN4") /* IN4 - Player 2 trackball, y */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2)
/* The lower 4 bits are the input */
- PORT_START_TAG("IN5") /* IN5 - Player 2 trackball, x */
+ PORT_START("IN5") /* IN5 - Player 2 trackball, x */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
/* The lower 4 bits are the input */
- PORT_START_TAG("IN6") /* IN6 - Player 3 trackball, y */
+ PORT_START("IN6") /* IN6 - Player 3 trackball, y */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(3)
/* The lower 4 bits are the input */
- PORT_START_TAG("IN7") /* IN7 - Player 3 trackball, x */
+ PORT_START("IN7") /* IN7 - Player 3 trackball, x */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(3)
/* The lower 4 bits are the input */
- PORT_START_TAG("IN8") /* IN8 - Player 4 trackball, y */
+ PORT_START("IN8") /* IN8 - Player 4 trackball, y */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(4)
/* The lower 4 bits are the input */
- PORT_START_TAG("IN9") /* IN9 - Player 4 trackball, x */
+ PORT_START("IN9") /* IN9 - Player 4 trackball, x */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(4)
/* The lower 4 bits are the input */
- PORT_START_TAG("EXTRA")
+ PORT_START("EXTRA")
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused on schematics */
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -394,7 +394,7 @@ static INPUT_PORTS_START( soccer )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT ( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x00, "Time per coin" ) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x00, "1:00" )
PORT_DIPSETTING( 0x01, "1:20" )
diff --git a/src/mame/drivers/atarig1.c b/src/mame/drivers/atarig1.c
index f3c6b5d7d64..0b98a1aed24 100644
--- a/src/mame/drivers/atarig1.c
+++ b/src/mame/drivers/atarig1.c
@@ -252,7 +252,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( hydra )
- PORT_START_TAG("IN0") /* fc0000 */
+ PORT_START("IN0") /* fc0000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON5 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON6 )
@@ -264,15 +264,15 @@ static INPUT_PORTS_START( hydra )
PORT_SERVICE( 0x4000, IP_ACTIVE_LOW )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("ADC0") /* ADC 0 @ fc8000 */
+ PORT_START("ADC0") /* ADC 0 @ fc8000 */
PORT_BIT( 0x00ff, 0x0080, IPT_AD_STICK_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("ADC1") /* ADC 1 @ fc8000 */
+ PORT_START("ADC1") /* ADC 1 @ fc8000 */
PORT_BIT( 0x00ff, 0x0080, IPT_AD_STICK_Y ) PORT_SENSITIVITY(70) PORT_KEYDELTA(10)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("ADC2") /* ADC 2 @ fc8000 */
+ PORT_START("ADC2") /* ADC 2 @ fc8000 */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
PORT_INCLUDE( atarijsa_ii ) /* audio board port */
@@ -282,7 +282,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( pitfight )
- PORT_START_TAG("IN0") /* fc0000 */
+ PORT_START("IN0") /* fc0000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
@@ -296,7 +296,7 @@ static INPUT_PORTS_START( pitfight )
PORT_SERVICE( 0x4000, IP_ACTIVE_LOW )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("ADC0") /* fc8000 */
+ PORT_START("ADC0") /* fc8000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(3)
@@ -314,10 +314,10 @@ static INPUT_PORTS_START( pitfight )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("ADC1") /* not used */
+ PORT_START("ADC1") /* not used */
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("ADC2") /* not used */
+ PORT_START("ADC2") /* not used */
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_INCLUDE( atarijsa_ii ) /* audio board port */
@@ -327,7 +327,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( pitfighj )
- PORT_START_TAG("IN0") /* fc0000 */
+ PORT_START("IN0") /* fc0000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
@@ -341,7 +341,7 @@ static INPUT_PORTS_START( pitfighj )
PORT_SERVICE( 0x4000, IP_ACTIVE_LOW )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("ADC0") /* fc8000 */
+ PORT_START("ADC0") /* fc8000 */
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
@@ -352,10 +352,10 @@ static INPUT_PORTS_START( pitfighj )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("ADC1") /* not used */
+ PORT_START("ADC1") /* not used */
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("ADC2") /* not used */
+ PORT_START("ADC2") /* not used */
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_INCLUDE( atarijsa_ii ) /* audio board port */
diff --git a/src/mame/drivers/atarig42.c b/src/mame/drivers/atarig42.c
index 485933ed3ad..640f9837188 100644
--- a/src/mame/drivers/atarig42.c
+++ b/src/mame/drivers/atarig42.c
@@ -383,17 +383,17 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( roadriot )
- PORT_START_TAG("IN0") /* e00000 */
+ PORT_START("IN0") /* e00000 */
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0xf800, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* e00002 */
+ PORT_START("IN1") /* e00002 */
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* e00010 */
+ PORT_START("IN2") /* e00010 */
PORT_BIT( 0x003f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE( 0x0040, IP_ACTIVE_LOW )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_VBLANK )
@@ -401,16 +401,16 @@ static INPUT_PORTS_START( roadriot )
PORT_INCLUDE( atarijsa_iii ) /* audio board port */
- PORT_START_TAG("A2D0") /* analog 0 */
+ PORT_START("A2D0") /* analog 0 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("A2D1") /* analog 1 */
+ PORT_START("A2D1") /* analog 1 */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
INPUT_PORTS_END
static INPUT_PORTS_START( guardian )
- PORT_START_TAG("IN0") /* e00000 */
+ PORT_START("IN0") /* e00000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
@@ -428,7 +428,7 @@ static INPUT_PORTS_START( guardian )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_START_TAG("IN1") /* e00002 */
+ PORT_START("IN1") /* e00002 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
@@ -444,7 +444,7 @@ static INPUT_PORTS_START( guardian )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
- PORT_START_TAG("IN2") /* e00010 */
+ PORT_START("IN2") /* e00010 */
PORT_BIT( 0x003f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE( 0x0040, IP_ACTIVE_LOW )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_VBLANK )
@@ -452,10 +452,10 @@ static INPUT_PORTS_START( guardian )
PORT_INCLUDE( atarijsa_iii ) /* audio board port */
- PORT_START_TAG("A2D0") /* analog 0 */
+ PORT_START("A2D0") /* analog 0 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("A2D1") /* analog 1 */
+ PORT_START("A2D1") /* analog 1 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/atarigt.c b/src/mame/drivers/atarigt.c
index 5241537007c..1c3b09c1451 100644
--- a/src/mame/drivers/atarigt.c
+++ b/src/mame/drivers/atarigt.c
@@ -631,7 +631,7 @@ ADDRESS_MAP_END
*************************************/
#define COMMON_IN01\
- PORT_START_TAG("P1_P2")\
+ PORT_START("P1_P2")\
PORT_BIT( 0x000000ff, IP_ACTIVE_LOW, IPT_UNUSED )\
PORT_BIT( 0x00000100, IP_ACTIVE_LOW, IPT_START2 )\
PORT_BIT( 0x00000200, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)\
@@ -652,7 +652,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
#define COMMON_IN2\
- PORT_START_TAG("SERVICE") /* 68.STATUS (A2=0) */ \
+ PORT_START("SERVICE") /* 68.STATUS (A2=0) */ \
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /A2DRDY */ \
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_TILT ) /* TILT */ \
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /XIRQ23 */ \
@@ -663,7 +663,7 @@ ADDRESS_MAP_END
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
#define COMMON_IN3\
- PORT_START_TAG("COIN") /* 68.STATUS (A2=1) */ \
+ PORT_START("COIN") /* 68.STATUS (A2=1) */ \
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /VBIRQ */ \
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /4MSIRQ */ \
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /XIRQ0 */ \
@@ -683,22 +683,22 @@ static INPUT_PORTS_START( tmek )
COMMON_IN3
#if (HACK_TMEK_CONTROLS)
- PORT_START_TAG("FAKE") /* single digital joystick */
+ PORT_START("FAKE") /* single digital joystick */
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
#else
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN3")
+ PORT_START("AN3")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN4")
+ PORT_START("AN4")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
#endif
@@ -713,16 +713,16 @@ static INPUT_PORTS_START( primrage )
COMMON_IN3 /* 68.STATUS (A2=1) */
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN3")
+ PORT_START("AN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN4")
+ PORT_START("AN4")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/atarigx2.c b/src/mame/drivers/atarigx2.c
index ab4f648cbf1..25e39d3ccf5 100644
--- a/src/mame/drivers/atarigx2.c
+++ b/src/mame/drivers/atarigx2.c
@@ -1202,7 +1202,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( spclords )
- PORT_START_TAG("P1_P2") /* 68.SW (A1=0,1) */
+ PORT_START("P1_P2") /* 68.SW (A1=0,1) */
PORT_BIT( 0x000000ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x00000100, IP_ACTIVE_LOW, IPT_START2 ) /* RED button */
PORT_BIT( 0x00000200, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) /* Right thumb */
@@ -1222,7 +1222,7 @@ static INPUT_PORTS_START( spclords )
PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) /* Throttle button */
PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_START_TAG("SERVICE") /* 68.STATUS (A2=0) */
+ PORT_START("SERVICE") /* 68.STATUS (A2=0) */
PORT_BIT( 0x0007, IP_ACTIVE_LOW, IPT_SPECIAL ) /* +5V */
PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* A2D.EOC */
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /AUDIRQ */
@@ -1231,7 +1231,7 @@ static INPUT_PORTS_START( spclords )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SPECIAL") /* 68.STATUS (A2=1) */
+ PORT_START("SPECIAL") /* 68.STATUS (A2=1) */
PORT_BIT( 0x0003, IP_ACTIVE_LOW, IPT_SPECIAL ) /* +5V */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /XIRQ */
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /XFULL */
@@ -1242,26 +1242,26 @@ static INPUT_PORTS_START( spclords )
PORT_INCLUDE( atarijsa_iii ) /* audio board port */
- PORT_START_TAG("A2D0") /* A2D @ 0xD00000 */
+ PORT_START("A2D0") /* A2D @ 0xD00000 */
PORT_BIT ( 0x00ff, 0x0080, IPT_AD_STICK_X ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("A2D1") /* A2D @ 0xD00002 */
+ PORT_START("A2D1") /* A2D @ 0xD00002 */
PORT_BIT ( 0x00ff, 0x0080, IPT_AD_STICK_Y ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("A2D2") /* A2D @ 0xD00004 */
+ PORT_START("A2D2") /* A2D @ 0xD00004 */
PORT_BIT ( 0x00ff, 0x0080, IPT_AD_STICK_X ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("A2D3") /* A2D @ 0xD00006 */
+ PORT_START("A2D3") /* A2D @ 0xD00006 */
PORT_BIT ( 0x00ff, 0x0080, IPT_AD_STICK_Y ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( motofren )
- PORT_START_TAG("P1_P2") /* 68.SW (A1=0,1) */
+ PORT_START("P1_P2") /* 68.SW (A1=0,1) */
PORT_BIT( 0x0000ffff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x00ff0000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x01000000, IP_ACTIVE_LOW, IPT_START1 ) /* Start/fire */
@@ -1270,7 +1270,7 @@ static INPUT_PORTS_START( motofren )
PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) /* AUX1 */
PORT_BIT( 0xf0000000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SERVICE") /* 68.STATUS (A2=0) */
+ PORT_START("SERVICE") /* 68.STATUS (A2=0) */
PORT_BIT( 0x0007, IP_ACTIVE_LOW, IPT_UNUSED ) /* +5V */
PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* A2D.EOC */
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /AUDIRQ */
@@ -1279,7 +1279,7 @@ static INPUT_PORTS_START( motofren )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SPECIAL") /* 68.STATUS (A2=1) */
+ PORT_START("SPECIAL") /* 68.STATUS (A2=1) */
PORT_BIT( 0x0003, IP_ACTIVE_LOW, IPT_SPECIAL ) /* +5V */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /XIRQ */
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /XFULL */
@@ -1290,22 +1290,22 @@ static INPUT_PORTS_START( motofren )
PORT_INCLUDE( atarijsa_iii ) /* audio board port */
- PORT_START_TAG("A2D0") /* A2D @ 0xD00000 */
+ PORT_START("A2D0") /* A2D @ 0xD00000 */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
- PORT_START_TAG("A2D1") /* A2D @ 0xD00002 */
+ PORT_START("A2D1") /* A2D @ 0xD00002 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("A2D2") /* A2D @ 0xD00004 */
+ PORT_START("A2D2") /* A2D @ 0xD00004 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("A2D3") /* A2D @ 0xD00006 */
+ PORT_START("A2D3") /* A2D @ 0xD00006 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( rrreveng )
- PORT_START_TAG("P1_P2") /* 68.SW (A1=0,1) */
+ PORT_START("P1_P2") /* 68.SW (A1=0,1) */
PORT_BIT( 0x000000ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x00000100, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0000fe00, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1318,7 +1318,7 @@ static INPUT_PORTS_START( rrreveng )
PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SERVICE") /* 68.STATUS (A2=0) */
+ PORT_START("SERVICE") /* 68.STATUS (A2=0) */
PORT_BIT( 0x0007, IP_ACTIVE_LOW, IPT_SPECIAL ) /* +5V */
PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* A2D.EOC */
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /AUDIRQ */
@@ -1327,7 +1327,7 @@ static INPUT_PORTS_START( rrreveng )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SPECIAL") /* 68.STATUS (A2=1) */
+ PORT_START("SPECIAL") /* 68.STATUS (A2=1) */
PORT_BIT( 0x0003, IP_ACTIVE_LOW, IPT_SPECIAL ) /* +5V */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /XIRQ */
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /XFULL */
@@ -1338,18 +1338,18 @@ static INPUT_PORTS_START( rrreveng )
PORT_INCLUDE( atarijsa_iii ) /* audio board port */
- PORT_START_TAG("A2D0") /* A2D @ 0xD00000 */
+ PORT_START("A2D0") /* A2D @ 0xD00000 */
PORT_BIT ( 0x00ff, 0x0010, IPT_PEDAL ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("A2D1") /* A2D @ 0xD00002 */
+ PORT_START("A2D1") /* A2D @ 0xD00002 */
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("A2D2") /* A2D @ 0xD00004 */
+ PORT_START("A2D2") /* A2D @ 0xD00004 */
PORT_BIT ( 0x00ff, 0x0080, IPT_PADDLE ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("A2D3") /* A2D @ 0xD00006 */
+ PORT_START("A2D3") /* A2D @ 0xD00006 */
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/atarisy1.c b/src/mame/drivers/atarisy1.c
index 20a402ffb7c..5de3ef8582a 100644
--- a/src/mame/drivers/atarisy1.c
+++ b/src/mame/drivers/atarisy1.c
@@ -471,19 +471,19 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( marble )
- PORT_START_TAG("IN0") /* F20000 */
+ PORT_START("IN0") /* F20000 */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("IN1") /* F20002 */
+ PORT_START("IN1") /* F20002 */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_PLAYER(1)
- PORT_START_TAG("IN2") /* F20004 */
+ PORT_START("IN2") /* F20004 */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("IN3") /* F20006 */
+ PORT_START("IN3") /* F20006 */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_PLAYER(2)
- PORT_START_TAG("F60000") /* F60000 */
+ PORT_START("F60000") /* F60000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -494,7 +494,7 @@ static INPUT_PORTS_START( marble )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("1820") /* 1820 (sound) */
+ PORT_START("1820") /* 1820 (sound) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -506,23 +506,23 @@ INPUT_PORTS_END
static INPUT_PORTS_START( peterpak )
- PORT_START_TAG("IN0") /* F40000 */
+ PORT_START("IN0") /* F40000 */
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
- PORT_START_TAG("IN1") /* n/a */
+ PORT_START("IN1") /* n/a */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN2") /* n/a */
+ PORT_START("IN2") /* n/a */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN3") /* n/a */
+ PORT_START("IN3") /* n/a */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("F60000") /* F60000 */
+ PORT_START("F60000") /* F60000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -533,7 +533,7 @@ static INPUT_PORTS_START( peterpak )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("1820") /* 1820 (sound) */
+ PORT_START("1820") /* 1820 (sound) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -545,23 +545,23 @@ INPUT_PORTS_END
static INPUT_PORTS_START( indytemp )
- PORT_START_TAG("IN0") /* F40000 */
+ PORT_START("IN0") /* F40000 */
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
- PORT_START_TAG("IN1") /* n/a */
+ PORT_START("IN1") /* n/a */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN2") /* n/a */
+ PORT_START("IN2") /* n/a */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN3") /* n/a */
+ PORT_START("IN3") /* n/a */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("F60000") /* F60000 */
+ PORT_START("F60000") /* F60000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* freeze? */
@@ -572,7 +572,7 @@ static INPUT_PORTS_START( indytemp )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("1820") /* 1820 (sound) */
+ PORT_START("1820") /* 1820 (sound) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -584,19 +584,19 @@ INPUT_PORTS_END
static INPUT_PORTS_START( roadrunn )
- PORT_START_TAG("IN0") /* F40000 */
+ PORT_START("IN0") /* F40000 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("IN1") /* F40002 */
+ PORT_START("IN1") /* F40002 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("IN2") /* n/a */
+ PORT_START("IN2") /* n/a */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* n/a */
+ PORT_START("IN3") /* n/a */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("F60000") /* F60000 */
+ PORT_START("F60000") /* F60000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -607,7 +607,7 @@ static INPUT_PORTS_START( roadrunn )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("1820") /* 1820 (sound) */
+ PORT_START("1820") /* 1820 (sound) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -619,19 +619,19 @@ INPUT_PORTS_END
static INPUT_PORTS_START( roadblst )
- PORT_START_TAG("IN0") /* F20000 */
+ PORT_START("IN0") /* F20000 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_REVERSE
- PORT_START_TAG("IN1") /* F40000 */
+ PORT_START("IN1") /* F40000 */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(64)
- PORT_START_TAG("IN2") /* n/a */
+ PORT_START("IN2") /* n/a */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN3") /* n/a */
+ PORT_START("IN3") /* n/a */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("F60000") /* F60000 */
+ PORT_START("F60000") /* F60000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -642,7 +642,7 @@ static INPUT_PORTS_START( roadblst )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("1820") /* 1820 (sound) */
+ PORT_START("1820") /* 1820 (sound) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c
index ed39375de22..9f8efb9784d 100644
--- a/src/mame/drivers/atarisy2.c
+++ b/src/mame/drivers/atarisy2.c
@@ -772,7 +772,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( paperboy )
- PORT_START_TAG("1840") /*(sound) */
+ PORT_START("1840") /*(sound) */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL )
@@ -782,7 +782,7 @@ static INPUT_PORTS_START( paperboy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("1800")
+ PORT_START("1800")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -792,35 +792,35 @@ static INPUT_PORTS_START( paperboy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("1801")
+ PORT_START("1801")
PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("ADC0")
+ PORT_START("ADC0")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("ADC1")
+ PORT_START("ADC1")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("ADC2")
+ PORT_START("ADC2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("ADC3")
+ PORT_START("ADC3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("LETA0")
+ PORT_START("LETA0")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("LETA1")
+ PORT_START("LETA1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("LETA2")
+ PORT_START("LETA2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("LETA3")
+ PORT_START("LETA3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("6/7A:!8,!7")
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
@@ -844,7 +844,7 @@ static INPUT_PORTS_START( paperboy )
PORT_DIPSETTING( 0xc0, "1 Each ?" ) /* Not Documented */
PORT_DIPSETTING( 0xe0, DEF_STR( Free_Play ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("5/6A:!8,!7")
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Medium ) )
diff --git a/src/mame/drivers/ataxx.c b/src/mame/drivers/ataxx.c
index 0439dcbb645..8bfb14b35f3 100644
--- a/src/mame/drivers/ataxx.c
+++ b/src/mame/drivers/ataxx.c
@@ -104,7 +104,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( ataxx )
- PORT_START_TAG("IN0") /* 0xF6 */
+ PORT_START("IN0") /* 0xF6 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* huh? affects trackball movement */
@@ -114,28 +114,28 @@ static INPUT_PORTS_START( ataxx )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START_TAG("IN1") /* 0xF7 */
+ PORT_START("IN1") /* 0xF7 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SLAVEHALT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* 0x20 */
+ PORT_START("IN2") /* 0x20 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA )
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN0") /* 0x00 - analog X */
+ PORT_START("AN0") /* 0x00 - analog X */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN1") /* 0x01 - analog Y */
+ PORT_START("AN1") /* 0x01 - analog Y */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN2") /* 0x02 - analog X */
+ PORT_START("AN2") /* 0x02 - analog X */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("AN3") /* 0x03 - analog Y */
+ PORT_START("AN3") /* 0x03 - analog Y */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( wsf )
- PORT_START_TAG("IN0") /* 0xF6 */
+ PORT_START("IN0") /* 0xF6 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -145,18 +145,18 @@ static INPUT_PORTS_START( wsf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
- PORT_START_TAG("IN1") /* 0xF7 */
+ PORT_START("IN1") /* 0xF7 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SLAVEHALT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* 0x20 */
+ PORT_START("IN2") /* 0x20 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* 0x0D */
+ PORT_START("IN3") /* 0x0D */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -166,7 +166,7 @@ static INPUT_PORTS_START( wsf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
- PORT_START_TAG("IN4") /* 0x0E */
+ PORT_START("IN4") /* 0x0E */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(4)
@@ -176,7 +176,7 @@ static INPUT_PORTS_START( wsf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
- PORT_START_TAG("IN5") /* 0x0F */
+ PORT_START("IN5") /* 0x0F */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
@@ -189,7 +189,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( indyheat )
- PORT_START_TAG("IN0") /* 0xF6 */
+ PORT_START("IN0") /* 0xF6 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(1)
@@ -197,37 +197,37 @@ static INPUT_PORTS_START( indyheat )
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1") /* 0xF7 */
+ PORT_START("IN1") /* 0xF7 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SLAVEHALT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* 0x20 */
+ PORT_START("IN2") /* 0x20 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA )
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN0") /* Analog wheel 1 */
+ PORT_START("AN0") /* Analog wheel 1 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN1") /* Analog wheel 2 */
+ PORT_START("AN1") /* Analog wheel 2 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("AN2") /* Analog wheel 3 */
+ PORT_START("AN2") /* Analog wheel 3 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(3)
- PORT_START_TAG("AN3") /* Analog pedal 1 */
+ PORT_START("AN3") /* Analog pedal 1 */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN4") /* Analog pedal 2 */
+ PORT_START("AN4") /* Analog pedal 2 */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("AN5") /* Analog pedal 3 */
+ PORT_START("AN5") /* Analog pedal 3 */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(3)
- PORT_START_TAG("IN3") /* 0x0D */
+ PORT_START("IN3") /* 0x0D */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN4") /* 0x0E */
+ PORT_START("IN4") /* 0x0E */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN5") /* 0x0F */
+ PORT_START("IN5") /* 0x0F */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
@@ -235,7 +235,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( brutforc )
- PORT_START_TAG("IN0") /* 0xF6 */
+ PORT_START("IN0") /* 0xF6 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
@@ -243,16 +243,16 @@ static INPUT_PORTS_START( brutforc )
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN1") /* 0xF7 */
+ PORT_START("IN1") /* 0xF7 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SLAVEHALT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* 0x20 */
+ PORT_START("IN2") /* 0x20 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA )
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* 0x0D */
+ PORT_START("IN3") /* 0x0D */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -262,7 +262,7 @@ static INPUT_PORTS_START( brutforc )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN4") /* 0x0E */
+ PORT_START("IN4") /* 0x0E */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -272,7 +272,7 @@ static INPUT_PORTS_START( brutforc )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN5") /* 0x0F */
+ PORT_START("IN5") /* 0x0F */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
diff --git a/src/mame/drivers/atetris.c b/src/mame/drivers/atetris.c
index 08dd599e45a..176c4322047 100644
--- a/src/mame/drivers/atetris.c
+++ b/src/mame/drivers/atetris.c
@@ -250,7 +250,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( atetris )
// These ports are read via the Pokeys
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_DIPNAME( 0x04, 0x00, "Freeze" ) PORT_DIPLOCATION("50H:!4")
@@ -264,7 +264,7 @@ static INPUT_PORTS_START( atetris )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_SERVICE( 0x80, IP_ACTIVE_HIGH )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1)
diff --git a/src/mame/drivers/attckufo.c b/src/mame/drivers/attckufo.c
index 2afdc7c8868..82d9b2b8631 100644
--- a/src/mame/drivers/attckufo.c
+++ b/src/mame/drivers/attckufo.c
@@ -92,7 +92,7 @@ static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( attckufo )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -115,7 +115,7 @@ static INPUT_PORTS_START( attckufo )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("INPUT")
+ PORT_START("INPUT")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1)
diff --git a/src/mame/drivers/avalnche.c b/src/mame/drivers/avalnche.c
index 3ffd46790fa..b8ee9fc47f4 100644
--- a/src/mame/drivers/avalnche.c
+++ b/src/mame/drivers/avalnche.c
@@ -155,7 +155,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( avalnche )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW:6" ) /* Listed as "Unused" */
PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "SW:5" ) /* Listed as "Unused" */
PORT_DIPNAME( 0x0c, 0x04, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW:4,3")
@@ -171,7 +171,7 @@ static INPUT_PORTS_START( avalnche )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_DIPNAME( 0x04, 0x04, "Allow Extended Play" ) PORT_DIPLOCATION("SW:8")
@@ -185,7 +185,7 @@ static INPUT_PORTS_START( avalnche )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 ) /* Serve */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK ) /* VBLANK */
- PORT_START_TAG("PADDLE")
+ PORT_START("PADDLE")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x40, 0xb7) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_CENTERDELTA(0)
INPUT_PORTS_END
diff --git a/src/mame/drivers/aztarac.c b/src/mame/drivers/aztarac.c
index 40d10f40c7b..24b630f4617 100644
--- a/src/mame/drivers/aztarac.c
+++ b/src/mame/drivers/aztarac.c
@@ -117,16 +117,16 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( aztarac )
- PORT_START_TAG("STICKZ")
+ PORT_START("STICKZ")
PORT_BIT( 0x1f, 0xf, IPT_AD_STICK_Z ) PORT_MINMAX(0,0x1e) PORT_SENSITIVITY(100) PORT_KEYDELTA(1)
- PORT_START_TAG("STICKY")
+ PORT_START("STICKY")
PORT_BIT( 0x1f, 0xf, IPT_AD_STICK_Y ) PORT_MINMAX(0,0x1e) PORT_SENSITIVITY(100) PORT_KEYDELTA(1) PORT_REVERSE
- PORT_START_TAG("DIAL")
+ PORT_START("DIAL")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X) PORT_REVERSE
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c
index c2e04610eab..edf8bb92f35 100644
--- a/src/mame/drivers/backfire.c
+++ b/src/mame/drivers/backfire.c
@@ -356,7 +356,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( backfire )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -366,7 +366,7 @@ static INPUT_PORTS_START( backfire )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -376,7 +376,7 @@ static INPUT_PORTS_START( backfire )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -394,7 +394,7 @@ static INPUT_PORTS_START( backfire )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -404,13 +404,13 @@ static INPUT_PORTS_START( backfire )
PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("PADDLE0")
+ PORT_START("PADDLE0")
PORT_BIT ( 0x00ff, 0x0080, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(1)
- PORT_START_TAG("PADDLE1")
+ PORT_START("PADDLE1")
PORT_BIT ( 0x00ff, 0x0080, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(1)
- PORT_START_TAG("UNK")
+ PORT_START("UNK")
/* ?? */
INPUT_PORTS_END
diff --git a/src/mame/drivers/badlands.c b/src/mame/drivers/badlands.c
index 57b608f9ea7..f1d46a93d0d 100644
--- a/src/mame/drivers/badlands.c
+++ b/src/mame/drivers/badlands.c
@@ -356,7 +356,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( badlands )
- PORT_START_TAG("FE4000") /* fe4000 */
+ PORT_START("FE4000") /* fe4000 */
PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
@@ -364,15 +364,15 @@ static INPUT_PORTS_START( badlands )
PORT_SERVICE( 0x0080, IP_ACTIVE_LOW )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("FE6000") /* fe6000 */
+ PORT_START("FE6000") /* fe6000 */
PORT_BIT( 0x00ff, 0, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(1)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("FE6002") /* fe6002 */
+ PORT_START("FE6002") /* fe6002 */
PORT_BIT( 0x00ff, 0, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(2)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AUDIO") /* audio port */
+ PORT_START("AUDIO") /* audio port */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -382,7 +382,7 @@ static INPUT_PORTS_START( badlands )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SPECIAL ) /* command buffer full */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* self test */
- PORT_START_TAG("PEDALS") /* fake for pedals */
+ PORT_START("PEDALS") /* fake for pedals */
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0xfffc, IP_ACTIVE_HIGH, IPT_UNUSED )
diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c
index 1c31a8636a4..b300f6a3726 100644
--- a/src/mame/drivers/bagman.c
+++ b/src/mame/drivers/bagman.c
@@ -245,7 +245,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( bagman )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -255,7 +255,7 @@ static INPUT_PORTS_START( bagman )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
@@ -265,7 +265,7 @@ static INPUT_PORTS_START( bagman )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -345,7 +345,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( squaitsa )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -355,7 +355,7 @@ static INPUT_PORTS_START( squaitsa )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY // ^
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
@@ -365,7 +365,7 @@ static INPUT_PORTS_START( squaitsa )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL // ^
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW:1")
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
diff --git a/src/mame/drivers/balsente.c b/src/mame/drivers/balsente.c
index 1e4cb653ded..6548ecb6d5f 100644
--- a/src/mame/drivers/balsente.c
+++ b/src/mame/drivers/balsente.c
@@ -324,7 +324,7 @@ ADDRESS_MAP_END
PORT_DIPSETTING( 0x04, "1 Or 2" )
static INPUT_PORTS_START( sentetst )
- PORT_START_TAG("SWH")
+ PORT_START("SWH")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) ) PORT_DIPLOCATION("H1:1,2")
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -339,7 +339,7 @@ static INPUT_PORTS_START( sentetst )
PORT_DIPSETTING( 0x80, "Keep Top 5" )
PORT_DIPSETTING( 0x00, "Keep All" )
- PORT_START_TAG("SWG")
+ PORT_START("SWG")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("G1:1,2")
PORT_DIPSETTING( 0x00, "Every 10,000" )
PORT_DIPSETTING( 0x01, "Every 15,000" )
@@ -359,7 +359,7 @@ static INPUT_PORTS_START( sentetst )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_PLAYER(1)
@@ -368,7 +368,7 @@ static INPUT_PORTS_START( sentetst )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -377,17 +377,17 @@ static INPUT_PORTS_START( sentetst )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
/* Analog ports */
- PORT_START_TAG("AN0")
+ PORT_START("AN0")
UNUSED_ANALOG
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
UNUSED_ANALOG
/* Player 1 Trackball */
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 0xff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_RESET PORT_PLAYER(1)
- PORT_START_TAG("AN3")
+ PORT_START("AN3")
PORT_BIT( 0xff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_RESET PORT_REVERSE PORT_PLAYER(1)
INPUT_PORTS_END
@@ -852,10 +852,10 @@ static INPUT_PORTS_START( nstocker )
PORT_CODE_DEC(KEYCODE_S) PORT_CODE_DEC(JOYCODE_X_LEFT_SWITCH) PORT_CODE_INC(KEYCODE_F) PORT_CODE_INC(JOYCODE_X_RIGHT_SWITCH) PORT_RESET PORT_PLAYER(2)
/* extra ports for shooters */
- PORT_START_TAG("FAKEX") /* fake analog X */
+ PORT_START("FAKEX") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("FAKEY") /* fake analog Y */
+ PORT_START("FAKEY") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10)
INPUT_PORTS_END
diff --git a/src/mame/drivers/bankp.c b/src/mame/drivers/bankp.c
index e8000d1d26b..465496b8b27 100644
--- a/src/mame/drivers/bankp.c
+++ b/src/mame/drivers/bankp.c
@@ -137,7 +137,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( bankp )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -147,7 +147,7 @@ static INPUT_PORTS_START( bankp )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -157,13 +157,13 @@ static INPUT_PORTS_START( bankp )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON3 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
PORT_BIT( 0xf8, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, "Coin A/B" ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
diff --git a/src/mame/drivers/baraduke.c b/src/mame/drivers/baraduke.c
index ad0f5414e6d..1cd41a9fb33 100644
--- a/src/mame/drivers/baraduke.c
+++ b/src/mame/drivers/baraduke.c
@@ -221,7 +221,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( baraduke )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_SERVICE_DIPLOC(0x80, IP_ACTIVE_LOW, "SWA:1" )
PORT_DIPNAME( 0x60, 0x60, DEF_STR( Lives ) ) PORT_DIPLOCATION("SWA:2,3")
PORT_DIPSETTING( 0x40, "2" )
@@ -242,7 +242,7 @@ static INPUT_PORTS_START( baraduke )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SWB:1,2")
PORT_DIPSETTING( 0x80, "Every 10k" )
PORT_DIPSETTING( 0xc0, "10k And Every 20k" )
@@ -266,7 +266,7 @@ static INPUT_PORTS_START( baraduke )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SWB:8" ) /* Listed as "Unused" */
- PORT_START_TAG("EDGE")
+ PORT_START("EDGE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) /* service switch from the edge connector */
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("EDGE21:1") /* edge connector Pin 21 */
PORT_DIPSETTING( 0x02, DEF_STR( Upright ) )
@@ -275,7 +275,7 @@ static INPUT_PORTS_START( baraduke )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -283,7 +283,7 @@ static INPUT_PORTS_START( baraduke )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -291,7 +291,7 @@ static INPUT_PORTS_START( baraduke )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/batman.c b/src/mame/drivers/batman.c
index 37ac9c6a69c..6ee0156c56d 100644
--- a/src/mame/drivers/batman.c
+++ b/src/mame/drivers/batman.c
@@ -170,7 +170,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( batman )
- PORT_START_TAG("260000") /* 260000 */
+ PORT_START("260000") /* 260000 */
PORT_BIT( 0x01ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -180,10 +180,10 @@ static INPUT_PORTS_START( batman )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_START_TAG("260002") /* 260002 */
+ PORT_START("260002") /* 260002 */
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("260010") /* 260010 */
+ PORT_START("260010") /* 260010 */
PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNUSED ) /* Input buffer full (@260030) */
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNUSED ) /* Output buffer full (@260040) */
diff --git a/src/mame/drivers/battlane.c b/src/mame/drivers/battlane.c
index cc227a9c74f..28df648ebf1 100644
--- a/src/mame/drivers/battlane.c
+++ b/src/mame/drivers/battlane.c
@@ -117,7 +117,7 @@ static INTERRUPT_GEN( battlane_cpu1_interrupt )
static INPUT_PORTS_START( battlane )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -127,7 +127,7 @@ static INPUT_PORTS_START( battlane )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -137,7 +137,7 @@ static INPUT_PORTS_START( battlane )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -160,7 +160,7 @@ static INPUT_PORTS_START( battlane )
PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Very_Hard ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
diff --git a/src/mame/drivers/battlera.c b/src/mame/drivers/battlera.c
index 393c3f20fd1..2f55cc7a690 100644
--- a/src/mame/drivers/battlera.c
+++ b/src/mame/drivers/battlera.c
@@ -138,7 +138,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( battlera )
- PORT_START_TAG("IN0") /* Player 1 controls */
+ PORT_START("IN0") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -148,7 +148,7 @@ static INPUT_PORTS_START( battlera )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1") /* Player 2 controls */
+ PORT_START("IN1") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -158,13 +158,13 @@ static INPUT_PORTS_START( battlera )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN2") /* Coins */
+ PORT_START("IN2") /* Coins */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -182,7 +182,7 @@ static INPUT_PORTS_START( battlera )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW1:7" ) /* Listed as "Unused" */
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW1:8" ) /* Listed as "Unused" */
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x02, "2" )
diff --git a/src/mame/drivers/battlex.c b/src/mame/drivers/battlex.c
index ebb0cd5a13a..c0e938e1558 100644
--- a/src/mame/drivers/battlex.c
+++ b/src/mame/drivers/battlex.c
@@ -101,7 +101,7 @@ ADDRESS_MAP_END
/*** INPUT PORTS *************************************************************/
static INPUT_PORTS_START( battlex )
- PORT_START_TAG("DSW1") /* IN0 */
+ PORT_START("DSW1") /* IN0 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -124,7 +124,7 @@ static INPUT_PORTS_START( battlex )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("SYSTEM") /* IN1 */
+ PORT_START("SYSTEM") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 )
@@ -134,7 +134,7 @@ static INPUT_PORTS_START( battlex )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("INPUTS") /* IN2 */
+ PORT_START("INPUTS") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -144,7 +144,7 @@ static INPUT_PORTS_START( battlex )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("DSW2") /* IN3 */
+ PORT_START("DSW2") /* IN3 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x07, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 2C_1C ) )
diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c
index fbe689c51df..59a23f37799 100644
--- a/src/mame/drivers/battlnts.c
+++ b/src/mame/drivers/battlnts.c
@@ -85,7 +85,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( battlnts )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -121,7 +121,7 @@ static INPUT_PORTS_START( battlnts )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -144,7 +144,7 @@ static INPUT_PORTS_START( battlnts )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -158,7 +158,7 @@ static INPUT_PORTS_START( battlnts )
PORT_DIPSETTING( 0x00, DEF_STR( Dual ) )
PORT_SERVICE_DIPLOC(0x80, IP_ACTIVE_LOW, "SW3:3" )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -170,7 +170,7 @@ static INPUT_PORTS_START( battlnts )
PORT_DIPSETTING( 0x80, "3 Times" )
PORT_DIPSETTING( 0x00, "5 Times" )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c
index 248e55715b5..4ea24509ed7 100644
--- a/src/mame/drivers/bbusters.c
+++ b/src/mame/drivers/bbusters.c
@@ -379,7 +379,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( bbusters )
- PORT_START_TAG("IN0") /* Player controls */
+ PORT_START("IN0") /* Player controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("P1 Fire") // "Fire"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("P1 Grenade") // "Grenade"
@@ -389,7 +389,7 @@ static INPUT_PORTS_START( bbusters )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 Grenade") // "Grenade"
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* Player controls */
+ PORT_START("IN1") /* Player controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) PORT_NAME("P3 Fire") // "Fire"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3) PORT_NAME("P3 Grenade") // "Grenade"
@@ -399,7 +399,7 @@ static INPUT_PORTS_START( bbusters )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("COINS")
+ PORT_START("COINS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -409,7 +409,7 @@ static INPUT_PORTS_START( bbusters )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) // See notes
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* Dip switch bank 1 */
+ PORT_START("DSW1") /* Dip switch bank 1 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x01, DEF_STR( Yes ) )
@@ -445,7 +445,7 @@ static INPUT_PORTS_START( bbusters )
PORT_DIPSETTING( 0x80, "Common" )
PORT_DIPSETTING( 0x00, "Individual" )
- PORT_START_TAG("DSW2") /* Dip switch bank 2 */
+ PORT_START("DSW2") /* Dip switch bank 2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -461,23 +461,23 @@ static INPUT_PORTS_START( bbusters )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW2:7" ) /* Listed as "Unused" */
PORT_SERVICE_DIPLOC(0x80, IP_ACTIVE_LOW, "SW2:8" )
- PORT_START_TAG("GUNX1")
+ PORT_START("GUNX1")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("GUNY1")
+ PORT_START("GUNY1")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("GUNX2")
+ PORT_START("GUNX2")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("GUNY2")
+ PORT_START("GUNY2")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("GUNX3")
+ PORT_START("GUNX3")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(3)
- PORT_START_TAG("GUNY3")
+ PORT_START("GUNY3")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(3)
#if BBUSTERS_HACK
- PORT_START_TAG("FAKE1")
+ PORT_START("FAKE1")
PORT_DIPNAME( 0x03, 0x02, "Country/Version" )
PORT_DIPSETTING( 0x00, "Japan?" )
PORT_DIPSETTING( 0x01, "US?" )
@@ -487,7 +487,7 @@ static INPUT_PORTS_START( bbusters )
INPUT_PORTS_END
static INPUT_PORTS_START( mechatt )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) // See notes
@@ -505,7 +505,7 @@ static INPUT_PORTS_START( mechatt )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 Grenade") // "Grenade"
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1") /* Dip switch bank 1 */
+ PORT_START("DSW1") /* Dip switch bank 1 */
PORT_DIPNAME( 0x0001, 0x0001, "Coin Slots" ) PORT_DIPLOCATION("SW1:1") // Listed as "Unused" (manual from different revision/region?), See notes
PORT_DIPSETTING( 0x0001, "Common" )
PORT_DIPSETTING( 0x0000, "Individual" )
@@ -542,18 +542,18 @@ static INPUT_PORTS_START( mechatt )
PORT_DIPUNUSED_DIPLOC(0x4000, 0x4000, "SW2:7" ) /* Listed as "Unused" */
PORT_SERVICE_DIPLOC( 0x8000, IP_ACTIVE_LOW, "SW2:8" )
- PORT_START_TAG("GUNX1")
+ PORT_START("GUNX1")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("GUNY1")
+ PORT_START("GUNY1")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("GUNX2")
+ PORT_START("GUNX2")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("GUNY2")
+ PORT_START("GUNY2")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(2)
#if MECHATT_HACK
- PORT_START_TAG("FAKE1")
+ PORT_START("FAKE1")
PORT_DIPNAME( 0x03, 0x01, "Country" )
PORT_DIPSETTING( 0x00, DEF_STR( Japan ) )
PORT_DIPSETTING( 0x01, DEF_STR( World ) )
diff --git a/src/mame/drivers/beaminv.c b/src/mame/drivers/beaminv.c
index 842b2a45792..5421f3b6f7b 100644
--- a/src/mame/drivers/beaminv.c
+++ b/src/mame/drivers/beaminv.c
@@ -235,7 +235,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( beaminv )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -254,7 +254,7 @@ static INPUT_PORTS_START( beaminv )
PORT_DIPSETTING( 0x60, "Never" )
PORT_DIPUNUSED( 0x80, IP_ACTIVE_HIGH )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
@@ -262,10 +262,10 @@ static INPUT_PORTS_START( beaminv )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG(P1_CONTROL_PORT_TAG)
+ PORT_START(P1_CONTROL_PORT_TAG)
PORT_BIT( 0xff, 0x65, IPT_PADDLE ) PORT_MINMAX(0x35,0x95) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_PLAYER(1)
- PORT_START_TAG(P2_CONTROL_PORT_TAG)
+ PORT_START(P2_CONTROL_PORT_TAG)
PORT_BIT( 0xff, 0x65, IPT_PADDLE ) PORT_MINMAX(0x35,0x95) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_PLAYER(2)
INPUT_PORTS_END
diff --git a/src/mame/drivers/beathead.c b/src/mame/drivers/beathead.c
index c69d6a28b13..04347adcba4 100644
--- a/src/mame/drivers/beathead.c
+++ b/src/mame/drivers/beathead.c
@@ -360,7 +360,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( beathead )
- PORT_START_TAG("IN0") /* Player 1 */
+ PORT_START("IN0") /* Player 1 */
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
@@ -371,7 +371,7 @@ static INPUT_PORTS_START( beathead )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_START_TAG("IN1") /* Player 2 */
+ PORT_START("IN1") /* Player 2 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -382,14 +382,14 @@ static INPUT_PORTS_START( beathead )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SPECIAL )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SPECIAL )
PORT_SERVICE( 0x0040, IP_ACTIVE_LOW )
PORT_BIT( 0xff80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0006, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_COIN2 )
diff --git a/src/mame/drivers/beezer.c b/src/mame/drivers/beezer.c
index b23f920514f..53527a2a8ac 100644
--- a/src/mame/drivers/beezer.c
+++ b/src/mame/drivers/beezer.c
@@ -30,7 +30,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( beezer )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
@@ -40,16 +40,16 @@ static INPUT_PORTS_START( beezer )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0f, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_REVERSE
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0f, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_REVERSE
/* Manual says "Dip Switch A" is not used. */
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SWB:1,2")
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
diff --git a/src/mame/drivers/berzerk.c b/src/mame/drivers/berzerk.c
index 88140fe6ad5..e7a026dc461 100644
--- a/src/mame/drivers/berzerk.c
+++ b/src/mame/drivers/berzerk.c
@@ -631,7 +631,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( common )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -639,7 +639,7 @@ static INPUT_PORTS_START( common )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x1c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -647,7 +647,7 @@ static INPUT_PORTS_START( common )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -659,7 +659,7 @@ static INPUT_PORTS_START( common )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
/* fake port for monitor type */
- PORT_START_TAG(MONITOR_TYPE_PORT_TAG)
+ PORT_START(MONITOR_TYPE_PORT_TAG)
PORT_CONFNAME( 0x01, 0x00, "Monitor Type" )
PORT_CONFSETTING( 0x00, "Wells-Gardner" )
PORT_CONFSETTING( 0x01, "Electrohome" )
@@ -669,7 +669,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( berzerk )
PORT_INCLUDE( common )
- PORT_START_TAG("F2")
+ PORT_START("F2")
PORT_DIPNAME( 0x03, 0x00, "Color Test" ) PORT_CODE(KEYCODE_F5) PORT_TOGGLE PORT_DIPLOCATION("F2:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x03, DEF_STR( On ) )
@@ -680,7 +680,7 @@ static INPUT_PORTS_START( berzerk )
PORT_DIPSETTING( 0x80, "10000" )
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
- PORT_START_TAG("F3")
+ PORT_START("F3")
PORT_DIPNAME( 0x01, 0x00, "Input Test Mode" ) PORT_CODE(KEYCODE_F2) PORT_TOGGLE PORT_DIPLOCATION("F3:1")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -694,16 +694,16 @@ static INPUT_PORTS_START( berzerk )
PORT_DIPSETTING( 0x80, DEF_STR( French ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Spanish ) )
- PORT_START_TAG("F4")
+ PORT_START("F4")
BERZERK_COINAGE(1, F4)
- PORT_START_TAG("F5")
+ PORT_START("F5")
BERZERK_COINAGE(2, F5)
- PORT_START_TAG("F6")
+ PORT_START("F6")
BERZERK_COINAGE(3, F6)
- PORT_START_TAG("SW2")
+ PORT_START("SW2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -718,7 +718,7 @@ static INPUT_PORTS_START( frenzy )
PORT_MODIFY("SYSTEM")
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("F2")
+ PORT_START("F2")
/* Bit 0 does some more hardware tests. According to the manual, both bit 0 & 1 must be:
- ON for Signature Analysis (S.A.)
- OFF for game operation */
@@ -731,7 +731,7 @@ static INPUT_PORTS_START( frenzy )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) // F2:5,6,7,8
- PORT_START_TAG("F3")
+ PORT_START("F3")
PORT_DIPNAME( 0x0f, 0x03, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("F3:1,2,3,4")
PORT_DIPSETTING( 0x01, "1000" )
PORT_DIPSETTING( 0x02, "2000" )
@@ -757,7 +757,7 @@ static INPUT_PORTS_START( frenzy )
PORT_DIPSETTING( 0xc0, DEF_STR( Spanish ) )
/* The following 3 ports use all 8 bits, but I didn't feel like adding all 256 values :-) */
- PORT_START_TAG("F4")
+ PORT_START("F4")
PORT_DIPNAME( 0x0f, 0x01, "Coin Multiplier" ) PORT_DIPLOCATION("F4:1,2,3,4") // F4:1,8
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
PORT_DIPSETTING( 0x01, "1" )
@@ -777,7 +777,7 @@ static INPUT_PORTS_START( frenzy )
PORT_DIPSETTING( 0x0f, "15" )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("F5")
+ PORT_START("F5")
PORT_DIPNAME( 0x0f, 0x01, "Coins/Credit A" ) PORT_DIPLOCATION("F5:1,2,3,4") // F5:1,8
/*PORT_DIPSETTING( 0x00, "0" ) Can't insert coins */
PORT_DIPSETTING( 0x01, "1" )
@@ -797,7 +797,7 @@ static INPUT_PORTS_START( frenzy )
PORT_DIPSETTING( 0x0f, "15" )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("F6")
+ PORT_START("F6")
PORT_DIPNAME( 0x0f, 0x01, "Coins/Credit B" ) PORT_DIPLOCATION("F6:1,2,3,4") // F6:1,8
/*PORT_DIPSETTING( 0x00, "0" ) Can't insert coins */
PORT_DIPSETTING( 0x01, "1" )
@@ -817,7 +817,7 @@ static INPUT_PORTS_START( frenzy )
PORT_DIPSETTING( 0x0f, "15" )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("SW2")
+ PORT_START("SW2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN3 ) PORT_DIPLOCATION("SW2:1")
PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Stats") PORT_CODE(KEYCODE_F1)
diff --git a/src/mame/drivers/bestleag.c b/src/mame/drivers/bestleag.c
index 4c65fe201fa..6dd492f5d48 100644
--- a/src/mame/drivers/bestleag.c
+++ b/src/mame/drivers/bestleag.c
@@ -217,7 +217,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
static INPUT_PORTS_START( bestleag )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -227,13 +227,13 @@ static INPUT_PORTS_START( bestleag )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("P1")
+ PORT_START("P1")
BESTLEAG_PLAYER_INPUT( 1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
BESTLEAG_PLAYER_INPUT( 2 )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW.A:1,2,3,4")
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -261,7 +261,7 @@ static INPUT_PORTS_START( bestleag )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) ) // also set "Coin A" to "Free Play"
/* 0x10 to 0x50 gives 2C_3C */
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW.B:1") // Doesn't work ?
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c
index d67c8780aa7..37b87bca2aa 100644
--- a/src/mame/drivers/bfcobra.c
+++ b/src/mame/drivers/bfcobra.c
@@ -1460,7 +1460,7 @@ static ADDRESS_MAP_START( m6809_prog_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( bfcobra )
- PORT_START_TAG("STROBE0")
+ PORT_START("STROBE0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_NAME("Coin: 10p")
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_NAME("Coin: 20p")
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 ) PORT_NAME("Coin: 50p")
@@ -1470,7 +1470,7 @@ static INPUT_PORTS_START( bfcobra )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Red Test?")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("STROBE1")
+ PORT_START("STROBE1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Pass") PORT_CODE(KEYCODE_A)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Continue") PORT_CODE(KEYCODE_S)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Collect") PORT_CODE(KEYCODE_D)
@@ -1480,7 +1480,7 @@ static INPUT_PORTS_START( bfcobra )
// PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 )
// PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON3 )
- PORT_START_TAG("STROBE2")
+ PORT_START("STROBE2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("<A")
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("<B")
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON7 ) PORT_NAME("<C")
@@ -1490,7 +1490,7 @@ static INPUT_PORTS_START( bfcobra )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("STROBE3")
+ PORT_START("STROBE3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_INTERLOCK) PORT_NAME("Cash box door") PORT_CODE(KEYCODE_Y) PORT_TOGGLE
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Front Door? (resets)") PORT_CODE(KEYCODE_T) PORT_TOGGLE
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Refill Key") PORT_CODE(KEYCODE_R) PORT_TOGGLE
@@ -1500,13 +1500,13 @@ static INPUT_PORTS_START( bfcobra )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("STROBE4")
+ PORT_START("STROBE4")
PORT_BIT( 0xFF, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("STROBE5")
+ PORT_START("STROBE5")
PORT_BIT( 0xFF, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("STROBE6")
+ PORT_START("STROBE6")
PORT_DIPNAME( 0x01, 0x00, "DIL09" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1530,7 +1530,7 @@ static INPUT_PORTS_START( bfcobra )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("STROBE7")
+ PORT_START("STROBE7")
PORT_DIPNAME( 0x01, 0x00, "DIL02" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1554,7 +1554,7 @@ static INPUT_PORTS_START( bfcobra )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("JOYSTICK")
+ PORT_START("JOYSTICK")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c
index 208ac9dcd34..72a9ae08bd2 100644
--- a/src/mame/drivers/bfm_sc2.c
+++ b/src/mame/drivers/bfm_sc2.c
@@ -1566,7 +1566,7 @@ ADDRESS_MAP_END
// input ports for pyramid ////////////////////////////////////////
static INPUT_PORTS_START( pyramid )
- PORT_START_TAG("COINS")
+ PORT_START("COINS")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(3) PORT_NAME("Fl 5.00")
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(3) PORT_NAME("Fl 2.50")
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 ) PORT_IMPULSE(3) PORT_NAME("Fl 1.00")
@@ -1576,7 +1576,7 @@ static INPUT_PORTS_START( pyramid )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_START_TAG("STROBE0")
+ PORT_START("STROBE0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
@@ -1586,7 +1586,7 @@ static INPUT_PORTS_START( pyramid )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_START_TAG("STROBE1")
+ PORT_START("STROBE1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
@@ -1596,7 +1596,7 @@ static INPUT_PORTS_START( pyramid )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_START_TAG("STROBE2")
+ PORT_START("STROBE2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON3) PORT_NAME("Right")
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Enter") PORT_CODE(KEYCODE_E)
@@ -1606,7 +1606,7 @@ static INPUT_PORTS_START( pyramid )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_START_TAG("STROBE3")
+ PORT_START("STROBE3")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
@@ -1616,7 +1616,7 @@ static INPUT_PORTS_START( pyramid )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_START_TAG("STROBE4")
+ PORT_START("STROBE4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_INTERLOCK) PORT_NAME("Cashbox Door") PORT_CODE(KEYCODE_Q) PORT_TOGGLE
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_INTERLOCK) PORT_NAME("Front Door") PORT_CODE(KEYCODE_W) PORT_TOGGLE
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Refill Key") PORT_CODE(KEYCODE_R) PORT_TOGGLE
@@ -1626,7 +1626,7 @@ static INPUT_PORTS_START( pyramid )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_START_TAG("STROBE5")
+ PORT_START("STROBE5")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
@@ -1636,7 +1636,7 @@ static INPUT_PORTS_START( pyramid )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_START_TAG("STROBE6")
+ PORT_START("STROBE6")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
@@ -1646,7 +1646,7 @@ static INPUT_PORTS_START( pyramid )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_START_TAG("STROBE7")
+ PORT_START("STROBE7")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
@@ -1656,7 +1656,7 @@ static INPUT_PORTS_START( pyramid )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_START_TAG("STROBE8")
+ PORT_START("STROBE8")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
@@ -1666,7 +1666,7 @@ static INPUT_PORTS_START( pyramid )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_START_TAG("STROBE9")
+ PORT_START("STROBE9")
PORT_SERVICE_NO_TOGGLE(0x01,IP_ACTIVE_HIGH)
PORT_DIPNAME( 0x02, 0x00, "Coin 1 Lockout")PORT_DIPLOCATION("DIL:!02")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -1681,7 +1681,7 @@ static INPUT_PORTS_START( pyramid )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x10, DEF_STR( On ) )
- PORT_START_TAG("STROBE10")
+ PORT_START("STROBE10")
PORT_DIPUNKNOWN_DIPLOC( 0x01, 0x00, "DIL:!06" )
PORT_DIPNAME( 0x02, 0x00, "Attract mode language" ) PORT_DIPLOCATION("DIL:!07")
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
@@ -1693,7 +1693,7 @@ static INPUT_PORTS_START( pyramid )
PORT_DIPSETTING( 0x0C, DEF_STR( High ) )
PORT_DIPUNKNOWN_DIPLOC( 0x10, 0x00, "DIL:!11" )
- PORT_START_TAG("STROBE11")
+ PORT_START("STROBE11")
PORT_DIPUNKNOWN_DIPLOC( 0x01, 0x00, "DIL:!12" )
PORT_DIPUNKNOWN_DIPLOC( 0x02, 0x00, "DIL:!13" )
PORT_DIPNAME( 0x04, 0x00, "Attract mode" ) PORT_DIPLOCATION("DIL:!14")
diff --git a/src/mame/drivers/bigevglf.c b/src/mame/drivers/bigevglf.c
index d7fe6e21869..eb4afbe0115 100644
--- a/src/mame/drivers/bigevglf.c
+++ b/src/mame/drivers/bigevglf.c
@@ -212,7 +212,7 @@ static WRITE8_HANDLER( beg_port08_w )
static INPUT_PORTS_START( bigevglf )
- PORT_START_TAG("PORT00") /* port 00 on sub cpu */
+ PORT_START("PORT00") /* port 00 on sub cpu */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -222,11 +222,11 @@ static INPUT_PORTS_START( bigevglf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("PORT04") /* port 04 on sub cpu - bit 0 and bit 1 are coin inputs */
+ PORT_START("PORT04") /* port 04 on sub cpu - bit 0 and bit 1 are coin inputs */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
- PORT_START_TAG("DSW1") /* port 05 on sub cpu */
+ PORT_START("DSW1") /* port 05 on sub cpu */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -243,7 +243,7 @@ static INPUT_PORTS_START( bigevglf )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSW2") /* port 06 on sub cpu */
+ PORT_START("DSW2") /* port 06 on sub cpu */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -267,16 +267,16 @@ static INPUT_PORTS_START( bigevglf )
PORT_DIPSETTING( 0x20, "9" )
PORT_DIPSETTING( 0x00, "10" )
- PORT_START_TAG("P1X") /* port 02 on sub cpu - muxed port 0 */
+ PORT_START("P1X") /* port 02 on sub cpu - muxed port 0 */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10)
- PORT_START_TAG("P1Y") /* port 03 on sub cpu - muxed port 0 */
+ PORT_START("P1Y") /* port 03 on sub cpu - muxed port 0 */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_REVERSE
- PORT_START_TAG("P2X") /* port 02 on sub cpu - muxed port 1 */
+ PORT_START("P2X") /* port 02 on sub cpu - muxed port 1 */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_COCKTAIL
- PORT_START_TAG("P2Y") /* port 03 on sub cpu - muxed port 1 */
+ PORT_START("P2Y") /* port 03 on sub cpu - muxed port 1 */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_REVERSE PORT_COCKTAIL
INPUT_PORTS_END
diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c
index eb4fe5d462b..c9fee6f2c65 100644
--- a/src/mame/drivers/bigfghtr.c
+++ b/src/mame/drivers/bigfghtr.c
@@ -458,7 +458,7 @@ static MACHINE_DRIVER_START( bigfghtr )
MACHINE_DRIVER_END
static INPUT_PORTS_START( bigfghtr )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -473,7 +473,7 @@ static INPUT_PORTS_START( bigfghtr )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -487,7 +487,7 @@ static INPUT_PORTS_START( bigfghtr )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0xf800, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -510,7 +510,7 @@ static INPUT_PORTS_START( bigfghtr )
PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
diff --git a/src/mame/drivers/bigstrkb.c b/src/mame/drivers/bigstrkb.c
index 425da0cf512..d548f9776c9 100644
--- a/src/mame/drivers/bigstrkb.c
+++ b/src/mame/drivers/bigstrkb.c
@@ -99,7 +99,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, start )
static INPUT_PORTS_START( bigstrkb )
- PORT_START_TAG("DSW0") /* DSW0 (0x700000.w) */
+ PORT_START("DSW0") /* DSW0 (0x700000.w) */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -127,7 +127,7 @@ static INPUT_PORTS_START( bigstrkb )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) ) // also set "Coin A" to "Free Play"
/* 0x10 to 0x50 gives 2C_3C */
- PORT_START_TAG("DSW1") /* DSW1 (0x700002.w) */
+ PORT_START("DSW1") /* DSW1 (0x700002.w) */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) // Check code at 0x00097c (flip screen)
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -149,7 +149,7 @@ static INPUT_PORTS_START( bigstrkb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* System inputs (0x700004.w) */
+ PORT_START("SYSTEM") /* System inputs (0x700004.w) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -159,10 +159,10 @@ static INPUT_PORTS_START( bigstrkb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P1") /* Player 1 controls (0x70000c.w) */
+ PORT_START("P1") /* Player 1 controls (0x70000c.w) */
BIGSTRKB_PLAYER_INPUT( 1, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 controls (0x70000a.w) */
+ PORT_START("P2") /* Player 2 controls (0x70000a.w) */
BIGSTRKB_PLAYER_INPUT( 2, IPT_START2 )
INPUT_PORTS_END
diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c
index b9fbe3f0541..8252776a5a5 100644
--- a/src/mame/drivers/bionicc.c
+++ b/src/mame/drivers/bionicc.c
@@ -175,14 +175,14 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( bionicc )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0fff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SWB:1,2,3")
PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) )
@@ -227,7 +227,7 @@ static INPUT_PORTS_START( bionicc )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
@@ -237,7 +237,7 @@ static INPUT_PORTS_START( bionicc )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
diff --git a/src/mame/drivers/bishi.c b/src/mame/drivers/bishi.c
index a5d79a4d881..012a2bed9d1 100644
--- a/src/mame/drivers/bishi.c
+++ b/src/mame/drivers/bishi.c
@@ -211,7 +211,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
static INPUT_PORTS_START( bishi )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -221,7 +221,7 @@ static INPUT_PORTS_START( bishi )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE4 )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x07, 0x04, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, DEF_STR( Easiest ) )
PORT_DIPSETTING( 0x06, DEF_STR( Very_Easy) )
@@ -246,7 +246,7 @@ static INPUT_PORTS_START( bishi )
PORT_DIPSETTING( 0x40, "Loop At 4 Times" )
PORT_DIPSETTING( 0x00, "No Sounds" )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -256,7 +256,7 @@ static INPUT_PORTS_START( bishi )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
@@ -266,7 +266,7 @@ static INPUT_PORTS_START( bishi )
PORT_SERVICE_NO_TOGGLE(0x40, IP_ACTIVE_LOW)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -276,7 +276,7 @@ static INPUT_PORTS_START( bishi )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/bishjan.c b/src/mame/drivers/bishjan.c
index a3458268d29..b652725863c 100644
--- a/src/mame/drivers/bishjan.c
+++ b/src/mame/drivers/bishjan.c
@@ -322,10 +322,10 @@ GFXDECODE_END
***************************************************************************/
static INPUT_PORTS_START( bishjan )
- PORT_START_TAG("RESET") /* IN0 - Reset */
+ PORT_START("RESET") /* IN0 - Reset */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Reset") PORT_CODE(KEYCODE_F1)
- PORT_START_TAG("DSW") /* IN1 - DSW(SW1) */
+ PORT_START("DSW") /* IN1 - DSW(SW1) */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Controls ) )
PORT_DIPSETTING( 0x0001, "Keyboard" )
PORT_DIPSETTING( 0x0000, DEF_STR( Joystick ) )
@@ -351,7 +351,7 @@ static INPUT_PORTS_START( bishjan )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("JOY") /* IN2 - C */
+ PORT_START("JOY") /* IN2 - C */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("1 Player Start (Joy Mode)") // start (joy)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) // down (joy)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -361,7 +361,7 @@ static INPUT_PORTS_START( bishjan )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) PORT_NAME("P1 Mahjong Bet (Joy Mode)") // bet (joy)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON2 ) // select (joy)
- PORT_START_TAG("SYSTEM") /* IN3 - A */
+ PORT_START("SYSTEM") /* IN3 - A */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE ) // test
PORT_BIT( 0x0004, IP_ACTIVE_HIGH,IPT_SPECIAL ) // hopper sensor
@@ -371,7 +371,7 @@ static INPUT_PORTS_START( bishjan )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_SERVICE3 ) // pay out? "hopper empty"
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(2) // coin
- PORT_START_TAG("KEYB_0") /* IN4 - B(1) */
+ PORT_START("KEYB_0") /* IN4 - B(1) */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_A ) // a
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_E ) // e
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_I ) // i
@@ -381,7 +381,7 @@ static INPUT_PORTS_START( bishjan )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEYB_1") /* IN5 - B(2) */
+ PORT_START("KEYB_1") /* IN5 - B(2) */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_B ) // b
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_F ) // f
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_J ) // j
@@ -391,7 +391,7 @@ static INPUT_PORTS_START( bishjan )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEYB_2") /* IN6 - B(3) */
+ PORT_START("KEYB_2") /* IN6 - B(3) */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_C ) // c
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_G ) // g
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_K ) // k
@@ -401,7 +401,7 @@ static INPUT_PORTS_START( bishjan )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEYB_3") /* IN7 - B(4) */
+ PORT_START("KEYB_3") /* IN7 - B(4) */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_D ) // d
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_H ) // h
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_L ) // l
@@ -411,7 +411,7 @@ static INPUT_PORTS_START( bishjan )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEYB_4") /* IN8 - B(5) */
+ PORT_START("KEYB_4") /* IN8 - B(5) */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) // g2
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) // e2
diff --git a/src/mame/drivers/bking.c b/src/mame/drivers/bking.c
index 2257663383c..f41b0c30133 100644
--- a/src/mame/drivers/bking.c
+++ b/src/mame/drivers/bking.c
@@ -257,7 +257,7 @@ static ADDRESS_MAP_START( m68705_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( bking )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -265,7 +265,7 @@ static INPUT_PORTS_START( bking )
/* continue inputs are labelled in schematics. */
/* They are not connected though to any button */
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) /* Continue 1 */
@@ -274,7 +274,7 @@ static INPUT_PORTS_START( bking )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) /* Not Connected */
- PORT_START_TAG("DSWA") /* IN2 - DIP Switch A */
+ PORT_START("DSWA") /* IN2 - DIP Switch A */
PORT_DIPNAME( 0x01, 0x00, "Holes Awarded" ) PORT_DIPLOCATION("SWA:1")
PORT_DIPSETTING( 0x00, "Par Play: 0 Holes/Birdie: 1 Hole/Eagle: 2 Holes/Double Eagle: 4 Holes" )
PORT_DIPSETTING( 0x01, "Par Play: 1 Hole/Birdie: 2 Holes/Eagle: 3 Holes/Double Eagle: 4 Holes" )
@@ -299,7 +299,7 @@ static INPUT_PORTS_START( bking )
PORT_DIPSETTING( 0x00, DEF_STR(Upright) )
PORT_DIPSETTING( 0x80, DEF_STR(Cocktail) )
- PORT_START_TAG("DSWB") /* IN3 - DIP Switch B */
+ PORT_START("DSWB") /* IN3 - DIP Switch B */
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SWB:1,2,3,4")
PORT_DIPSETTING( 0x0f, DEF_STR( 9C_1C ) )
PORT_DIPSETTING( 0x0e, DEF_STR( 8C_1C ) )
@@ -335,7 +335,7 @@ static INPUT_PORTS_START( bking )
PORT_DIPSETTING( 0x60, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x70, DEF_STR( 1C_8C ) )
- PORT_START_TAG("DSWC") /* IN4 - DIP Switch C */
+ PORT_START("DSWC") /* IN4 - DIP Switch C */
PORT_DIPNAME( 0x01, 0x01, "Appearance of Crow" ) PORT_DIPLOCATION("SWC:1")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -358,16 +358,16 @@ static INPUT_PORTS_START( bking )
PORT_DIPSETTING( 0x00, "1 Way" )
PORT_DIPSETTING( 0x80, "2 Way" )
- PORT_START_TAG("TRACK0_X") /* IN5 */
+ PORT_START("TRACK0_X") /* IN5 */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) /* Sensitivity, clip, min, max */
- PORT_START_TAG("TRACK0_Y") /* IN6 */
+ PORT_START("TRACK0_Y") /* IN6 */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_REVERSE /* Sensitivity, clip, min, max */
- PORT_START_TAG("TRACK1_X") /* IN7 */
+ PORT_START("TRACK1_X") /* IN7 */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_COCKTAIL /* Sensitivity, clip, min, max */
- PORT_START_TAG("TRACK1_Y") /* IN8 */
+ PORT_START("TRACK1_Y") /* IN8 */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_REVERSE PORT_COCKTAIL /* Sensitivity, clip, min, max */
INPUT_PORTS_END
diff --git a/src/mame/drivers/blackt96.c b/src/mame/drivers/blackt96.c
index f3ab26d8d9d..5cd6921b5dd 100644
--- a/src/mame/drivers/blackt96.c
+++ b/src/mame/drivers/blackt96.c
@@ -210,7 +210,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( blackt96 )
- PORT_START_TAG("P1_P2")
+ PORT_START("P1_P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -228,7 +228,7 @@ static INPUT_PORTS_START( blackt96 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) // Test mode lists this as Service 1, but it appears to be Coin 1 (uses Coin 1 coinage etc.)
PORT_DIPNAME( 0x0002, 0x0002, "xx")
PORT_DIPSETTING( 0x0002, DEF_STR( Off ) )
@@ -274,7 +274,7 @@ static INPUT_PORTS_START( blackt96 )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x0001, 0x0001, "2" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -324,7 +324,7 @@ static INPUT_PORTS_START( blackt96 )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_DIPNAME( 0x0001, 0x0001, "3" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -375,7 +375,7 @@ static INPUT_PORTS_START( blackt96 )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
/* Dipswitch Port A */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0300, 0x0100, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:!7,!8")
PORT_DIPSETTING( 0x0000, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x0200, DEF_STR( 1C_2C ) )
@@ -400,7 +400,7 @@ static INPUT_PORTS_START( blackt96 )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
/* Dipswitch Port B */
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_SERVICE( 0x0100, IP_ACTIVE_HIGH ) PORT_DIPLOCATION("SW2:!8")
PORT_DIPNAME( 0x0200, 0x0200, "Continue" ) PORT_DIPLOCATION("SW2:!7")
PORT_DIPSETTING( 0x0200, DEF_STR( Off ) )
diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c
index 7e3af3b10b6..debe7186543 100644
--- a/src/mame/drivers/bladestl.c
+++ b/src/mame/drivers/bladestl.c
@@ -144,7 +144,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( bladestl )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -180,7 +180,7 @@ static INPUT_PORTS_START( bladestl )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW2:1" )
PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "SW2:2" )
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:3")
@@ -200,7 +200,7 @@ static INPUT_PORTS_START( bladestl )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("COINSW")
+ PORT_START("COINSW")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -212,7 +212,7 @@ static INPUT_PORTS_START( bladestl )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW3:2" )
PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW3:3" )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -224,7 +224,7 @@ static INPUT_PORTS_START( bladestl )
PORT_DIPSETTING( 0x80, "4" )
PORT_DIPSETTING( 0x00, "7" )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -234,16 +234,16 @@ static INPUT_PORTS_START( bladestl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("TRACKBALL_P1_1")
+ PORT_START("TRACKBALL_P1_1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("TRACKBALL_P1_2")
+ PORT_START("TRACKBALL_P1_2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_PLAYER(1)
- PORT_START_TAG("TRACKBALL_P2_1")
+ PORT_START("TRACKBALL_P2_1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("TRACKBALL_P2_2")
+ PORT_START("TRACKBALL_P2_2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_PLAYER(2)
INPUT_PORTS_END
diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c
index 0b1247247e1..2bd3da10520 100644
--- a/src/mame/drivers/blktiger.c
+++ b/src/mame/drivers/blktiger.c
@@ -101,7 +101,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( blktiger )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
@@ -111,7 +111,7 @@ static INPUT_PORTS_START( blktiger )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -121,7 +121,7 @@ static INPUT_PORTS_START( blktiger )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -131,7 +131,7 @@ static INPUT_PORTS_START( blktiger )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) PORT_DIPLOCATION( "SW1:1,2,3" )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
@@ -157,7 +157,7 @@ static INPUT_PORTS_START( blktiger )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION( "SW2:1,2" )
PORT_DIPSETTING( 0x02, "2" )
PORT_DIPSETTING( 0x03, "3" )
@@ -182,12 +182,12 @@ static INPUT_PORTS_START( blktiger )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("FREEZE")
+ PORT_START("FREEZE")
PORT_DIPNAME( 0x01, 0x01, "Freeze" ) /* could be VBLANK */
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("COIN_LOCKOUT")
+ PORT_START("COIN_LOCKOUT")
PORT_CONFNAME( 0x01, 0x01, "Coin Lockout Hardware Present" )
PORT_CONFSETTING( 0x01, DEF_STR( Yes ) )
PORT_CONFSETTING( 0x00, DEF_STR( No ) )
diff --git a/src/mame/drivers/blmbycar.c b/src/mame/drivers/blmbycar.c
index ba9badba849..e6fa873e09e 100644
--- a/src/mame/drivers/blmbycar.c
+++ b/src/mame/drivers/blmbycar.c
@@ -183,7 +183,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( blmbycar )
- PORT_START_TAG("DSW") // IN0 - $700000.w
+ PORT_START("DSW") // IN0 - $700000.w
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:8,7")
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
@@ -230,7 +230,7 @@ static INPUT_PORTS_START( blmbycar )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("P1_P2") // IN1 - $700002.w
+ PORT_START("P1_P2") // IN1 - $700002.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
@@ -249,17 +249,17 @@ static INPUT_PORTS_START( blmbycar )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("WHEEL") // IN2 - $700004.w
+ PORT_START("WHEEL") // IN2 - $700004.w
PORT_BIT ( 0x00ff, 0x0080, IPT_AD_STICK_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(1)
- PORT_START_TAG("UNK") // IN3 - $700006.w
+ PORT_START("UNK") // IN3 - $700006.w
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( watrball )
- PORT_START_TAG("DSW") /* dips */
+ PORT_START("DSW") /* dips */
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:8,7") /* Affects timer */
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) ) /* 180 Seconds */
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) ) /* 150 Seconds */
@@ -297,7 +297,7 @@ static INPUT_PORTS_START( watrball )
PORT_DIPUNUSED_DIPLOC( 0x4000, 0x4000, "SW2:2" )
PORT_DIPUNUSED_DIPLOC( 0x8000, 0x8000, "SW2:1" )
- PORT_START_TAG("P1_P2") /* 16bit */
+ PORT_START("P1_P2") /* 16bit */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
diff --git a/src/mame/drivers/blockade.c b/src/mame/drivers/blockade.c
index 3b7cafc7851..171d8e31623 100644
--- a/src/mame/drivers/blockade.c
+++ b/src/mame/drivers/blockade.c
@@ -130,7 +130,7 @@ ADDRESS_MAP_END
/* some pins were unused. */
static INPUT_PORTS_START( blockade )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x04, 0x04, "Boom Switch" )
@@ -146,7 +146,7 @@ static INPUT_PORTS_START( blockade )
/* this is really used for the coin latch, */
/* see blockade_interrupt() */
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2)
@@ -156,7 +156,7 @@ static INPUT_PORTS_START( blockade )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -166,13 +166,13 @@ static INPUT_PORTS_START( blockade )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* IN3 */
+ PORT_START("IN3") /* IN3 */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( comotion )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x04, 0x04, "Boom Switch" )
@@ -188,7 +188,7 @@ static INPUT_PORTS_START( comotion )
/* this is really used for the coin latch, */
/* see blockade_interrupt() */
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
@@ -198,7 +198,7 @@ static INPUT_PORTS_START( comotion )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(3)
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2)
@@ -208,13 +208,13 @@ static INPUT_PORTS_START( comotion )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(4)
- PORT_START_TAG("IN3") /* IN3 */
+ PORT_START("IN3") /* IN3 */
PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
INPUT_PORTS_END
static INPUT_PORTS_START( blasto )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
@@ -233,7 +233,7 @@ static INPUT_PORTS_START( blasto )
/* this is really used for the coin latch, */
/* see blockade_interrupt() */
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -243,7 +243,7 @@ static INPUT_PORTS_START( blasto )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
@@ -253,13 +253,13 @@ static INPUT_PORTS_START( blasto )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1)
- PORT_START_TAG("IN3") /* IN3 */
+ PORT_START("IN3") /* IN3 */
PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
INPUT_PORTS_END
static INPUT_PORTS_START( hustle )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
@@ -276,7 +276,7 @@ static INPUT_PORTS_START( hustle )
/* this is really used for the coin latch, */
/* see blockade_interrupt() */
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2)
@@ -286,7 +286,7 @@ static INPUT_PORTS_START( hustle )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_DIPNAME( 0xf1, 0xf0, "Free Game" )
PORT_DIPSETTING( 0x71, "11000" )
PORT_DIPSETTING( 0xb1, "13000" )
@@ -297,13 +297,13 @@ static INPUT_PORTS_START( hustle )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* IN3 */
+ PORT_START("IN3") /* IN3 */
PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
INPUT_PORTS_END
static INPUT_PORTS_START( mineswpr )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* This wiring selects upright mode */
PORT_DIPNAME( 0x04, 0x04, "Boom Switch" )
@@ -319,7 +319,7 @@ static INPUT_PORTS_START( mineswpr )
/* this is really used for the coin latch, */
/* see blockade_interrupt() */
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
@@ -329,7 +329,7 @@ static INPUT_PORTS_START( mineswpr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -339,13 +339,13 @@ static INPUT_PORTS_START( mineswpr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* IN3 */
+ PORT_START("IN3") /* IN3 */
PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
INPUT_PORTS_END
static INPUT_PORTS_START( minesw4p )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* This wiring selects cocktail mode */
PORT_DIPNAME( 0x04, 0x04, "Boom Switch" )
@@ -361,7 +361,7 @@ static INPUT_PORTS_START( minesw4p )
/* this is really used for the coin latch, */
/* see blockade_interrupt() */
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
@@ -371,7 +371,7 @@ static INPUT_PORTS_START( minesw4p )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(3)
@@ -381,7 +381,7 @@ static INPUT_PORTS_START( minesw4p )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(4)
- PORT_START_TAG("IN3") /* IN3 */
+ PORT_START("IN3") /* IN3 */
PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
INPUT_PORTS_END
diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c
index a8948354c39..fc2a5ccd6fc 100644
--- a/src/mame/drivers/blockhl.c
+++ b/src/mame/drivers/blockhl.c
@@ -99,7 +99,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( blockhl )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -109,7 +109,7 @@ static INPUT_PORTS_START( blockhl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -119,7 +119,7 @@ static INPUT_PORTS_START( blockhl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -155,7 +155,7 @@ static INPUT_PORTS_START( blockhl )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x00, "2" )
@@ -172,7 +172,7 @@ static INPUT_PORTS_START( blockhl )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c
index a444f22a4a5..b57fe4a3550 100644
--- a/src/mame/drivers/blockout.c
+++ b/src/mame/drivers/blockout.c
@@ -74,7 +74,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( blockout )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -84,7 +84,7 @@ static INPUT_PORTS_START( blockout )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -94,12 +94,12 @@ static INPUT_PORTS_START( blockout )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN3 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -118,7 +118,7 @@ static INPUT_PORTS_START( blockout )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW1:7" ) /* Listed as "Unused" */
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW1:8" ) /* Listed as "Unused" */
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
diff --git a/src/mame/drivers/bloodbro.c b/src/mame/drivers/bloodbro.c
index aa3e6bbc89c..2c26c9f6bc9 100644
--- a/src/mame/drivers/bloodbro.c
+++ b/src/mame/drivers/bloodbro.c
@@ -209,7 +209,7 @@ ADDRESS_MAP_END
PORT_DIPSETTING( 0x0000, "x2" )
static INPUT_PORTS_START( weststry )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
BLOODBRO_COINAGE
/* SW1:7,8 is listed as "ROM change option", "optional"
A B C D
@@ -253,7 +253,7 @@ static INPUT_PORTS_START( weststry )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x8000, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -271,7 +271,7 @@ static INPUT_PORTS_START( weststry )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) // "Dynamite"
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* tested - check code at 0x0005fe - VBLANK ? */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -298,7 +298,7 @@ static INPUT_PORTS_START( bloodbro )
INPUT_PORTS_END
static INPUT_PORTS_START( skysmash )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
BLOODBRO_COINAGE
PORT_DIPUNUSED_DIPLOC( 0x0040, IP_ACTIVE_LOW, "SW1:7" ) /* see notes */
PORT_DIPUNUSED_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" ) /* see notes */
@@ -324,7 +324,7 @@ static INPUT_PORTS_START( skysmash )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x8000, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -342,7 +342,7 @@ static INPUT_PORTS_START( skysmash )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x000e, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_START2 )
diff --git a/src/mame/drivers/blstroid.c b/src/mame/drivers/blstroid.c
index ee8c2c2c767..9008c09ee50 100644
--- a/src/mame/drivers/blstroid.c
+++ b/src/mame/drivers/blstroid.c
@@ -120,15 +120,15 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( blstroid )
- PORT_START_TAG("DIAL0") /* ff9800 */
+ PORT_START("DIAL0") /* ff9800 */
PORT_BIT( 0x00ff, 0, IPT_DIAL ) PORT_SENSITIVITY(60) PORT_KEYDELTA(10) PORT_PLAYER(1)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DIAL1") /* ff9804 */
+ PORT_START("DIAL1") /* ff9804 */
PORT_BIT( 0x00ff, 0, IPT_DIAL ) PORT_SENSITIVITY(60) PORT_KEYDELTA(10) PORT_PLAYER(2)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0") /* ff9c00 */
+ PORT_START("IN0") /* ff9c00 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -139,7 +139,7 @@ static INPUT_PORTS_START( blstroid )
PORT_SERVICE( 0x0080, IP_ACTIVE_LOW )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* ff9c02 */
+ PORT_START("IN1") /* ff9c02 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
diff --git a/src/mame/drivers/blueprnt.c b/src/mame/drivers/blueprnt.c
index c027c6230c8..9f9f4a96a56 100644
--- a/src/mame/drivers/blueprnt.c
+++ b/src/mame/drivers/blueprnt.c
@@ -126,7 +126,7 @@ ADDRESS_MAP_END
/* Input Ports */
static INPUT_PORTS_START( blueprnt )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_TILT )
@@ -136,7 +136,7 @@ static INPUT_PORTS_START( blueprnt )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_SERVICE( 0x04, IP_ACTIVE_HIGH )
@@ -146,7 +146,7 @@ static INPUT_PORTS_START( blueprnt )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("DILSW1")
+ PORT_START("DILSW1")
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "DILSW1:1" ) /* Listed as "Unused" */
PORT_DIPNAME( 0x06, 0x02, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("DILSW1:2,3")
PORT_DIPSETTING( 0x00, "20K" )
@@ -167,7 +167,7 @@ static INPUT_PORTS_START( blueprnt )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_5C ) )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "DILSW1:8" ) /* Listed as "Unused" */
- PORT_START_TAG("DILSW2")
+ PORT_START("DILSW2")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("DILSW2:1,2")
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "3" )
diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c
index 3393cdb842f..6e98f81b60c 100644
--- a/src/mame/drivers/bmcbowl.c
+++ b/src/mame/drivers/bmcbowl.c
@@ -360,7 +360,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( bmcbowl )
- PORT_START_TAG("IN0") /* DSW 1 */
+ PORT_START("IN0") /* DSW 1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Note")
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Analizer")
@@ -381,7 +381,7 @@ static INPUT_PORTS_START( bmcbowl )
PORT_BIT(0x4000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Big") PORT_CODE(KEYCODE_G)
PORT_BIT(0x8000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Double") PORT_CODE(KEYCODE_H)
- PORT_START_TAG("IN1") /* DSW 2 */
+ PORT_START("IN1") /* DSW 2 */
PORT_DIPNAME( 0x20, 0x20, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x20, "1 COIN 10 CREDITS" )
PORT_DIPSETTING( 0x00, "2 COINS 10 CREDITS" )
@@ -409,7 +409,7 @@ static INPUT_PORTS_START( bmcbowl )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2") /* DSW 4 */
+ PORT_START("IN2") /* DSW 4 */
PORT_DIPNAME( 0x01, 0x00, "DSW4 8" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -435,7 +435,7 @@ static INPUT_PORTS_START( bmcbowl )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(1)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c
index 53b07965144..a9b77e5dbec 100644
--- a/src/mame/drivers/bnstars.c
+++ b/src/mame/drivers/bnstars.c
@@ -533,7 +533,7 @@ static VIDEO_UPDATE(bnstars)
}
static INPUT_PORTS_START( bnstars )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_E )
@@ -615,7 +615,7 @@ static INPUT_PORTS_START( bnstars )
PORT_DIPSETTING( 0x80000000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x00000001, 0x00000001, "MAH2" )
PORT_DIPSETTING( 0x00000001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
@@ -703,7 +703,7 @@ static INPUT_PORTS_START( bnstars )
PORT_DIPSETTING( 0x80000000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x00000001, 0x00000001, "MAH4" )
PORT_DIPSETTING( 0x00000001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
@@ -791,7 +791,7 @@ static INPUT_PORTS_START( bnstars )
PORT_DIPSETTING( 0x80000000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_DIPNAME( 0x00000001, 0x00000001, "MAH6" )
PORT_DIPSETTING( 0x00000001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
@@ -881,7 +881,7 @@ static INPUT_PORTS_START( bnstars )
PORT_DIPSETTING( 0x80000000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_START2 )
/* The follow 4 bits active 4 button each one for the second player */
PORT_DIPNAME( 0x00000002, 0x00000002, "P2: A,B,C,D" )
@@ -974,7 +974,7 @@ static INPUT_PORTS_START( bnstars )
PORT_DIPSETTING( 0x80000000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
- PORT_START_TAG("IN5")
+ PORT_START("IN5")
PORT_DIPNAME( 0x00000001, 0x00000001, "Test Mode" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x00000001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
@@ -1073,7 +1073,7 @@ static INPUT_PORTS_START( bnstars )
PORT_DIPSETTING( 0x80000000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
- PORT_START_TAG("IN6")
+ PORT_START("IN6")
PORT_DIPNAME( 0x00000001, 0x00000001, "4" )
PORT_DIPSETTING( 0x00000001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
diff --git a/src/mame/drivers/bogeyman.c b/src/mame/drivers/bogeyman.c
index 30c408aa20b..0ca729cf9c0 100644
--- a/src/mame/drivers/bogeyman.c
+++ b/src/mame/drivers/bogeyman.c
@@ -88,7 +88,7 @@ ADDRESS_MAP_END
/* Input Ports */
static INPUT_PORTS_START( bogeyman )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -98,7 +98,7 @@ static INPUT_PORTS_START( bogeyman )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -108,7 +108,7 @@ static INPUT_PORTS_START( bogeyman )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -130,7 +130,7 @@ static INPUT_PORTS_START( bogeyman )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
diff --git a/src/mame/drivers/bombjack.c b/src/mame/drivers/bombjack.c
index 39001e79d99..265d1a67e5b 100644
--- a/src/mame/drivers/bombjack.c
+++ b/src/mame/drivers/bombjack.c
@@ -177,7 +177,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( bombjack )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -187,7 +187,7 @@ static INPUT_PORTS_START( bombjack )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -197,14 +197,14 @@ static INPUT_PORTS_START( bombjack )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:!1,!2")
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) )
@@ -227,7 +227,7 @@ static INPUT_PORTS_START( bombjack )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
/* Manual states DSW2 bits 0-2 are unused and have to be left on OFF (0x00) */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:!1,!2,!3") /* see notes */
PORT_DIPSETTING( 0x02, "Every 30k" )
diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c
index 406d2006e2e..467670d2a22 100644
--- a/src/mame/drivers/boogwing.c
+++ b/src/mame/drivers/boogwing.c
@@ -145,13 +145,13 @@ ADDRESS_MAP_END
/**********************************************************************************/
static INPUT_PORTS_START( boogwing )
- PORT_START_TAG("SYSTEM") /* 16bit */
+ PORT_START("SYSTEM") /* 16bit */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW") /* 16bit */
+ PORT_START("DSW") /* 16bit */
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) )
@@ -199,7 +199,7 @@ static INPUT_PORTS_START( boogwing )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("INPUTS") /* 16bit */
+ PORT_START("INPUTS") /* 16bit */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c
index 89df1215410..e04f1596e74 100644
--- a/src/mame/drivers/bottom9.c
+++ b/src/mame/drivers/bottom9.c
@@ -162,7 +162,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( bottom9 )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -172,7 +172,7 @@ static INPUT_PORTS_START( bottom9 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -182,7 +182,7 @@ static INPUT_PORTS_START( bottom9 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -218,7 +218,7 @@ static INPUT_PORTS_START( bottom9 )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x07, 0x04, "Play Time" ) PORT_DIPLOCATION("SW2:1,2,3")
PORT_DIPSETTING( 0x07, "1'00" )
PORT_DIPSETTING( 0x06, "1'10" )
@@ -242,7 +242,7 @@ static INPUT_PORTS_START( bottom9 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c
index 436342b0670..bcf52d15e33 100644
--- a/src/mame/drivers/boxer.c
+++ b/src/mame/drivers/boxer.c
@@ -196,7 +196,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( boxer )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT ( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED ) /* TIMER */
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_TILT )
@@ -206,39 +206,39 @@ static INPUT_PORTS_START( boxer )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x01, "Number of Rounds" )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "4" )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x03, DEF_STR( Free_Play ) )
- PORT_START_TAG("STICK0_X")
+ PORT_START("STICK0_X")
PORT_BIT ( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0x20,0xe0) PORT_SENSITIVITY(30) PORT_KEYDELTA(16) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("STICK0_Y")
+ PORT_START("STICK0_Y")
PORT_BIT ( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(0x20,0xe0) PORT_SENSITIVITY(30) PORT_KEYDELTA(16) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("PADDLE0")
+ PORT_START("PADDLE0")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x20,0xe0) PORT_SENSITIVITY(30) PORT_KEYDELTA(16) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X) PORT_CENTERDELTA(0) PORT_PLAYER(1)
- PORT_START_TAG("STICK1_X")
+ PORT_START("STICK1_X")
PORT_BIT ( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0x20,0xe0) PORT_SENSITIVITY(30) PORT_KEYDELTA(16) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("STICK1_Y")
+ PORT_START("STICK1_Y")
PORT_BIT ( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(0x20,0xe0) PORT_SENSITIVITY(30) PORT_KEYDELTA(16) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("PADDLE1")
+ PORT_START("PADDLE1")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x20,0xe0) PORT_SENSITIVITY(30) PORT_KEYDELTA(16) PORT_CODE_DEC(KEYCODE_Q) PORT_CODE_INC(KEYCODE_W) PORT_CENTERDELTA(0) PORT_PLAYER(2)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_DIPNAME( 0xff, 0x5C, "Round Time" ) /* actually a potentiometer */
PORT_DIPSETTING( 0x3C, "15 seconds" )
PORT_DIPSETTING( 0x5C, "30 seconds" )
diff --git a/src/mame/drivers/brkthru.c b/src/mame/drivers/brkthru.c
index 4621ba19510..95b299407da 100644
--- a/src/mame/drivers/brkthru.c
+++ b/src/mame/drivers/brkthru.c
@@ -150,7 +150,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( brkthru )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -160,7 +160,7 @@ static INPUT_PORTS_START( brkthru )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -170,7 +170,7 @@ static INPUT_PORTS_START( brkthru )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK ) /* used only by the self test */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -194,7 +194,7 @@ static INPUT_PORTS_START( brkthru )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2/COIN")
+ PORT_START("DSW2/COIN")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x02, "2" )
PORT_DIPSETTING( 0x03, "3" )
diff --git a/src/mame/drivers/bsktball.c b/src/mame/drivers/bsktball.c
index b51c6aeea07..ccb3b85c787 100644
--- a/src/mame/drivers/bsktball.c
+++ b/src/mame/drivers/bsktball.c
@@ -104,19 +104,19 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( bsktball )
- PORT_START_TAG("TRACK0_X")
+ PORT_START("TRACK0_X")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) /* Sensitivity, clip, min, max */
- PORT_START_TAG("TRACK0_Y")
+ PORT_START("TRACK0_Y")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START_TAG("TRACK1_X")
+ PORT_START("TRACK1_X")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2) /* Sensitivity, clip, min, max */
- PORT_START_TAG("TRACK1_Y")
+ PORT_START("TRACK1_Y")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -127,7 +127,7 @@ static INPUT_PORTS_START( bsktball )
/* 0x40 - DR2 = PL1 H DIR */
/* 0x80 - DR3 = PL1 V DIR */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* SPARE */
@@ -137,7 +137,7 @@ static INPUT_PORTS_START( bsktball )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) /* COIN 1 */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) /* COIN 2 */
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x07, 0x00, "Play Time per Credit" ) PORT_DIPLOCATION("SW:1,2,3")
PORT_DIPSETTING( 0x07, DEF_STR( Free_Play ) )
PORT_DIPSETTING( 0x06, "2:30" )
diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c
index e2df7f2ec54..72738240065 100644
--- a/src/mame/drivers/btime.c
+++ b/src/mame/drivers/btime.c
@@ -374,7 +374,7 @@ static WRITE8_HANDLER( audio_command_w )
static INPUT_PORTS_START( btime )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -384,7 +384,7 @@ static INPUT_PORTS_START( btime )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
@@ -394,7 +394,7 @@ static INPUT_PORTS_START( btime )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT )
@@ -404,7 +404,7 @@ static INPUT_PORTS_START( btime )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED(coin_inserted_irq_hi, 0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_CHANGED(coin_inserted_irq_hi, 0)
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("15D:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -433,7 +433,7 @@ static INPUT_PORTS_START( btime )
// PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("14D:1")
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
@@ -454,7 +454,7 @@ static INPUT_PORTS_START( btime )
INPUT_PORTS_END
static INPUT_PORTS_START( cookrace )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -464,7 +464,7 @@ static INPUT_PORTS_START( cookrace )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
@@ -474,7 +474,7 @@ static INPUT_PORTS_START( cookrace )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -484,7 +484,7 @@ static INPUT_PORTS_START( cookrace )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED(coin_inserted_nmi_lo, 0)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted_nmi_lo, 0)
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -506,7 +506,7 @@ static INPUT_PORTS_START( cookrace )
PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
@@ -532,7 +532,7 @@ static INPUT_PORTS_START( cookrace )
INPUT_PORTS_END
static INPUT_PORTS_START( zoar )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -541,7 +541,7 @@ static INPUT_PORTS_START( zoar )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -550,7 +550,7 @@ static INPUT_PORTS_START( zoar )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 )
@@ -560,7 +560,7 @@ static INPUT_PORTS_START( zoar )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted_irq_lo, 0)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED(coin_inserted_irq_lo, 0)
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW I:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -583,7 +583,7 @@ static INPUT_PORTS_START( zoar )
// PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW II:1")
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
@@ -610,7 +610,7 @@ static INPUT_PORTS_START( zoar )
INPUT_PORTS_END
static INPUT_PORTS_START( lnc )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -620,7 +620,7 @@ static INPUT_PORTS_START( lnc )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
@@ -630,13 +630,13 @@ static INPUT_PORTS_START( lnc )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted_nmi_lo, 0)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED(coin_inserted_nmi_lo, 0)
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -660,7 +660,7 @@ static INPUT_PORTS_START( lnc )
// PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
@@ -679,7 +679,7 @@ static INPUT_PORTS_START( lnc )
INPUT_PORTS_END
static INPUT_PORTS_START( wtennis )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -687,7 +687,7 @@ static INPUT_PORTS_START( wtennis )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -695,13 +695,13 @@ static INPUT_PORTS_START( wtennis )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted_nmi_lo, 0)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED(coin_inserted_nmi_lo, 0)
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -723,7 +723,7 @@ static INPUT_PORTS_START( wtennis )
PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "2" )
PORT_DIPSETTING( 0x00, "3" )
@@ -750,7 +750,7 @@ static INPUT_PORTS_START( wtennis )
INPUT_PORTS_END
static INPUT_PORTS_START( mmonkey )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -760,7 +760,7 @@ static INPUT_PORTS_START( mmonkey )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
@@ -770,13 +770,13 @@ static INPUT_PORTS_START( mmonkey )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted_nmi_lo, 0)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED(coin_inserted_nmi_lo, 0)
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -799,7 +799,7 @@ static INPUT_PORTS_START( mmonkey )
// PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
@@ -819,7 +819,7 @@ static INPUT_PORTS_START( mmonkey )
INPUT_PORTS_END
static INPUT_PORTS_START( bnj )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -829,7 +829,7 @@ static INPUT_PORTS_START( bnj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -839,7 +839,7 @@ static INPUT_PORTS_START( bnj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -849,7 +849,7 @@ static INPUT_PORTS_START( bnj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted_nmi_lo, 0)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED(coin_inserted_nmi_lo, 0)
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("8D:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -877,7 +877,7 @@ static INPUT_PORTS_START( bnj )
// PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("7D:1")
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
@@ -898,7 +898,7 @@ static INPUT_PORTS_START( bnj )
INPUT_PORTS_END
static INPUT_PORTS_START( disco )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -907,7 +907,7 @@ static INPUT_PORTS_START( disco )
PORT_BIT( 0x60, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
@@ -916,12 +916,12 @@ static INPUT_PORTS_START( disco )
PORT_BIT( 0x60, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x1f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_HIGH,IPT_COIN1 ) PORT_CHANGED(coin_inserted_irq_hi, 0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH,IPT_COIN2 ) PORT_CHANGED(coin_inserted_irq_hi, 0)
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -941,7 +941,7 @@ static INPUT_PORTS_START( disco )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "5" )
@@ -964,13 +964,13 @@ static INPUT_PORTS_START( disco )
PORT_DIPSETTING( 0x80, "E" )
PORT_DIPSETTING( 0xa0, "F" )
- PORT_START_TAG("VBLANK")
+ PORT_START("VBLANK")
PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
INPUT_PORTS_END
static INPUT_PORTS_START( sdtennis )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -980,7 +980,7 @@ static INPUT_PORTS_START( sdtennis )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -990,7 +990,7 @@ static INPUT_PORTS_START( sdtennis )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1000,7 +1000,7 @@ static INPUT_PORTS_START( sdtennis )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted_nmi_lo, 0)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED(coin_inserted_nmi_lo, 0)
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -1020,7 +1020,7 @@ static INPUT_PORTS_START( sdtennis )
PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x01, "2" )
diff --git a/src/mame/drivers/btoads.c b/src/mame/drivers/btoads.c
index a047450503c..862911fd663 100644
--- a/src/mame/drivers/btoads.c
+++ b/src/mame/drivers/btoads.c
@@ -241,7 +241,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( btoads )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -252,7 +252,7 @@ static INPUT_PORTS_START( btoads )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
@@ -263,7 +263,7 @@ static INPUT_PORTS_START( btoads )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3)
@@ -274,14 +274,14 @@ static INPUT_PORTS_START( btoads )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("UNK")
+ PORT_START("UNK")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SPECIAL")
+ PORT_START("SPECIAL")
PORT_SERVICE_NO_TOGGLE( 0x0002, IP_ACTIVE_LOW )
PORT_BIT( 0xfffd, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SW1")
+ PORT_START("SW1")
PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds )) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c
index 8496dd8c414..90e8d1488f2 100644
--- a/src/mame/drivers/bublbobl.c
+++ b/src/mame/drivers/bublbobl.c
@@ -405,7 +405,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( bublbobl )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -415,7 +415,7 @@ static INPUT_PORTS_START( bublbobl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SPECIAL ) // output: trigger IRQ on main CPU (jumper switchable to vblank)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) // output: select read or write shared RAM
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x05, 0x04, "Mode" ) PORT_DIPLOCATION("DSW-A:1,3")
PORT_DIPSETTING( 0x04, "Game, English" )
PORT_DIPSETTING( 0x05, "Game, Japanese" )
@@ -438,7 +438,7 @@ static INPUT_PORTS_START( bublbobl )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("DSW-B:1,2")
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -462,7 +462,7 @@ static INPUT_PORTS_START( bublbobl )
PORT_DIPSETTING( 0x80, "IC52=512kb, IC53=none" ) // will hang on startup if set to wrong type
PORT_DIPSETTING( 0x00, "IC52=256kb, IC53=256kb" )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -472,7 +472,7 @@ static INPUT_PORTS_START( bublbobl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -484,7 +484,7 @@ static INPUT_PORTS_START( bublbobl )
INPUT_PORTS_END
static INPUT_PORTS_START( boblbobl )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x05, 0x04, "Mode" )
PORT_DIPSETTING( 0x04, "Game, English" )
PORT_DIPSETTING( 0x05, "Game, Japanese" )
@@ -507,7 +507,7 @@ static INPUT_PORTS_START( boblbobl )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -530,7 +530,7 @@ static INPUT_PORTS_START( boblbobl )
PORT_DIPSETTING( 0x80, DEF_STR( High ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Very_High ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(1)
@@ -540,7 +540,7 @@ static INPUT_PORTS_START( boblbobl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT ) // ???
@@ -569,7 +569,7 @@ static INPUT_PORTS_START( sboblbob )
INPUT_PORTS_END
static INPUT_PORTS_START( tokio )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW A:1")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -591,7 +591,7 @@ static INPUT_PORTS_START( tokio )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, "Enemies" ) PORT_DIPLOCATION("SW B:1")
PORT_DIPSETTING( 0x01, "Few (Easy)" )
PORT_DIPSETTING( 0x00, "Many (Hard)" )
@@ -613,7 +613,7 @@ static INPUT_PORTS_START( tokio )
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
PORT_DIPSETTING( 0x80, DEF_STR( Japanese ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
@@ -623,7 +623,7 @@ static INPUT_PORTS_START( tokio )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -633,7 +633,7 @@ static INPUT_PORTS_START( tokio )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c
index 9437e87b23d..bc271e8a519 100644
--- a/src/mame/drivers/buggychl.c
+++ b/src/mame/drivers/buggychl.c
@@ -226,7 +226,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( buggychl )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Game Over Bonus" ) PORT_DIPLOCATION("SW1:1,2") /* Arks/Flags/Fuel */
PORT_DIPSETTING( 0x03, "2000/1000/50" )
PORT_DIPSETTING( 0x02, "1000/500/30" )
@@ -246,7 +246,7 @@ static INPUT_PORTS_START( buggychl )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Only listed as OFF in the manual */
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3,4")
PORT_DIPSETTING( 0x0f, DEF_STR( 9C_1C ) )
PORT_DIPSETTING( 0x0e, DEF_STR( 8C_1C ) )
@@ -282,7 +282,7 @@ static INPUT_PORTS_START( buggychl )
PORT_DIPSETTING( 0x60, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x70, DEF_STR( 1C_8C ) )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, "Start button needed" ) PORT_DIPLOCATION("SW3:1")
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x01, DEF_STR( Yes ) )
@@ -304,7 +304,7 @@ static INPUT_PORTS_START( buggychl )
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x80, "2" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -314,14 +314,14 @@ static INPUT_PORTS_START( buggychl )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_TILT )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_BUTTON1 ) /* accelerator */
- PORT_START_TAG("WHEEL") /* wheel */
+ PORT_START("WHEEL") /* wheel */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15) PORT_REVERSE
INPUT_PORTS_END
diff --git a/src/mame/drivers/bwidow.c b/src/mame/drivers/bwidow.c
index f392c2189f0..1f580c3e785 100644
--- a/src/mame/drivers/bwidow.c
+++ b/src/mame/drivers/bwidow.c
@@ -389,7 +389,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( bwidow )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 ) // To fit "Coin B" Dip Switch
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 ) // To fit "Coin A" Dip Switch
PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -401,7 +401,7 @@ static INPUT_PORTS_START( bwidow )
/* bit 7 is tied to a 3kHz clock */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME(0x03, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("D4:!7,!8")
PORT_DIPSETTING ( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING ( 0x00, DEF_STR( 1C_1C ) )
@@ -423,7 +423,7 @@ static INPUT_PORTS_START( bwidow )
PORT_DIPSETTING ( 0x20, "1 each 2" )
PORT_DIPSETTING ( 0x00, DEF_STR( None ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME(0x03, 0x01, "Max Start" ) PORT_DIPLOCATION("B4:!7,!8")
PORT_DIPSETTING ( 0x00, "Lev 13" )
PORT_DIPSETTING ( 0x01, "Lev 21" )
@@ -445,7 +445,7 @@ static INPUT_PORTS_START( bwidow )
PORT_DIPSETTING ( 0x80, "40000" )
PORT_DIPSETTING ( 0xc0, DEF_STR( None ) )
- PORT_START_TAG("IN3") /* IN3 - Movement joystick */
+ PORT_START("IN3") /* IN3 - Movement joystick */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_8WAY
@@ -455,7 +455,7 @@ static INPUT_PORTS_START( bwidow )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN4") /* IN4 - Firing joystick */
+ PORT_START("IN4") /* IN4 - Firing joystick */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_8WAY
@@ -468,7 +468,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( gravitar )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 ) // To fit "Coin B" Dip Switch
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 ) // To fit "Coin A" Dip Switch
PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -480,7 +480,7 @@ static INPUT_PORTS_START( gravitar )
/* bit 7 is tied to a 3kHz clock */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_UNUSED ) // D4:!7,!8
PORT_DIPNAME(0x0c, 0x04, DEF_STR( Lives ) ) PORT_DIPLOCATION("D4:!5,!6")
PORT_DIPSETTING ( 0x00, "3" )
@@ -497,7 +497,7 @@ static INPUT_PORTS_START( gravitar )
PORT_DIPSETTING ( 0x80, "30000" )
PORT_DIPSETTING ( 0xc0, DEF_STR( None ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME(0x03, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("B4:!7,!8")
PORT_DIPSETTING ( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING ( 0x00, DEF_STR( 1C_1C ) )
@@ -519,7 +519,7 @@ static INPUT_PORTS_START( gravitar )
PORT_DIPSETTING ( 0x20, "1 each 2" )
PORT_DIPSETTING ( 0x00, DEF_STR( None ) )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
@@ -529,7 +529,7 @@ static INPUT_PORTS_START( gravitar )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -542,7 +542,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( lunarbat )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 ) // To be similar with other games
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 ) // To be similar with other games
PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -554,13 +554,13 @@ static INPUT_PORTS_START( lunarbat )
/* bit 7 is tied to a 3kHz clock */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL )
- PORT_START_TAG("DSW0") /* DSW0 - Not read */
+ PORT_START("DSW0") /* DSW0 - Not read */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1") /* DSW1 - Not read */
+ PORT_START("DSW1") /* DSW1 - Not read */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 )
@@ -570,13 +570,13 @@ static INPUT_PORTS_START( lunarbat )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN4") /* IN4 - Not read */
+ PORT_START("IN4") /* IN4 - Not read */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( spacduel )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 ) // To fit "Coin B" Dip Switch
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 ) // To fit "Coin A" Dip Switch
PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -588,7 +588,7 @@ static INPUT_PORTS_START( spacduel )
/* bit 7 is tied to a 3kHz clock */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME(0x03, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("D4:!7,!8")
PORT_DIPSETTING ( 0x01, "3" )
PORT_DIPSETTING ( 0x00, "4" )
@@ -610,7 +610,7 @@ static INPUT_PORTS_START( spacduel )
PORT_DIPSETTING ( 0x40, "15000" )
PORT_DIPSETTING ( 0x80, DEF_STR( None ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME(0x03, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("B4:!7,!8")
PORT_DIPSETTING ( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING ( 0x00, DEF_STR( 1C_1C ) )
@@ -633,7 +633,7 @@ static INPUT_PORTS_START( spacduel )
PORT_DIPSETTING ( 0x00, DEF_STR( None ) )
/* See machine/spacduel.c for more info on these 2 ports */
- PORT_START_TAG("IN3") /* IN3 - Player 1 - spread over 8 memory locations */
+ PORT_START("IN3") /* IN3 - Player 1 - spread over 8 memory locations */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
@@ -643,7 +643,7 @@ static INPUT_PORTS_START( spacduel )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 ) PORT_NAME("Select")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN4") /* IN4 - Player 2 - spread over 8 memory locations */
+ PORT_START("IN4") /* IN4 - Player 2 - spread over 8 memory locations */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
diff --git a/src/mame/drivers/bwing.c b/src/mame/drivers/bwing.c
index 29eccfe83f1..1beeb464f8d 100644
--- a/src/mame/drivers/bwing.c
+++ b/src/mame/drivers/bwing.c
@@ -247,7 +247,7 @@ ADDRESS_MAP_END
// I/O Port Maps
static INPUT_PORTS_START( bwing )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -271,7 +271,7 @@ static INPUT_PORTS_START( bwing )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "5" )
PORT_DIPSETTING( 0x01, "3" )
@@ -296,7 +296,7 @@ static INPUT_PORTS_START( bwing )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -306,7 +306,7 @@ static INPUT_PORTS_START( bwing )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -316,7 +316,7 @@ static INPUT_PORTS_START( bwing )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -326,13 +326,13 @@ static INPUT_PORTS_START( bwing )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_TILT )
- PORT_START_TAG("VBLANK")
+ PORT_START("VBLANK")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("EXTRA") // a matter of taste
+ PORT_START("EXTRA") // a matter of taste
PORT_DIPNAME( 0x07, 0x00, "RGB" )
PORT_DIPSETTING( 0x00, "Default" )
PORT_DIPSETTING( 0x01, "More Red" )
diff --git a/src/mame/drivers/bzone.c b/src/mame/drivers/bzone.c
index 44af2179836..7f5d6f44f5c 100644
--- a/src/mame/drivers/bzone.c
+++ b/src/mame/drivers/bzone.c
@@ -368,7 +368,7 @@ ADDRESS_MAP_END
*************************************/
#define BZONEIN0\
- PORT_START_TAG("IN0")\
+ PORT_START("IN0")\
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )\
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )\
PORT_BIT ( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED )\
@@ -384,7 +384,7 @@ ADDRESS_MAP_END
#define BZONEDSW0\
- PORT_START_TAG("DSW0")\
+ PORT_START("DSW0")\
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("M10:1,2")\
PORT_DIPSETTING( 0x00, "2" )\
PORT_DIPSETTING( 0x01, "3" )\
@@ -407,7 +407,7 @@ ADDRESS_MAP_END
PORT_DIPSETTING( 0xc0, DEF_STR( Spanish ))
#define BZONEDSW1\
- PORT_START_TAG("DSW1")\
+ PORT_START("DSW1")\
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) ) PORT_DIPLOCATION("P10:1,2")\
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )\
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) )\
@@ -433,7 +433,7 @@ static INPUT_PORTS_START( bzone )
BZONEDSW0
BZONEDSW1
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_DOWN ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_UP ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_DOWN ) PORT_2WAY
@@ -448,12 +448,12 @@ INPUT_PORTS_END
static INPUT_PORTS_START( redbaron )
BZONEIN0
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
/* See the table above if you are really interested */
PORT_DIPNAME( 0xff, 0xfd, DEF_STR( Coinage ) ) PORT_DIPLOCATION("M10:1,2,3,4,5,6,7,8")
PORT_DIPSETTING( 0xfd, DEF_STR( Normal ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Language ) ) PORT_DIPLOCATION("P10:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( German ) )
PORT_DIPSETTING( 0x01, DEF_STR( French ) )
@@ -479,23 +479,23 @@ static INPUT_PORTS_START( redbaron )
/* IN3 - the real machine reads either the X or Y axis from this port */
/* Instead, we use the two fake 5 & 6 ports and bank-switch the proper */
/* value based on the lsb of the byte written to the sound port */
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY
- PORT_START_TAG("IN4") /* Misc controls */
+ PORT_START("IN4") /* Misc controls */
PORT_BIT( 0x3f, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 )
/* These 2 are fake - they are bank-switched from reads to IN3 */
/* Red Baron doesn't seem to use the full 0-255 range. */
- PORT_START_TAG("FAKE1") /* IN5 */
+ PORT_START("FAKE1") /* IN5 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(64,192) PORT_SENSITIVITY(25) PORT_KEYDELTA(10)
- PORT_START_TAG("FAKE2") /* IN6 */
+ PORT_START("FAKE2") /* IN6 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(64,192) PORT_SENSITIVITY(25) PORT_KEYDELTA(10)
INPUT_PORTS_END
@@ -505,12 +505,12 @@ static INPUT_PORTS_START( bradley )
BZONEDSW0
BZONEDSW1
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x1f, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("1808")
+ PORT_START("1808")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Armor Piercing (Single Shot)") PORT_CODE(KEYCODE_A)
@@ -520,20 +520,20 @@ static INPUT_PORTS_START( bradley )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Armor Piercing (High Rate)") PORT_CODE(KEYCODE_D)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("High Explosive (High Rate)") PORT_CODE(KEYCODE_C)
- PORT_START_TAG("1809")
+ PORT_START("1809")
PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_NAME("Select TOW Missiles") PORT_CODE(KEYCODE_T)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_NAME("7.62 mm Machine Gun") PORT_CODE(KEYCODE_V)
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON10 ) PORT_NAME("Magnification Toggle") PORT_CODE(KEYCODE_M) PORT_TOGGLE
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("AN0") /* analog 0 = turret rotation */
+ PORT_START("AN0") /* analog 0 = turret rotation */
PORT_BIT( 0xff, 0x88, IPT_AD_STICK_X ) PORT_MINMAX(0x48,0xc8) PORT_SENSITIVITY(25) PORT_KEYDELTA(10)
- PORT_START_TAG("AN1") /* analog 1 = turret elevation */
+ PORT_START("AN1") /* analog 1 = turret elevation */
PORT_BIT( 0xff, 0x86, IPT_AD_STICK_Y ) PORT_MINMAX(0x46,0xc6) PORT_SENSITIVITY(25) PORT_KEYDELTA(10)
- PORT_START_TAG("AN2") /* analog 2 = shell firing range hack removed, now uses Z */
+ PORT_START("AN2") /* analog 2 = shell firing range hack removed, now uses Z */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Z ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_REVERSE
INPUT_PORTS_END
diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c
index 2bef8213b13..a2ec54de748 100644
--- a/src/mame/drivers/cabal.c
+++ b/src/mame/drivers/cabal.c
@@ -260,7 +260,7 @@ ADDRESS_MAP_END
/***************************************************************************/
static INPUT_PORTS_START( common )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3,4") PORT_CONDITION("DSW", 0x0010, PORTCOND_NOTEQUALS, 0x00)
PORT_DIPSETTING( 0x000a, DEF_STR( 6C_1C ) )
PORT_DIPSETTING( 0x000b, DEF_STR( 5C_1C ) )
@@ -320,7 +320,7 @@ static INPUT_PORTS_START( common )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x8000, DEF_STR( On ) )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(4) /* read through sound cpu */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(4) /* read through sound cpu */
INPUT_PORTS_END
@@ -328,7 +328,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( cabalt )
PORT_INCLUDE( common )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
@@ -339,16 +339,16 @@ static INPUT_PORTS_START( cabalt )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0fff, 0x0000, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_PLAYER(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0fff, 0x0000, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0fff, 0x0000, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_PLAYER(2)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x0fff, 0x0000, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_PLAYER(2)
INPUT_PORTS_END
@@ -366,7 +366,7 @@ static INPUT_PORTS_START( cabalj )
manufacturer had to use pin 15 which is usually the test / service
button
*/
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
@@ -379,13 +379,13 @@ static INPUT_PORTS_START( cabalj )
/* The joystick version has a PCB marked "Joystick sub" containing a 74ls245. It plugs in the
sockets of the two D4701AC */
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -395,14 +395,14 @@ static INPUT_PORTS_START( cabalj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( cabalbl )
PORT_INCLUDE( common )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
@@ -414,7 +414,7 @@ static INPUT_PORTS_START( cabalbl )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("JOY")
+ PORT_START("JOY")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
diff --git a/src/mame/drivers/calomega.c b/src/mame/drivers/calomega.c
index f1b6c2eb064..e127eb5a10c 100644
--- a/src/mame/drivers/calomega.c
+++ b/src/mame/drivers/calomega.c
@@ -802,7 +802,7 @@ ADDRESS_MAP_END
*************************/
static INPUT_PORTS_START( stand903 )
- PORT_START_TAG("IN0-0")
+ PORT_START("IN0-0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("0-1") PORT_CODE(KEYCODE_1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("0-2") PORT_CODE(KEYCODE_2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("0-3") PORT_CODE(KEYCODE_3)
@@ -812,7 +812,7 @@ static INPUT_PORTS_START( stand903 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* connected to SW2-5 */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-1")
+ PORT_START("IN0-1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("1-1") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("1-2") PORT_CODE(KEYCODE_W)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("1-3") PORT_CODE(KEYCODE_E)
@@ -822,7 +822,7 @@ static INPUT_PORTS_START( stand903 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* connected to SW2-5 */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-2")
+ PORT_START("IN0-2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("2-1") PORT_CODE(KEYCODE_A)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("2-2") PORT_CODE(KEYCODE_S)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("2-3") PORT_CODE(KEYCODE_D)
@@ -832,7 +832,7 @@ static INPUT_PORTS_START( stand903 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* connected to SW2-5 */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-3")
+ PORT_START("IN0-3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("3-1") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("3-2") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("3-3") PORT_CODE(KEYCODE_C)
@@ -846,7 +846,7 @@ static INPUT_PORTS_START( stand903 )
SW1-6 should be wired to H-POL.
SW1-7 should be wired to V-POL.
*/
- PORT_START_TAG("SW1") /* settings (PIA1), SW2 in schematics */
+ PORT_START("SW1") /* settings (PIA1), SW2 in schematics */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* L6 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* L7 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* L8 */
@@ -864,7 +864,7 @@ static INPUT_PORTS_START( stand903 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SW2") /* baud (serial 6850-4024), SW1 in schematics */
+ PORT_START("SW2") /* baud (serial 6850-4024), SW1 in schematics */
PORT_DIPNAME( 0x3f, 0x08, "Baud Rate" ) PORT_DIPLOCATION("SW1:1,2,3,4,5,6")
PORT_DIPSETTING( 0x01, "300" )
PORT_DIPSETTING( 0x02, "600" )
@@ -879,7 +879,7 @@ static INPUT_PORTS_START( stand903 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SW3") /* unknown (ay8912), SW3 in schematics */
+ PORT_START("SW3") /* unknown (ay8912), SW3 in schematics */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -907,7 +907,7 @@ static INPUT_PORTS_START( stand903 )
INPUT_PORTS_END
static INPUT_PORTS_START( stand904 )
- PORT_START_TAG("IN0-0")
+ PORT_START("IN0-0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("0-1") PORT_CODE(KEYCODE_1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("0-2") PORT_CODE(KEYCODE_2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("0-3") PORT_CODE(KEYCODE_3)
@@ -917,7 +917,7 @@ static INPUT_PORTS_START( stand904 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* connected to SW2-5 */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-1")
+ PORT_START("IN0-1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("1-1") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("1-2") PORT_CODE(KEYCODE_W)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("1-3") PORT_CODE(KEYCODE_E)
@@ -927,7 +927,7 @@ static INPUT_PORTS_START( stand904 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* connected to SW2-5 */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-2")
+ PORT_START("IN0-2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("2-1") PORT_CODE(KEYCODE_A)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("2-2") PORT_CODE(KEYCODE_S)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("2-3") PORT_CODE(KEYCODE_D)
@@ -937,7 +937,7 @@ static INPUT_PORTS_START( stand904 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* connected to SW2-5 */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-3")
+ PORT_START("IN0-3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("3-1") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("3-2") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("3-3") PORT_CODE(KEYCODE_C)
@@ -951,7 +951,7 @@ static INPUT_PORTS_START( stand904 )
SW1-6 should be wired to H-POL.
SW1-7 should be wired to V-POL.
*/
- PORT_START_TAG("SW1") /* settings (PIA1), SW2 in schematics */
+ PORT_START("SW1") /* settings (PIA1), SW2 in schematics */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* L6 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* L7 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* L8 */
@@ -969,7 +969,7 @@ static INPUT_PORTS_START( stand904 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SW2") /* baud (serial 6850-4024), SW1 in schematics */
+ PORT_START("SW2") /* baud (serial 6850-4024), SW1 in schematics */
PORT_DIPNAME( 0x3f, 0x08, "Baud Rate" ) PORT_DIPLOCATION("SW1:1,2,3,4,5,6")
PORT_DIPSETTING( 0x01, "300" )
PORT_DIPSETTING( 0x02, "600" )
@@ -986,7 +986,7 @@ static INPUT_PORTS_START( stand904 )
INPUT_PORTS_END
static INPUT_PORTS_START( stand905 )
- PORT_START_TAG("IN0-0")
+ PORT_START("IN0-0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("0-1") PORT_CODE(KEYCODE_1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("0-2") PORT_CODE(KEYCODE_2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("0-3") PORT_CODE(KEYCODE_3)
@@ -996,7 +996,7 @@ static INPUT_PORTS_START( stand905 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-1")
+ PORT_START("IN0-1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("1-1") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("1-2") PORT_CODE(KEYCODE_W)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("1-3") PORT_CODE(KEYCODE_E)
@@ -1006,7 +1006,7 @@ static INPUT_PORTS_START( stand905 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-2")
+ PORT_START("IN0-2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("2-1") PORT_CODE(KEYCODE_A)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("2-2") PORT_CODE(KEYCODE_S)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("2-3") PORT_CODE(KEYCODE_D)
@@ -1016,7 +1016,7 @@ static INPUT_PORTS_START( stand905 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-3")
+ PORT_START("IN0-3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("3-1") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("3-2") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("3-3") PORT_CODE(KEYCODE_C)
@@ -1028,7 +1028,7 @@ static INPUT_PORTS_START( stand905 )
/* For System 905, SW1 uses the whole PIA1 portA */
- PORT_START_TAG("SW1") /* settings (PIA1) */
+ PORT_START("SW1") /* settings (PIA1) */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1056,7 +1056,7 @@ static INPUT_PORTS_START( stand905 )
INPUT_PORTS_END
static INPUT_PORTS_START( gdrawpkr )
- PORT_START_TAG("IN0-0")
+ PORT_START("IN0-0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) /* credits */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Collect") PORT_CODE(KEYCODE_I)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Double Up") PORT_CODE(KEYCODE_3)
@@ -1066,7 +1066,7 @@ static INPUT_PORTS_START( gdrawpkr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* connected to SW2-5 */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-1")
+ PORT_START("IN0-1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Payout") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Door Open") PORT_CODE(KEYCODE_D)
@@ -1076,7 +1076,7 @@ static INPUT_PORTS_START( gdrawpkr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* connected to SW2-5 */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-2")
+ PORT_START("IN0-2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_NAME("Discard 1") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_NAME("Discard 2") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON10 ) PORT_NAME("Discard 3") PORT_CODE(KEYCODE_C)
@@ -1086,7 +1086,7 @@ static INPUT_PORTS_START( gdrawpkr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* connected to SW2-5 */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-3")
+ PORT_START("IN0-3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Bet") PORT_CODE(KEYCODE_1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Take") PORT_CODE(KEYCODE_4)
@@ -1100,7 +1100,7 @@ static INPUT_PORTS_START( gdrawpkr )
SW1-6 should be wired to H-POL.
SW1-7 should be wired to V-POL.
*/
- PORT_START_TAG("SW1") /* settings (PIA1), SW2 in schematics */
+ PORT_START("SW1") /* settings (PIA1), SW2 in schematics */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* L6 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* L7 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* L8 */
@@ -1116,7 +1116,7 @@ static INPUT_PORTS_START( gdrawpkr )
PORT_DIPSETTING( 0x80, "40" )
PORT_DIPSETTING( 0xC0, "80" )
- PORT_START_TAG("SW2") /* baud (serial 6850-4024), SW1 in schematics */
+ PORT_START("SW2") /* baud (serial 6850-4024), SW1 in schematics */
PORT_DIPNAME( 0x3f, 0x08, "Baud Rate" ) PORT_DIPLOCATION("SW1:1,2,3,4,5,6")
PORT_DIPSETTING( 0x01, "300" )
PORT_DIPSETTING( 0x02, "600" )
@@ -1131,7 +1131,7 @@ static INPUT_PORTS_START( gdrawpkr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SW3") /* unknown (ay8912), SW3 in schematics */
+ PORT_START("SW3") /* unknown (ay8912), SW3 in schematics */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1159,7 +1159,7 @@ static INPUT_PORTS_START( gdrawpkr )
INPUT_PORTS_END
static INPUT_PORTS_START( comg076 )
- PORT_START_TAG("IN0-0")
+ PORT_START("IN0-0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) /* credits */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Double Up") PORT_CODE(KEYCODE_3)
@@ -1169,7 +1169,7 @@ static INPUT_PORTS_START( comg076 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-1")
+ PORT_START("IN0-1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 ) /* credits */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1179,7 +1179,7 @@ static INPUT_PORTS_START( comg076 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-2")
+ PORT_START("IN0-2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_NAME("Discard 1") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_NAME("Discard 2") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON10 ) PORT_NAME("Discard 3") PORT_CODE(KEYCODE_C)
@@ -1189,7 +1189,7 @@ static INPUT_PORTS_START( comg076 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-3")
+ PORT_START("IN0-3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Bet") PORT_CODE(KEYCODE_1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Take") PORT_CODE(KEYCODE_4)
@@ -1203,7 +1203,7 @@ static INPUT_PORTS_START( comg076 )
SW1-6 should be wired to H-POL.
SW1-7 should be wired to V-POL.
*/
- PORT_START_TAG("SW1") /* settings (PIA1), SW2 in schematics */
+ PORT_START("SW1") /* settings (PIA1), SW2 in schematics */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* L6 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* L7 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* L8 */
@@ -1219,7 +1219,7 @@ static INPUT_PORTS_START( comg076 )
PORT_DIPSETTING( 0xC0, "20" )
PORT_DIPSETTING( 0x40, "50" )
- PORT_START_TAG("SW2") /* baud (serial 6850-4024), SW1 in schematics */
+ PORT_START("SW2") /* baud (serial 6850-4024), SW1 in schematics */
PORT_DIPNAME( 0x3f, 0x08, "Baud Rate" ) PORT_DIPLOCATION("SW1:1,2,3,4,5,6")
PORT_DIPSETTING( 0x01, "300" )
PORT_DIPSETTING( 0x02, "600" )
@@ -1234,7 +1234,7 @@ static INPUT_PORTS_START( comg076 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SW3") /* unknown (ay8912), SW3 in schematics */
+ PORT_START("SW3") /* unknown (ay8912), SW3 in schematics */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1262,7 +1262,7 @@ static INPUT_PORTS_START( comg076 )
INPUT_PORTS_END
static INPUT_PORTS_START( comg128 )
- PORT_START_TAG("IN0-0")
+ PORT_START("IN0-0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) /* credits */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Double Up") PORT_CODE(KEYCODE_3)
@@ -1272,7 +1272,7 @@ static INPUT_PORTS_START( comg128 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-1")
+ PORT_START("IN0-1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Payout") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Door Open") PORT_CODE(KEYCODE_D)
@@ -1282,7 +1282,7 @@ static INPUT_PORTS_START( comg128 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-2")
+ PORT_START("IN0-2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_NAME("Discard 1") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_NAME("Discard 2") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON10 ) PORT_NAME("Discard 3") PORT_CODE(KEYCODE_C)
@@ -1292,7 +1292,7 @@ static INPUT_PORTS_START( comg128 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-3")
+ PORT_START("IN0-3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Bet") PORT_CODE(KEYCODE_1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Take") PORT_CODE(KEYCODE_4)
@@ -1306,7 +1306,7 @@ static INPUT_PORTS_START( comg128 )
SW1-6 should be wired to H-POL.
SW1-7 should be wired to V-POL.
*/
- PORT_START_TAG("SW1") /* settings (PIA1), SW2 in schematics */
+ PORT_START("SW1") /* settings (PIA1), SW2 in schematics */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* L6 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* L7 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* L8 */
@@ -1323,7 +1323,7 @@ static INPUT_PORTS_START( comg128 )
PORT_DIPSETTING( 0x80, "4" )
PORT_DIPSETTING( 0xC0, "5" )
- PORT_START_TAG("SW2") /* baud (serial 6850-4024), SW1 in schematics */
+ PORT_START("SW2") /* baud (serial 6850-4024), SW1 in schematics */
PORT_DIPNAME( 0x3f, 0x08, "Baud Rate" ) PORT_DIPLOCATION("SW1:1,2,3,4,5,6")
PORT_DIPSETTING( 0x01, "300" )
PORT_DIPSETTING( 0x02, "600" )
@@ -1338,7 +1338,7 @@ static INPUT_PORTS_START( comg128 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SW3") /* unknown (ay8912), SW3 in schematics */
+ PORT_START("SW3") /* unknown (ay8912), SW3 in schematics */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1366,7 +1366,7 @@ static INPUT_PORTS_START( comg128 )
INPUT_PORTS_END
static INPUT_PORTS_START( elgrande )
- PORT_START_TAG("IN0-0")
+ PORT_START("IN0-0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Double Up") PORT_CODE(KEYCODE_3)
@@ -1376,7 +1376,7 @@ static INPUT_PORTS_START( elgrande )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-1")
+ PORT_START("IN0-1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service") PORT_CODE(KEYCODE_8)
@@ -1386,7 +1386,7 @@ static INPUT_PORTS_START( elgrande )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-2")
+ PORT_START("IN0-2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_NAME("Hold 1") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_NAME("Hold 2") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON10 ) PORT_NAME("Hold 3") PORT_CODE(KEYCODE_C)
@@ -1396,7 +1396,7 @@ static INPUT_PORTS_START( elgrande )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-3")
+ PORT_START("IN0-3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Test Mode") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Bet") PORT_CODE(KEYCODE_1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Take") PORT_CODE(KEYCODE_4)
@@ -1406,7 +1406,7 @@ static INPUT_PORTS_START( elgrande )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SW1")
+ PORT_START("SW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1432,7 +1432,7 @@ static INPUT_PORTS_START( elgrande )
INPUT_PORTS_END
static INPUT_PORTS_START( jjpoker )
- PORT_START_TAG("IN0-0")
+ PORT_START("IN0-0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Double Up") PORT_CODE(KEYCODE_3)
@@ -1442,7 +1442,7 @@ static INPUT_PORTS_START( jjpoker )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-1")
+ PORT_START("IN0-1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service") PORT_CODE(KEYCODE_8)
@@ -1452,7 +1452,7 @@ static INPUT_PORTS_START( jjpoker )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-2")
+ PORT_START("IN0-2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_NAME("Discard 1") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_NAME("Discard 2") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON10 ) PORT_NAME("Discard 3") PORT_CODE(KEYCODE_C)
@@ -1462,7 +1462,7 @@ static INPUT_PORTS_START( jjpoker )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-3")
+ PORT_START("IN0-3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Test Mode") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Bet") PORT_CODE(KEYCODE_1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Take") PORT_CODE(KEYCODE_4)
@@ -1472,7 +1472,7 @@ static INPUT_PORTS_START( jjpoker )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SW1")
+ PORT_START("SW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1498,7 +1498,7 @@ static INPUT_PORTS_START( jjpoker )
INPUT_PORTS_END
static INPUT_PORTS_START( ssipkr )
- PORT_START_TAG("IN0-0")
+ PORT_START("IN0-0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Double Up") PORT_CODE(KEYCODE_3)
@@ -1508,7 +1508,7 @@ static INPUT_PORTS_START( ssipkr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-1")
+ PORT_START("IN0-1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service") PORT_CODE(KEYCODE_8)
@@ -1518,7 +1518,7 @@ static INPUT_PORTS_START( ssipkr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-2")
+ PORT_START("IN0-2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_NAME("Discard 1") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_NAME("Discard 2") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON10 ) PORT_NAME("Discard 3") PORT_CODE(KEYCODE_C)
@@ -1528,7 +1528,7 @@ static INPUT_PORTS_START( ssipkr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-3")
+ PORT_START("IN0-3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Test Mode") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Bet") PORT_CODE(KEYCODE_1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Take") PORT_CODE(KEYCODE_4)
@@ -1538,7 +1538,7 @@ static INPUT_PORTS_START( ssipkr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SW1")
+ PORT_START("SW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c
index 7e8fa1ba014..2340c9faaf8 100644
--- a/src/mame/drivers/calorie.c
+++ b/src/mame/drivers/calorie.c
@@ -234,7 +234,7 @@ static ADDRESS_MAP_START( calorie_sound_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( calorie )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_4WAY
@@ -244,7 +244,7 @@ static INPUT_PORTS_START( calorie )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_COCKTAIL PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_COCKTAIL PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL PORT_4WAY
@@ -254,7 +254,7 @@ static INPUT_PORTS_START( calorie )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -264,7 +264,7 @@ static INPUT_PORTS_START( calorie )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) )
@@ -287,7 +287,7 @@ static INPUT_PORTS_START( calorie )
PORT_DIPSETTING( 0x40, "4" )
PORT_DIPSETTING( 0x80, "5" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
PORT_DIPSETTING( 0x01, "20,000 Only" )
diff --git a/src/mame/drivers/canyon.c b/src/mame/drivers/canyon.c
index 953482bfeab..083737bf943 100644
--- a/src/mame/drivers/canyon.c
+++ b/src/mame/drivers/canyon.c
@@ -133,7 +133,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( canyon )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Language ) ) PORT_DIPLOCATION("SW:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
PORT_DIPSETTING( 0x01, DEF_STR( Spanish ) )
@@ -152,13 +152,13 @@ static INPUT_PORTS_START( canyon )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -168,16 +168,16 @@ static INPUT_PORTS_START( canyon )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON7 ) PORT_NAME("Hiscore Reset") PORT_CODE(KEYCODE_H)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_TILT ) /* SLAM */
- PORT_START_TAG("MOTOR1")
+ PORT_START("MOTOR1")
PORT_ADJUSTER( 20, "Motor 1 RPM" )
- PORT_START_TAG("MOTOR2")
+ PORT_START("MOTOR2")
PORT_ADJUSTER( 30, "Motor 2 RPM" )
- PORT_START_TAG("WHISTLE1")
+ PORT_START("WHISTLE1")
PORT_ADJUSTER( 70, "Whistle 1 Freq" )
- PORT_START_TAG("WHISTLE2")
+ PORT_START("WHISTLE2")
PORT_ADJUSTER( 80, "Whistle 2 Freq" )
INPUT_PORTS_END
diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c
index 1259a9bbc82..6ed720afa69 100644
--- a/src/mame/drivers/capbowl.c
+++ b/src/mame/drivers/capbowl.c
@@ -293,7 +293,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( capbowl )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
/* low 4 bits are for the trackball */
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -302,20 +302,20 @@ static INPUT_PORTS_START( capbowl )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
/* low 4 bits are for the trackball */
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("TRACKY") /* FAKE */
+ PORT_START("TRACKY") /* FAKE */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(40) PORT_REVERSE
- PORT_START_TAG("TRACKX") /* FAKE */
+ PORT_START("TRACKX") /* FAKE */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(40)
- PORT_START_TAG("SERVICE") /* FAKE */
+ PORT_START("SERVICE") /* FAKE */
/* This fake input port is used to get the status of the F2 key, */
/* and activate the test mode, which is triggered by a NMI */
PORT_SERVICE_NO_TOGGLE( 0x01, IP_ACTIVE_HIGH )
diff --git a/src/mame/drivers/cardline.c b/src/mame/drivers/cardline.c
index 0dc5846eb58..2502ee8b838 100644
--- a/src/mame/drivers/cardline.c
+++ b/src/mame/drivers/cardline.c
@@ -120,7 +120,7 @@ static ADDRESS_MAP_START( mem_io, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( cardline )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Collect")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Card 1 / Double-Up")
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Card 2")
@@ -130,7 +130,7 @@ static INPUT_PORTS_START( cardline )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Bet")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Start")
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_NAME("?")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bookkeeping Info") PORT_CODE(KEYCODE_F1)
@@ -140,7 +140,7 @@ static INPUT_PORTS_START( cardline )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_ENTER) PORT_NAME("Payout")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON10 ) PORT_NAME("?")
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/carjmbre.c b/src/mame/drivers/carjmbre.c
index e49c225a803..6042cce7c1c 100644
--- a/src/mame/drivers/carjmbre.c
+++ b/src/mame/drivers/carjmbre.c
@@ -109,7 +109,7 @@ static ADDRESS_MAP_START( carjmbre_sound_writeport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( carjmbre )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) //coin error if held high for 1s
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) //or if many coins inserted quickly
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 )
@@ -119,7 +119,7 @@ static INPUT_PORTS_START( carjmbre )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START2 )
@@ -129,7 +129,7 @@ static INPUT_PORTS_START( carjmbre )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
diff --git a/src/mame/drivers/carpolo.c b/src/mame/drivers/carpolo.c
index 4a018fac28e..4553c32f144 100644
--- a/src/mame/drivers/carpolo.c
+++ b/src/mame/drivers/carpolo.c
@@ -68,7 +68,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( carpolo )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT (0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT (0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT (0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -77,7 +77,7 @@ static INPUT_PORTS_START( carpolo )
/* the value read from here is used directly,
the result is calculated by 60/value */
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT (0x03, IP_ACTIVE_HIGH, IPT_UNUSED ) /* the lowest 2 bits of the counter */
PORT_DIPNAME( 0xfc, 0x3c, "Game Sec/Real Sec" )
PORT_DIPSETTING( 0x00, "0.23 (Longest)" )
@@ -144,19 +144,19 @@ static INPUT_PORTS_START( carpolo )
PORT_DIPSETTING( 0x08, "7.50" )
PORT_DIPSETTING( 0x04, "15.00 (Shortest)" )
- PORT_START_TAG("DIAL0") /* IN2 */
+ PORT_START("DIAL0") /* IN2 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("DIAL1") /* IN3 */
+ PORT_START("DIAL1") /* IN3 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("DIAL2") /* IN4 */
+ PORT_START("DIAL2") /* IN4 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(3)
- PORT_START_TAG("DIAL3") /* IN5 */
+ PORT_START("DIAL3") /* IN5 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(4)
- PORT_START_TAG("PEDALS") /* IN6 - accelerator pedals */
+ PORT_START("PEDALS") /* IN6 - accelerator pedals */
PORT_BIT (0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT (0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT (0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
@@ -166,7 +166,7 @@ static INPUT_PORTS_START( carpolo )
PORT_BIT (0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(4)
PORT_BIT (0x80, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(4)
- PORT_START_TAG("IN2") /* IN7 - forward/reverse */
+ PORT_START("IN2") /* IN7 - forward/reverse */
PORT_BIT (0x0f, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
PORT_BIT (0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c
index 9818f95f131..189e503b04e 100644
--- a/src/mame/drivers/carrera.c
+++ b/src/mame/drivers/carrera.c
@@ -83,7 +83,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( carrera )
- PORT_START_TAG("IN0") /* Port 0 */
+ PORT_START("IN0") /* Port 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
@@ -100,7 +100,7 @@ static INPUT_PORTS_START( carrera )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN1") /* Port 1 */
+ PORT_START("IN1") /* Port 1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
/* unused / unknown inputs, not dips */
@@ -124,7 +124,7 @@ static INPUT_PORTS_START( carrera )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
/* I suspect the 4 below are the 4xDSWs */
- PORT_START_TAG("IN2") /* Port 2 */
+ PORT_START("IN2") /* Port 2 */
PORT_DIPNAME( 0x01, 0x01, "2" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -150,7 +150,7 @@ static INPUT_PORTS_START( carrera )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN3") /* Port 3 */
+ PORT_START("IN3") /* Port 3 */
PORT_DIPNAME( 0x01, 0x01, "3" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -176,7 +176,7 @@ static INPUT_PORTS_START( carrera )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN4") /* Port 4 */
+ PORT_START("IN4") /* Port 4 */
PORT_DIPNAME( 0x01, 0x01, "4" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -202,7 +202,7 @@ static INPUT_PORTS_START( carrera )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN5") /* Port 5 */
+ PORT_START("IN5") /* Port 5 */
PORT_DIPNAME( 0x01, 0x01, "5" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c
index b9711473198..c109a8c03db 100644
--- a/src/mame/drivers/cave.c
+++ b/src/mame/drivers/cave.c
@@ -1471,7 +1471,7 @@ ADDRESS_MAP_END
/* Most games use this */
static INPUT_PORTS_START( cave )
- PORT_START_TAG("IN0") // IN0 - Player 1
+ PORT_START("IN0") // IN0 - Player 1
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -1489,7 +1489,7 @@ static INPUT_PORTS_START( cave )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") // IN1 - Player 2
+ PORT_START("IN1") // IN1 - Player 2
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -1536,7 +1536,7 @@ static INPUT_PORTS_START( gaia )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1618,7 +1618,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mazinger )
PORT_INCLUDE( cave )
- PORT_START_TAG("EEPROM") // Eeprom Region
+ PORT_START("EEPROM") // Eeprom Region
PORT_DIPNAME( 0xff, 0x31, DEF_STR( Region ) )
PORT_DIPSETTING( 0x30, DEF_STR( Japan ) )
PORT_DIPSETTING( 0x31, DEF_STR( World ) )
@@ -1628,7 +1628,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( sailormn )
PORT_INCLUDE( cave )
- PORT_START_TAG("EEPROM") // Eeprom Region
+ PORT_START("EEPROM") // Eeprom Region
PORT_DIPNAME( 0xff, 0x02, DEF_STR( Region ) )
PORT_DIPSETTING( 0x00, DEF_STR( Japan ) )
PORT_DIPSETTING( 0x01, DEF_STR( USA ) )
@@ -1651,7 +1651,7 @@ INPUT_PORTS_END
/* Different layout */
static INPUT_PORTS_START( guwange )
- PORT_START_TAG("IN0") // IN0 - Player 1 & 2
+ PORT_START("IN0") // IN0 - Player 1 & 2
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -1669,7 +1669,7 @@ static INPUT_PORTS_START( guwange )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_START_TAG("IN1") // IN1 - Coins
+ PORT_START("IN1") // IN1 - Coins
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(6)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(6)
PORT_SERVICE_NO_TOGGLE( 0x0004, IP_ACTIVE_LOW )
@@ -1690,7 +1690,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( korokoro )
- PORT_START_TAG("IN0") // IN0
+ PORT_START("IN0") // IN0
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(10) // bit 0x0010 of leds (coin)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(10) // bit 0x0020 of leds (does coin sound)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(10) // bit 0x0080 of leds
@@ -1708,7 +1708,7 @@ static INPUT_PORTS_START( korokoro )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SERVICE1 ) // service coin
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(korokoro_hopper_r, NULL) // motor / hopper status ???
- PORT_START_TAG("IN1") // IN1
+ PORT_START("IN1") // IN1
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c
index cef5c339e83..c9b217c227a 100644
--- a/src/mame/drivers/cball.c
+++ b/src/mame/drivers/cball.c
@@ -124,32 +124,32 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( cball )
- PORT_START_TAG("1001")
+ PORT_START("1001")
PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, "2 Coins each" )
PORT_DIPSETTING( 0xc0, "1 Coin each" )
PORT_DIPSETTING( 0x80, "1 Coin 1 Game" )
PORT_DIPSETTING( 0x40, "1 Coin 2 Games" )
- PORT_START_TAG("1003")
+ PORT_START("1003")
PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) )
PORT_DIPSETTING( 0xc0, "3" )
PORT_DIPSETTING( 0x80, "5" )
PORT_DIPSETTING( 0x40, "7" )
PORT_DIPSETTING( 0x00, "9" )
- PORT_START_TAG("1020")
+ PORT_START("1020")
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("1040")
+ PORT_START("1040")
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("1060")
+ PORT_START("1060")
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("2800")
+ PORT_START("2800")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 )
INPUT_PORTS_END
diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c
index ddfdd56096b..fbb881f56db 100644
--- a/src/mame/drivers/cbasebal.c
+++ b/src/mame/drivers/cbasebal.c
@@ -158,7 +158,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( cbasebal )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -168,7 +168,7 @@ static INPUT_PORTS_START( cbasebal )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
@@ -178,7 +178,7 @@ static INPUT_PORTS_START( cbasebal )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c
index 6fd6640a35e..f473967a201 100644
--- a/src/mame/drivers/cbuster.c
+++ b/src/mame/drivers/cbuster.c
@@ -204,7 +204,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( twocrude )
- PORT_START_TAG("P1_P2")
+ PORT_START("P1_P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -222,7 +222,7 @@ static INPUT_PORTS_START( twocrude )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("COINS") /* Credits */
+ PORT_START("COINS") /* Credits */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -232,7 +232,7 @@ static INPUT_PORTS_START( twocrude )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) )
diff --git a/src/mame/drivers/ccastles.c b/src/mame/drivers/ccastles.c
index 195d107e171..53510506d2d 100644
--- a/src/mame/drivers/ccastles.c
+++ b/src/mame/drivers/ccastles.c
@@ -375,7 +375,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( ccastles )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -385,7 +385,7 @@ static INPUT_PORTS_START( ccastles )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) /* 1p Jump, non-cocktail start1 */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) /* 2p Jump, non-cocktail start2 */
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -402,16 +402,16 @@ static INPUT_PORTS_START( ccastles )
PORT_DIPSETTING( 0x20, DEF_STR( Cocktail ) )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("LETA0")
+ PORT_START("LETA0")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(10) PORT_KEYDELTA(30) PORT_REVERSE
- PORT_START_TAG("LETA1")
+ PORT_START("LETA1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(10) PORT_KEYDELTA(30)
- PORT_START_TAG("LETA2")
+ PORT_START("LETA2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_COCKTAIL PORT_SENSITIVITY(10) PORT_KEYDELTA(30) PORT_REVERSE
- PORT_START_TAG("LETA3")
+ PORT_START("LETA3")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_COCKTAIL PORT_SENSITIVITY(10) PORT_KEYDELTA(30)
INPUT_PORTS_END
diff --git a/src/mame/drivers/cchasm.c b/src/mame/drivers/cchasm.c
index ca41a5d57b6..f8b48ce9bb8 100644
--- a/src/mame/drivers/cchasm.c
+++ b/src/mame/drivers/cchasm.c
@@ -76,7 +76,7 @@ static const ptm6840_interface cchasm_6840_intf =
*************************************/
static INPUT_PORTS_START( cchasm )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
@@ -99,10 +99,10 @@ static INPUT_PORTS_START( cchasm )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_1C ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff, 0, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -112,7 +112,7 @@ static INPUT_PORTS_START( cchasm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 )
diff --git a/src/mame/drivers/cclimber.c b/src/mame/drivers/cclimber.c
index cf02fa6471c..739948d978a 100644
--- a/src/mame/drivers/cclimber.c
+++ b/src/mame/drivers/cclimber.c
@@ -425,7 +425,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( cclimber )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_LEFT ) PORT_8WAY
@@ -435,7 +435,7 @@ static INPUT_PORTS_START( cclimber )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_LEFT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_RIGHT ) PORT_8WAY
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -445,7 +445,7 @@ static INPUT_PORTS_START( cclimber )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_RIGHT ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW:!1,!2")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -466,7 +466,7 @@ static INPUT_PORTS_START( cclimber )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_3C ) ) // Bonus life : 30000 points
PORT_DIPSETTING( 0xc0, DEF_STR( Free_Play ) ) // Bonus life : 50000 points
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -488,7 +488,7 @@ static INPUT_PORTS_START( cclimbrj )
INPUT_PORTS_END
static INPUT_PORTS_START( ckong )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x07, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -496,7 +496,7 @@ static INPUT_PORTS_START( ckong )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x07, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
@@ -504,7 +504,7 @@ static INPUT_PORTS_START( ckong )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -528,7 +528,7 @@ static INPUT_PORTS_START( ckong )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -583,19 +583,19 @@ static INPUT_PORTS_START( cannonb )
INPUT_PORTS_END
static INPUT_PORTS_START( rpatrol )
- PORT_START_TAG("P1") /* P2 controls but we use cclimber tags */
+ PORT_START("P1") /* P2 controls but we use cclimber tags */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x3e, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
- PORT_START_TAG("P2") /* P1 controls but we use cclimber tags */
+ PORT_START("P2") /* P1 controls but we use cclimber tags */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x3e, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -619,7 +619,7 @@ static INPUT_PORTS_START( rpatrol )
PORT_DIPSETTING( 0x00, "Retry on Error" )
PORT_DIPSETTING( 0x80, "Stop on Error" )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -628,7 +628,7 @@ static INPUT_PORTS_START( rpatrol )
INPUT_PORTS_END
static INPUT_PORTS_START( swimmer )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -636,7 +636,7 @@ static INPUT_PORTS_START( swimmer )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -644,7 +644,7 @@ static INPUT_PORTS_START( swimmer )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW A:!1,!2")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -666,7 +666,7 @@ static INPUT_PORTS_START( swimmer )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_6C ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START2 )
@@ -682,7 +682,7 @@ static INPUT_PORTS_START( swimmer )
PORT_DIPSETTING( 0x80, DEF_STR( Harder ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Hardest ) )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -700,7 +700,7 @@ static INPUT_PORTS_START( swimmerb )
INPUT_PORTS_END
static INPUT_PORTS_START( guzzler )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -708,7 +708,7 @@ static INPUT_PORTS_START( guzzler )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
@@ -716,7 +716,7 @@ static INPUT_PORTS_START( guzzler )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW A:!1,!2")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -738,7 +738,7 @@ static INPUT_PORTS_START( guzzler )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_6C ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_DIPNAME( 0x10, 0x10, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW B:!1")
PORT_DIPSETTING( 0x10, DEF_STR( Upright ) )
@@ -752,7 +752,7 @@ static INPUT_PORTS_START( guzzler )
PORT_DIPSETTING( 0x80, DEF_STR( Hard ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Hardest ) )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -761,7 +761,7 @@ static INPUT_PORTS_START( guzzler )
INPUT_PORTS_END
static INPUT_PORTS_START( yamato )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 )
@@ -771,7 +771,7 @@ static INPUT_PORTS_START( yamato )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -781,7 +781,7 @@ static INPUT_PORTS_START( yamato )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -806,7 +806,7 @@ static INPUT_PORTS_START( yamato )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 ) /* set 1 only */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -816,7 +816,7 @@ static INPUT_PORTS_START( yamato )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("START")
+ PORT_START("START")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -828,21 +828,21 @@ static INPUT_PORTS_START( yamato )
INPUT_PORTS_END
static INPUT_PORTS_START( toprollr )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -867,7 +867,7 @@ static INPUT_PORTS_START( toprollr )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c
index cac57c11ce7..5afc25bdf08 100644
--- a/src/mame/drivers/centiped.c
+++ b/src/mame/drivers/centiped.c
@@ -860,7 +860,7 @@ ADDRESS_MAP_END
that one of the languages is Italian in the bootleg one instead of Spanish */
static INPUT_PORTS_START( centiped )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* trackball data */
PORT_DIPNAME( 0x10, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
@@ -869,7 +869,7 @@ static INPUT_PORTS_START( centiped )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* trackball sign bit */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -879,12 +879,12 @@ static INPUT_PORTS_START( centiped )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* trackball data */
PORT_BIT( 0x70, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* trackball sign bit */
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
@@ -894,7 +894,7 @@ static INPUT_PORTS_START( centiped )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Language ) ) PORT_DIPLOCATION("N9:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
PORT_DIPSETTING( 0x01, DEF_STR( German ) )
@@ -917,7 +917,7 @@ static INPUT_PORTS_START( centiped )
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x80, "2" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Coinage ) ) PORT_DIPLOCATION("N8:1,2")
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) )
@@ -939,16 +939,16 @@ static INPUT_PORTS_START( centiped )
PORT_DIPSETTING( 0x80, "6 credits/5 coins" )
PORT_DIPSETTING( 0xa0, "4 credits/3 coins" )
- PORT_START_TAG("TRACK0_X") /* IN6, fake trackball input port. */
+ PORT_START("TRACK0_X") /* IN6, fake trackball input port. */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE
- PORT_START_TAG("TRACK0_Y") /* IN7, fake trackball input port. */
+ PORT_START("TRACK0_Y") /* IN7, fake trackball input port. */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("TRACK1_X") /* IN8, fake trackball input port. */
+ PORT_START("TRACK1_X") /* IN8, fake trackball input port. */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_COCKTAIL
- PORT_START_TAG("TRACK1_Y") /* IN9, fake trackball input port. */
+ PORT_START("TRACK1_Y") /* IN9, fake trackball input port. */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_COCKTAIL
INPUT_PORTS_END
@@ -1089,7 +1089,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( milliped )
- PORT_START_TAG("IN0") /* $2000 */ /* see port 6 for x trackball */
+ PORT_START("IN0") /* $2000 */ /* see port 6 for x trackball */
PORT_DIPNAME(0x03, 0x00, DEF_STR( Language ) ) PORT_DIPLOCATION("P8:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
PORT_DIPSETTING( 0x01, DEF_STR( German ) )
@@ -1105,7 +1105,7 @@ static INPUT_PORTS_START( milliped )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* trackball sign bit */
- PORT_START_TAG("IN1") /* $2001 */ /* see port 7 for y trackball */
+ PORT_START("IN1") /* $2001 */ /* see port 7 for y trackball */
/* these bits are unused */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1120,7 +1120,7 @@ static INPUT_PORTS_START( milliped )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* trackball sign bit */
- PORT_START_TAG("IN2") /* $2010 */
+ PORT_START("IN2") /* $2010 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -1130,7 +1130,7 @@ static INPUT_PORTS_START( milliped )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("IN3") /* $2011 */
+ PORT_START("IN3") /* $2011 */
/* Note, joystick X input for player 2 are bad in software */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -1143,7 +1143,7 @@ static INPUT_PORTS_START( milliped )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW1") /* $0408 */
+ PORT_START("DSW1") /* $0408 */
PORT_DIPNAME(0x01, 0x00, "Millipede Head" ) PORT_DIPLOCATION("D5:1")
PORT_DIPSETTING( 0x00, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x01, DEF_STR( Hard ) )
@@ -1167,7 +1167,7 @@ static INPUT_PORTS_START( milliped )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* $0808 */
+ PORT_START("DSW2") /* $0808 */
PORT_DIPNAME(0x03, 0x02, DEF_STR( Coinage ) ) PORT_DIPLOCATION("B5:1,2")
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) )
@@ -1190,22 +1190,22 @@ static INPUT_PORTS_START( milliped )
PORT_DIPSETTING( 0xa0, "4 credits/3 coins" )
PORT_DIPSETTING( 0xc0, "Demo Mode" )
- PORT_START_TAG("TRACK0_X") /* IN6, fake trackball input port. */
+ PORT_START("TRACK0_X") /* IN6, fake trackball input port. */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE
- PORT_START_TAG("TRACK0_Y") /* IN7, fake trackball input port. */
+ PORT_START("TRACK0_Y") /* IN7, fake trackball input port. */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("TRACK1_X") /* IN8, fake trackball input port. */
+ PORT_START("TRACK1_X") /* IN8, fake trackball input port. */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_COCKTAIL
- PORT_START_TAG("TRACK1_Y") /* IN9, fake trackball input port. */
+ PORT_START("TRACK1_Y") /* IN9, fake trackball input port. */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_COCKTAIL
INPUT_PORTS_END
static INPUT_PORTS_START( warlords )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_DIPNAME( 0x10, 0x00, "Diag Step" ) /* Not referenced */
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -1216,7 +1216,7 @@ static INPUT_PORTS_START( warlords )
PORT_DIPSETTING( 0x80, "Upright (overlay)" )
PORT_DIPSETTING( 0x00, "Cocktail (no overlay)" )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
@@ -1226,7 +1226,7 @@ static INPUT_PORTS_START( warlords )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Language ) ) PORT_DIPLOCATION("J2:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
PORT_DIPSETTING( 0x01, DEF_STR( French ) )
@@ -1241,7 +1241,7 @@ static INPUT_PORTS_START( warlords )
PORT_DIPSETTING( 0x10, "1p = 1, 2p = 2" )
PORT_DIPSETTING( 0x20, "1p/2p = 2 credits" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Coinage ) ) PORT_DIPLOCATION("M2:1,2")
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) )
@@ -1263,22 +1263,22 @@ static INPUT_PORTS_START( warlords )
PORT_DIPSETTING( 0x80, "6 credits/5 coins" )
/* IN4-7 fake to control player paddles */
- PORT_START_TAG("PADDLE0")
+ PORT_START("PADDLE0")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x1d,0xcb) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_PLAYER(1)
- PORT_START_TAG("PADDLE1")
+ PORT_START("PADDLE1")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x1d,0xcb) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_PLAYER(2)
- PORT_START_TAG("PADDLE2")
+ PORT_START("PADDLE2")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x1d,0xcb) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_PLAYER(3)
- PORT_START_TAG("PADDLE3")
+ PORT_START("PADDLE3")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x1d,0xcb) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_PLAYER(4)
INPUT_PORTS_END
static INPUT_PORTS_START( mazeinv )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Language ) )
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
PORT_DIPSETTING( 0x01, DEF_STR( German ) )
@@ -1301,10 +1301,10 @@ static INPUT_PORTS_START( mazeinv )
PORT_DIPSETTING( 0x40, "2" )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -1314,7 +1314,7 @@ static INPUT_PORTS_START( mazeinv )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON4 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
@@ -1324,7 +1324,7 @@ static INPUT_PORTS_START( mazeinv )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, "Doors for bonus" )
PORT_DIPSETTING( 0x00, "10" )
PORT_DIPSETTING( 0x01, "12" )
@@ -1346,7 +1346,7 @@ static INPUT_PORTS_START( mazeinv )
PORT_DIPSETTING( 0x80, DEF_STR( Hard ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Harder ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) )
@@ -1368,28 +1368,28 @@ static INPUT_PORTS_START( mazeinv )
PORT_DIPSETTING( 0x80, "6 credits/5 coins" )
/* IN6-9 fake to control player joysticks */
- PORT_START_TAG("STICK0")
+ PORT_START("STICK0")
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_Y ) PORT_MINMAX(0x40, 0xbf) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("STICK1")
+ PORT_START("STICK1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("STICK2")
+ PORT_START("STICK2")
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_X ) PORT_MINMAX(0x40, 0xbf) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("STICK3")
+ PORT_START("STICK3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( bullsdrt )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* trackball data */
PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* trackball sign bit */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -1399,12 +1399,12 @@ static INPUT_PORTS_START( bullsdrt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN3 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* trackball data */
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* trackball sign bit */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1430,7 +1430,7 @@ static INPUT_PORTS_START( bullsdrt )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1456,17 +1456,17 @@ static INPUT_PORTS_START( bullsdrt )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("TRACK0_X") /* fake trackball input port. */
+ PORT_START("TRACK0_X") /* fake trackball input port. */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE
- PORT_START_TAG("TRACK0_Y") /* fake trackball input port. */
+ PORT_START("TRACK0_Y") /* fake trackball input port. */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
/* 2008-06 FP: was bullsdrt available as cocktail? If not, these can be removed */
- PORT_START_TAG("TRACK1_X")
+ PORT_START("TRACK1_X")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("TRACK1_Y")
+ PORT_START("TRACK1_Y")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/chaknpop.c b/src/mame/drivers/chaknpop.c
index ec4738f8161..77740640f9c 100644
--- a/src/mame/drivers/chaknpop.c
+++ b/src/mame/drivers/chaknpop.c
@@ -46,10 +46,10 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8802, 0x8802) AM_READ(chaknpop_mcu_portC_r)
AM_RANGE(0x8805, 0x8805) AM_READ(AY8910_read_port_0_r)
AM_RANGE(0x8807, 0x8807) AM_READ(AY8910_read_port_1_r)
- AM_RANGE(0x8808, 0x8808) AM_READ(input_port_3_r) // DSW C
- AM_RANGE(0x8809, 0x8809) AM_READ(input_port_1_r) // IN1
- AM_RANGE(0x880a, 0x880a) AM_READ(input_port_0_r) // IN0
- AM_RANGE(0x880b, 0x880b) AM_READ(input_port_2_r) // IN2
+ AM_RANGE(0x8808, 0x8808) AM_READ_PORT("DSWC")
+ AM_RANGE(0x8809, 0x8809) AM_READ_PORT("P1")
+ AM_RANGE(0x880a, 0x880a) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0x880b, 0x880b) AM_READ_PORT("P2")
AM_RANGE(0x880c, 0x880c) AM_READ(chaknpop_gfxmode_r)
AM_RANGE(0x9000, 0x93ff) AM_READ(SMH_RAM) // TX tilemap
AM_RANGE(0x9800, 0x983f) AM_READ(SMH_RAM) // Color attribute
@@ -105,7 +105,7 @@ static const struct AY8910interface ay8910_interface_2 =
***************************************************************************/
static INPUT_PORTS_START( chaknpop )
- PORT_START_TAG("IN0")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) // LEFT COIN
@@ -115,7 +115,7 @@ static INPUT_PORTS_START( chaknpop )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_TILT )
- PORT_START_TAG("IN1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -125,7 +125,7 @@ static INPUT_PORTS_START( chaknpop )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -135,7 +135,7 @@ static INPUT_PORTS_START( chaknpop )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* DSW C */
+ PORT_START("DSWC")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Language ) )
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
PORT_DIPSETTING( 0x01, DEF_STR( Japanese ) )
@@ -161,7 +161,7 @@ static INPUT_PORTS_START( chaknpop )
PORT_DIPSETTING( 0x00, "1 Way" )
PORT_DIPSETTING( 0x80, "2 Way" )
- PORT_START_TAG("IN4") /* DSW B */
+ PORT_START("DSWB")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x00, "80k and every 100k" )
PORT_DIPSETTING( 0x01, "60k and every 100k" )
@@ -185,7 +185,7 @@ static INPUT_PORTS_START( chaknpop )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("IN5") /* DSW A */
+ PORT_START("DSWA")
PORT_DIPNAME(0x0f, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0f, DEF_STR( 9C_1C ) )
PORT_DIPSETTING( 0x0e, DEF_STR( 8C_1C ) )
diff --git a/src/mame/drivers/cham24.c b/src/mame/drivers/cham24.c
index 878c91cfeb9..542c458fee0 100644
--- a/src/mame/drivers/cham24.c
+++ b/src/mame/drivers/cham24.c
@@ -168,7 +168,7 @@ static ADDRESS_MAP_START( cham24_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( cham24 )
- PORT_START_TAG("P1") /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) /* Select */
@@ -178,7 +178,7 @@ static INPUT_PORTS_START( cham24 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
- PORT_START_TAG("P2") /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) /* Select */
diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c
index 02864b09b0e..ec0ac8e6597 100644
--- a/src/mame/drivers/champbas.c
+++ b/src/mame/drivers/champbas.c
@@ -223,10 +223,10 @@ static ADDRESS_MAP_START( talbot_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8800, 0x8fef) AM_RAM
AM_RANGE(0x8ff0, 0x8fff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size)
- AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r)
- AM_RANGE(0xa040, 0xa040) AM_READ(input_port_1_r)
- AM_RANGE(0xa080, 0xa080) AM_READ(input_port_2_r)
- AM_RANGE(0xa0c0, 0xa0c0) AM_READ(input_port_3_r)
+ AM_RANGE(0xa000, 0xa000) AM_READ_PORT("P1")
+ AM_RANGE(0xa040, 0xa040) AM_READ_PORT("P2")
+ AM_RANGE(0xa080, 0xa080) AM_READ_PORT("DSW")
+ AM_RANGE(0xa0c0, 0xa0c0) AM_READ_PORT("SYSTEM")
AM_RANGE(0xa000, 0xa000) AM_WRITE(irq_enable_w)
AM_RANGE(0xa001, 0xa001) AM_WRITENOP // !WORK board output (no use?)
@@ -252,10 +252,10 @@ static ADDRESS_MAP_START( champbas_main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8800, 0x8fef) AM_RAM
AM_RANGE(0x8ff0, 0x8fff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size)
- AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r)
- AM_RANGE(0xa040, 0xa040) AM_READ(input_port_1_r)
- AM_RANGE(0xa080, 0xa080) AM_READ(input_port_2_r)
- AM_RANGE(0xa0c0, 0xa0c0) AM_READ(input_port_3_r)
+ AM_RANGE(0xa000, 0xa000) AM_READ_PORT("P1")
+ AM_RANGE(0xa040, 0xa040) AM_READ_PORT("P2")
+ AM_RANGE(0xa080, 0xa080) AM_READ_PORT("DSW")
+ AM_RANGE(0xa0c0, 0xa0c0) AM_READ_PORT("SYSTEM")
AM_RANGE(0xa000, 0xa000) AM_WRITE(irq_enable_w)
AM_RANGE(0xa001, 0xa001) AM_WRITENOP // !WORK board output (no use?)
@@ -284,10 +284,10 @@ static ADDRESS_MAP_START( exctsccb_main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(champbas_bg_videoram_w) AM_BASE(&champbas_bg_videoram)
AM_RANGE(0x8800, 0x8fff) AM_RAM AM_BASE(&spriteram_2) /* ??? */
- AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r)
- AM_RANGE(0xa040, 0xa040) AM_READ(input_port_1_r)
- AM_RANGE(0xa080, 0xa080) AM_READ(input_port_2_r)
- AM_RANGE(0xa0c0, 0xa0c0) AM_READ(input_port_3_r)
+ AM_RANGE(0xa000, 0xa000) AM_READ_PORT("P1")
+ AM_RANGE(0xa040, 0xa040) AM_READ_PORT("P2")
+ AM_RANGE(0xa080, 0xa080) AM_READ_PORT("DSW")
+ AM_RANGE(0xa0c0, 0xa0c0) AM_READ_PORT("SYSTEM")
AM_RANGE(0xa000, 0xa000) AM_WRITE(irq_enable_w)
AM_RANGE(0xa001, 0xa001) AM_WRITENOP /* ??? */
@@ -309,10 +309,10 @@ static ADDRESS_MAP_START( exctsccr_main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(champbas_bg_videoram_w) AM_BASE(&champbas_bg_videoram)
AM_RANGE(0x8800, 0x8bff) AM_RAM AM_BASE(&spriteram_2) /* ??? */
- AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r)
- AM_RANGE(0xa040, 0xa040) AM_READ(input_port_1_r)
- AM_RANGE(0xa080, 0xa080) AM_READ(input_port_2_r)
- AM_RANGE(0xa0c0, 0xa0c0) AM_READ(input_port_3_r)
+ AM_RANGE(0xa000, 0xa000) AM_READ_PORT("P1")
+ AM_RANGE(0xa040, 0xa040) AM_READ_PORT("P2")
+ AM_RANGE(0xa080, 0xa080) AM_READ_PORT("DSW")
+ AM_RANGE(0xa0c0, 0xa0c0) AM_READ_PORT("SYSTEM")
AM_RANGE(0xa000, 0xa000) AM_WRITE(irq_enable_w)
// AM_RANGE(0xa001, 0xa001) AM_WRITENOP /* ??? */
@@ -367,7 +367,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( talbot )
- PORT_START /* IN0 */
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -377,7 +377,7 @@ static INPUT_PORTS_START( talbot )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
- PORT_START /* IN1 */
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -387,7 +387,7 @@ static INPUT_PORTS_START( talbot )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
@@ -398,18 +398,14 @@ static INPUT_PORTS_START( talbot )
PORT_DIPSETTING( 0x04, "4" )
PORT_DIPSETTING( 0x08, "5" )
PORT_DIPSETTING( 0x0c, "6" )
- PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPUNKNOWN( 0x10, 0x10 )
+ PORT_DIPUNKNOWN( 0x20, 0x20 )
PORT_DIPNAME( 0x40, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) )
PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(champbas_watchdog_bit2, 0) // bit 2 of the watchdog counter
- PORT_START /* IN2 */
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -421,27 +417,21 @@ static INPUT_PORTS_START( talbot )
INPUT_PORTS_END
static INPUT_PORTS_START( champbas )
- PORT_START /* IN0 */
+ PORT_INCLUDE( talbot )
+
+ PORT_MODIFY("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) // throw (red)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) // changes (blue)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 ) // steal (yellow)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
- PORT_START /* IN1 */
+ PORT_MODIFY("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL // steal (yellow)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL // changes (blue)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_COCKTAIL
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL // throw (red)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* DSW */
+ PORT_MODIFY("DSW")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, "A 2/1 B 3/2" )
PORT_DIPSETTING( 0x02, "A 1/1 B 2/1")
@@ -459,44 +449,14 @@ static INPUT_PORTS_START( champbas )
PORT_DIPNAME( 0x20, 0x20, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x20, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hard ))
- PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ))
- PORT_DIPSETTING( 0x40, DEF_STR( On ) )
+ PORT_DIPUNKNOWN( 0x40, 0x00 )
PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(champbas_watchdog_bit2, 0) // bit 2 of the watchdog counter
-
- PORT_START /* COIN */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( exctsccr )
- PORT_START /* IN0 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
+ PORT_INCLUDE( talbot )
- PORT_START /* IN1 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
-
- PORT_START /* DSW0 */
+ PORT_MODIFY("DSW")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, "A 1C/1C B 3C/1C" )
@@ -517,16 +477,6 @@ static INPUT_PORTS_START( exctsccr )
PORT_DIPSETTING( 0x60, "3 Min." )
PORT_DIPSETTING( 0x40, "4 Min." )
PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(champbas_watchdog_bit2, 0) // bit 2 of the watchdog counter
-
- PORT_START /* IN2 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
diff --git a/src/mame/drivers/champbwl.c b/src/mame/drivers/champbwl.c
index ff9feaca766..f72076cbb5f 100644
--- a/src/mame/drivers/champbwl.c
+++ b/src/mame/drivers/champbwl.c
@@ -214,7 +214,7 @@ static ADDRESS_MAP_START( champbwl_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( champbwl )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -224,7 +224,7 @@ static INPUT_PORTS_START( champbwl )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) // INT( 4M)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) // INT(16M)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -250,7 +250,7 @@ static INPUT_PORTS_START( champbwl )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_SERVICE_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW1:1" )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:2")
PORT_DIPSETTING( 0x02, DEF_STR( Upright ) )
@@ -274,7 +274,7 @@ static INPUT_PORTS_START( champbwl )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:5")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -299,10 +299,10 @@ static INPUT_PORTS_START( champbwl )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("FAKEX") /* FAKE */
+ PORT_START("FAKEX") /* FAKE */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X )PORT_SENSITIVITY(50) PORT_KEYDELTA(50) PORT_CENTERDELTA(0)
- PORT_START_TAG("FAKEY") /* FAKE */
+ PORT_START("FAKEY") /* FAKE */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(45) PORT_CENTERDELTA(0) PORT_REVERSE
INPUT_PORTS_END
diff --git a/src/mame/drivers/changela.c b/src/mame/drivers/changela.c
index e97f3ba310e..f0c2227aee6 100644
--- a/src/mame/drivers/changela.c
+++ b/src/mame/drivers/changela.c
@@ -318,7 +318,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( changela )
- PORT_START_TAG("DSWA") /* DSWA */
+ PORT_START("DSWA") /* DSWA */
PORT_DIPNAME( 0x07, 0x01, "Steering Wheel Ratio" ) PORT_DIPLOCATION("SWA:1,2,3")
//PORT_DIPSETTING( 0x00, "?" ) /* Not documented */
PORT_DIPSETTING( 0x01, "Recommended Setting" )
@@ -344,7 +344,7 @@ static INPUT_PORTS_START( changela )
PORT_DIPSETTING( 0x80, "1" )
PORT_DIPSETTING( 0x00, "2" )
- PORT_START_TAG("DSWB") /* DSWB */
+ PORT_START("DSWB") /* DSWB */
PORT_DIPNAME( 0x03, 0x00, "Max Bonus Fuels" ) PORT_DIPLOCATION("SWB:1,2")
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -367,7 +367,7 @@ static INPUT_PORTS_START( changela )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWC") /* DSWC - coinage */
+ PORT_START("DSWC") /* DSWC - coinage */
PORT_DIPNAME( 0xf0, 0x10, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SWC:5,6,7,8")
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
PORT_DIPSETTING( 0x90, DEF_STR( 2C_1C ) )
@@ -401,7 +401,7 @@ static INPUT_PORTS_START( changela )
PORT_DIPSETTING( 0x06, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x07, DEF_STR( 1C_7C ) )
- PORT_START_TAG("DSWD") /* DSWD - bonus */
+ PORT_START("DSWD") /* DSWD - bonus */
PORT_DIPNAME( 0x01, 0x01, "Right Slot" ) PORT_DIPLOCATION("SWD:1")
PORT_DIPSETTING( 0x01, "On Right (Bottom) Counter" )
PORT_DIPSETTING( 0x00, "On Left (Top) Counter" )
@@ -425,7 +425,7 @@ static INPUT_PORTS_START( changela )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("MCU") /* MCU */
+ PORT_START("MCU") /* MCU */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE )
@@ -438,21 +438,21 @@ static INPUT_PORTS_START( changela )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN0") /* 0xDx2C */
+ PORT_START("IN0") /* 0xDx2C */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Gear Shift") PORT_CODE(KEYCODE_SPACE) PORT_TOGGLE /* Gear shift */
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* FWD - negated bit 7 */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* REV - gear position */
- PORT_START_TAG("IN1") /* 0xDx2D */
+ PORT_START("IN1") /* 0xDx2D */
PORT_BIT( 0x03, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00, 0x02) PORT_SENSITIVITY(10) PORT_KEYDELTA(1) //gas pedal
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_TILT )
//PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) //gas1
//PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON2 ) //gas2
- PORT_START_TAG("WHEEL") /* 0xDx30 DRIVING_WHEEL */
+ PORT_START("WHEEL") /* 0xDx30 DRIVING_WHEEL */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(50) PORT_KEYDELTA(8)
INPUT_PORTS_END
diff --git a/src/mame/drivers/cheekyms.c b/src/mame/drivers/cheekyms.c
index b15f8a16672..875b22e24ff 100644
--- a/src/mame/drivers/cheekyms.c
+++ b/src/mame/drivers/cheekyms.c
@@ -38,8 +38,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READ(input_port_0_r)
- AM_RANGE(0x01, 0x01) AM_READ(input_port_1_r)
+ AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW")
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("INPUTS")
AM_RANGE(0x20, 0x3f) AM_WRITE(SMH_RAM) AM_BASE(&cheekyms_spriteram)
AM_RANGE(0x40, 0x40) AM_WRITE(cheekyms_port_40_w)
AM_RANGE(0x80, 0x80) AM_WRITE(cheekyms_port_80_w) AM_BASE(&cheekyms_port_80)
@@ -47,7 +47,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( cheekyms )
- PORT_START /* IN0 */
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "3" )
@@ -70,7 +70,7 @@ static INPUT_PORTS_START( cheekyms )
PORT_DIPSETTING( 0xc0, "6000" )
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
- PORT_START /* IN1 */
+ PORT_START("INPUTS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
@@ -80,7 +80,7 @@ static INPUT_PORTS_START( cheekyms )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START /* FAKE */
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
INPUT_PORTS_END
diff --git a/src/mame/drivers/cherrym.c b/src/mame/drivers/cherrym.c
index 540d616ae2f..ae1acb96665 100644
--- a/src/mame/drivers/cherrym.c
+++ b/src/mame/drivers/cherrym.c
@@ -143,13 +143,13 @@ static ADDRESS_MAP_START( cm_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x01, 0x01) AM_READ(AY8910_read_port_0_r)
AM_RANGE(0x02, 0x02) AM_WRITE(AY8910_write_port_0_w)
AM_RANGE(0x03, 0x03) AM_WRITE(AY8910_control_port_0_w)
- AM_RANGE(0x04, 0x04) AM_READ(input_port_0_r)
- AM_RANGE(0x05, 0x05) AM_READ(input_port_1_r)
- AM_RANGE(0x06, 0x06) AM_READ(input_port_2_r)
+ AM_RANGE(0x04, 0x04) AM_READ_PORT("PLAYER")
+ AM_RANGE(0x05, 0x05) AM_READ_PORT("COIN")
+ AM_RANGE(0x06, 0x06) AM_READ_PORT("TEST")
AM_RANGE(0x07, 0x07) AM_WRITENOP
- AM_RANGE(0x08, 0x08) AM_READ(input_port_3_r)
- AM_RANGE(0x09, 0x09) AM_READ(input_port_4_r)
- AM_RANGE(0x0a, 0x0a) AM_READ(input_port_5_r)
+ AM_RANGE(0x08, 0x08) AM_READ_PORT("DSW1")
+ AM_RANGE(0x09, 0x09) AM_READ_PORT("DSW2")
+ AM_RANGE(0x0a, 0x0a) AM_READ_PORT("DSW3")
AM_RANGE(0x0b, 0x0b) AM_WRITENOP
AM_RANGE(0x10, 0x10) AM_WRITENOP
AM_RANGE(0x11, 0x11) AM_WRITENOP
@@ -158,7 +158,7 @@ static ADDRESS_MAP_START( cm_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( cmv801 )
- PORT_START_TAG("PLAYER")
+ PORT_START("PLAYER")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 0") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 1") PORT_CODE(KEYCODE_W)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Big")
@@ -168,7 +168,7 @@ static INPUT_PORTS_START( cmv801 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Small")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 0") PORT_CODE(KEYCODE_A)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 1") PORT_CODE(KEYCODE_S)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -178,7 +178,7 @@ static INPUT_PORTS_START( cmv801 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 ) // Key-In
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // 10 Credits
- PORT_START_TAG("TEST")
+ PORT_START("TEST")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 0") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 1") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 2") PORT_CODE(KEYCODE_C)
@@ -188,7 +188,7 @@ static INPUT_PORTS_START( cmv801 )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_F2) PORT_NAME("Analyzer")
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPUNUSED_DIPLOC( 0x01, 0x00, "SW1:!1" ) /* Listed as "Unused" */
PORT_DIPNAME( 0x02, 0x00, "Hopper Out Switch" ) PORT_DIPLOCATION("SW1:!2")
PORT_DIPSETTING( 0x02, "Active High" )
@@ -211,7 +211,7 @@ static INPUT_PORTS_START( cmv801 )
PORT_DIPSETTING( 0x80, "64 Bet" )
PORT_DIPSETTING( 0xc0, "96 Bet" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x07, 0x07, "Main Game Pay-Rate" ) PORT_DIPLOCATION("SW2:!1,!2,!3")
PORT_DIPSETTING( 0x07, "55 30% 45" ) /* Displays 35% */
PORT_DIPSETTING( 0x06, "60 38% 50" ) /* Displays 40% */
@@ -236,7 +236,7 @@ static INPUT_PORTS_START( cmv801 )
PORT_DIPSETTING( 0x00, "Unlimited" )
PORT_DIPSETTING( 0x80, "Limited" ) /* "Number is fixed by 4-6" */
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x03, 0x03, "Key In Rate" ) PORT_DIPLOCATION("SW3:1,2")
PORT_DIPSETTING( 0x00, "1 Coin/10 Credits" ) PORT_CONDITION("DSW2",0x40,PORTCOND_EQUALS,0x40) // A-Type
PORT_DIPSETTING( 0x01, "1 Coin/20 Credits" ) PORT_CONDITION("DSW2",0x40,PORTCOND_EQUALS,0x40)
@@ -266,7 +266,7 @@ static INPUT_PORTS_START( cmv801 )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_5C ) )
PORT_DIPSETTING( 0x00, "1 Coin/10 Credits" )
- PORT_START_TAG("DSW4")
+ PORT_START("DSW4")
PORT_DIPNAME( 0x07, 0x07, "Credit Limit" ) PORT_DIPLOCATION("SW4:1,2,3")
PORT_DIPSETTING( 0x07, "5,000" )
PORT_DIPSETTING( 0x06, "10,000" )
@@ -292,7 +292,7 @@ static INPUT_PORTS_START( cmv801 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW5")
+ PORT_START("DSW5")
PORT_DIPNAME( 0x01, 0x01, "Display Of Doll On Demo" ) PORT_DIPLOCATION("SW5:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/cherrym2.c b/src/mame/drivers/cherrym2.c
index cf710e3dcf4..da54744e2bc 100644
--- a/src/mame/drivers/cherrym2.c
+++ b/src/mame/drivers/cherrym2.c
@@ -77,13 +77,13 @@ static ADDRESS_MAP_START( cm_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x01, 0x01) AM_READ(AY8910_read_port_0_r)
AM_RANGE(0x02, 0x02) AM_WRITE(AY8910_write_port_0_w)
AM_RANGE(0x03, 0x03) AM_WRITE(AY8910_control_port_0_w)
- AM_RANGE(0x04, 0x04) AM_READ(input_port_0_r)
- AM_RANGE(0x09, 0x09) AM_READ(input_port_1_r)
- AM_RANGE(0x0a, 0x0a) AM_READ(input_port_2_r)
+ AM_RANGE(0x04, 0x04) AM_READ_PORT("PLAYER")
+ AM_RANGE(0x09, 0x09) AM_READ_PORT("COIN")
+ AM_RANGE(0x0a, 0x0a) AM_READ_PORT("TEST")
ADDRESS_MAP_END
static INPUT_PORTS_START( cm2v841 )
- PORT_START_TAG("PLAYER")
+ PORT_START("PLAYER")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 0") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 1") PORT_CODE(KEYCODE_W)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 2") PORT_CODE(KEYCODE_E)
@@ -93,7 +93,7 @@ static INPUT_PORTS_START( cm2v841 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 6") PORT_CODE(KEYCODE_U)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 7") PORT_CODE(KEYCODE_I)
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 0") PORT_CODE(KEYCODE_A)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 1") PORT_CODE(KEYCODE_S)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 2") PORT_CODE(KEYCODE_D)
@@ -103,7 +103,7 @@ static INPUT_PORTS_START( cm2v841 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 6") PORT_CODE(KEYCODE_J)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 7") PORT_CODE(KEYCODE_K)
- PORT_START_TAG("TEST")
+ PORT_START("TEST")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 0") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 1") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 2") PORT_CODE(KEYCODE_C)
@@ -113,7 +113,7 @@ static INPUT_PORTS_START( cm2v841 )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 7") PORT_CODE(KEYCODE_L)
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -139,7 +139,7 @@ static INPUT_PORTS_START( cm2v841 )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -165,7 +165,7 @@ static INPUT_PORTS_START( cm2v841 )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -191,7 +191,7 @@ static INPUT_PORTS_START( cm2v841 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW4")
+ PORT_START("DSW4")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -217,7 +217,7 @@ static INPUT_PORTS_START( cm2v841 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW5")
+ PORT_START("DSW5")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c
index fa0bd15a62c..ff4d7539597 100644
--- a/src/mame/drivers/chinagat.c
+++ b/src/mame/drivers/chinagat.c
@@ -63,7 +63,8 @@ But the formats are the same (allowing for extra chars and colours)
Video hardware's like DD1 (thank god)
Input is unique but has a few similarities to DD2 (the coin inputs)
-
+2008-07
+Dip locations and factory settings verified with China Gate US manual.
*/
@@ -277,11 +278,11 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x3e07, 0x3e07) AM_WRITE(SMH_RAM) AM_BASE(&ddragon_scrollx_lo)
AM_RANGE(0x3f00, 0x3f00) AM_WRITE(chinagat_video_ctrl_w)
AM_RANGE(0x3f01, 0x3f01) AM_WRITE(chinagat_bankswitch_w)
- AM_RANGE(0x3f00, 0x3f00) AM_READ(input_port_0_r)
- AM_RANGE(0x3f01, 0x3f01) AM_READ(input_port_1_r)
- AM_RANGE(0x3f02, 0x3f02) AM_READ(input_port_2_r)
- AM_RANGE(0x3f03, 0x3f03) AM_READ(input_port_3_r)
- AM_RANGE(0x3f04, 0x3f04) AM_READ(input_port_4_r)
+ AM_RANGE(0x3f00, 0x3f00) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0x3f01, 0x3f01) AM_READ_PORT("DSW1")
+ AM_RANGE(0x3f02, 0x3f02) AM_READ_PORT("DSW2")
+ AM_RANGE(0x3f03, 0x3f03) AM_READ_PORT("P1")
+ AM_RANGE(0x3f04, 0x3f04) AM_READ_PORT("P2")
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1)
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -351,15 +352,15 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( chinagat )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START
- PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
+ PORT_START("DSW1")
+ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
@@ -368,7 +369,7 @@ static INPUT_PORTS_START( chinagat )
PORT_DIPSETTING( 0x05, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_5C ) )
- PORT_DIPNAME( 0x38, 0x38, DEF_STR( Coin_B ) )
+ PORT_DIPNAME( 0x38, 0x38, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:4,5,6")
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) )
@@ -377,36 +378,36 @@ static INPUT_PORTS_START( chinagat )
PORT_DIPSETTING( 0x28, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x20, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0x18, DEF_STR( 1C_5C ) )
- /*PORT_DIPNAME( 0x40, 0x00, DEF_STR( Cabinet ) )
+ /*PORT_DIPNAME( 0x40, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:7")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) )*/
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_DIPNAME( 0x80, 0x80, DEF_STR( Flip_Screen ) )
+ PORT_DIPNAME( 0x80, 0x80, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
- PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
+ PORT_START("DSW2")
+ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x02, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_DIPNAME( 0x04, 0x04, DEF_STR( Demo_Sounds ) )
+ PORT_DIPNAME( 0x04, 0x04, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:3")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x04, DEF_STR( On ))
- PORT_DIPNAME( 0x30, 0x30, "Timer" )
+ PORT_DIPSETTING( 0x04, DEF_STR( On ) )
+ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // "SW2:4" - Left empty in the manual
+ PORT_DIPNAME( 0x30, 0x20, "Timer" ) PORT_DIPLOCATION("SW2:5,6")
PORT_DIPSETTING( 0x00, "50" )
PORT_DIPSETTING( 0x20, "55" )
PORT_DIPSETTING( 0x30, "60" )
PORT_DIPSETTING( 0x10, "70" )
- PORT_DIPNAME( 0xc0, 0x80, DEF_STR( Lives ) )
+ PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:7,8")
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0xc0, "2" )
PORT_DIPSETTING( 0x80, "3" )
PORT_DIPSETTING( 0x40, "4" )
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
@@ -416,7 +417,7 @@ static INPUT_PORTS_START( chinagat )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c
index 6733b900547..8d74c526fbf 100644
--- a/src/mame/drivers/chinsan.c
+++ b/src/mame/drivers/chinsan.c
@@ -204,7 +204,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( chinsan )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "DSW1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -230,7 +230,7 @@ static INPUT_PORTS_START( chinsan )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, "DSW2" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -257,7 +257,7 @@ static INPUT_PORTS_START( chinsan )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("MAHJONG_P1_1")
+ PORT_START("MAHJONG_P1_1")
PORT_DIPNAME( 0x01, 0x01, "1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -282,7 +282,7 @@ static INPUT_PORTS_START( chinsan )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // adds coins?, but maybe its the service switch?
- PORT_START_TAG("MAHJONG_P1_2")
+ PORT_START("MAHJONG_P1_2")
PORT_DIPNAME( 0x01, 0x01, "1-2" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -308,7 +308,7 @@ static INPUT_PORTS_START( chinsan )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("MAHJONG_P1_3")
+ PORT_START("MAHJONG_P1_3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
@@ -318,7 +318,7 @@ static INPUT_PORTS_START( chinsan )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
- PORT_START_TAG("MAHJONG_P1_4")
+ PORT_START("MAHJONG_P1_4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
@@ -328,7 +328,7 @@ static INPUT_PORTS_START( chinsan )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
- PORT_START_TAG("MAHJONG_P1_5")
+ PORT_START("MAHJONG_P1_5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_N )
@@ -338,7 +338,7 @@ static INPUT_PORTS_START( chinsan )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
- PORT_START_TAG("MAHJONG_P1_6")
+ PORT_START("MAHJONG_P1_6")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_M )
@@ -348,7 +348,7 @@ static INPUT_PORTS_START( chinsan )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
- PORT_START_TAG("MAHJONG_P2_1")
+ PORT_START("MAHJONG_P2_1")
PORT_DIPNAME( 0x01, 0x01, "2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -374,7 +374,7 @@ static INPUT_PORTS_START( chinsan )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("MAHJONG_P2_2")
+ PORT_START("MAHJONG_P2_2")
PORT_DIPNAME( 0x01, 0x01, "2-2" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -400,7 +400,7 @@ static INPUT_PORTS_START( chinsan )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("MAHJONG_P2_3")
+ PORT_START("MAHJONG_P2_3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) PORT_PLAYER(2)
@@ -410,7 +410,7 @@ static INPUT_PORTS_START( chinsan )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
- PORT_START_TAG("MAHJONG_P2_4")
+ PORT_START("MAHJONG_P2_4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) PORT_PLAYER(2)
@@ -420,7 +420,7 @@ static INPUT_PORTS_START( chinsan )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
- PORT_START_TAG("MAHJONG_P2_5")
+ PORT_START("MAHJONG_P2_5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_N ) PORT_PLAYER(2)
@@ -430,7 +430,7 @@ static INPUT_PORTS_START( chinsan )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
- PORT_START_TAG("MAHJONG_P2_6")
+ PORT_START("MAHJONG_P2_6")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_M ) PORT_PLAYER(2)
diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c
index 5388d640e69..52fed4eaa36 100644
--- a/src/mame/drivers/chqflag.c
+++ b/src/mame/drivers/chqflag.c
@@ -6,6 +6,9 @@ Notes:
- Position counter doesn't behave correctly because of the K051733 protection.
- 007232 volume & panning control is almost certainly wrong.
+2008-07
+Dip locations and recommended settings verified with manual
+
***************************************************************************/
#include "driver.h"
@@ -220,8 +223,8 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( chqflag )
- PORT_START_TAG("DSW1") /* DSW #1 */
- PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
+ PORT_START("DSW1")
+ PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 2C_1C ) )
@@ -237,7 +240,7 @@ static INPUT_PORTS_START( chqflag )
PORT_DIPSETTING( 0x0b, DEF_STR( 1C_5C ) )
PORT_DIPSETTING( 0x0a, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x09, DEF_STR( 1C_7C ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW1:5,6,7,8")
PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x20, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x50, DEF_STR( 3C_1C ) )
@@ -256,38 +259,26 @@ static INPUT_PORTS_START( chqflag )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Coin Slot 2 Invalidity" )
- PORT_START_TAG("DSW2") /* DSW #2 (according to the manual SW1 thru SW5 are not used) */
- PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x60, 0x40, DEF_STR( Difficulty ) )
+ PORT_START("DSW2")
+ PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW2:1" ) /* Manual says it's not used */
+ PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "SW2:2" ) /* Manual says it's not used */
+ PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "SW2:3" ) /* Manual says it's not used */
+ PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "SW2:4" ) /* Manual says it's not used */
+ PORT_DIPUNUSED_DIPLOC( 0x10, 0x10, "SW2:5" ) /* Manual says it's not used */
+ PORT_DIPNAME( 0x60, 0x40, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:6,7")
PORT_DIPSETTING( 0x60, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x40, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x20, "Difficult" )
PORT_DIPSETTING( 0x00, "Very difficult" )
- PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) )
+ PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unused ) ) /* DIPSW #3 - SW4 */
- PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW3:4" ) /* Manual says it's not used */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
/* COINSW + STARTSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -295,24 +286,22 @@ static INPUT_PORTS_START( chqflag )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
/* DIPSW #3 */
- PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x40, 0x40, "Title" )
+ PORT_DIPUNUSED_DIPLOC( 0x20, 0x20, "SW3:1" ) /* Manual says it's not used */
+ PORT_DIPNAME( 0x40, 0x40, "Title" ) PORT_DIPLOCATION("SW3:2")
PORT_DIPSETTING( 0x40, "Chequered Flag" )
PORT_DIPSETTING( 0x00, "Checkered Flag" )
- PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
+ PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW3:3" )
- PORT_START_TAG("IN2") /* Brake, Shift + ??? */
+ PORT_START("IN2") /* Brake, Shift + ??? */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_TOGGLE
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* if this is set, it goes directly to test mode */
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* if bit 7 == 0, the game resets */
- PORT_START_TAG("IN3") /* Accelerator */
+ PORT_START("IN3") /* Accelerator */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5)
- PORT_START_TAG("IN4") /* Driving wheel */
+ PORT_START("IN4") /* Driving wheel */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10,0xef) PORT_SENSITIVITY(80) PORT_KEYDELTA(8)
INPUT_PORTS_END
diff --git a/src/mame/drivers/cidelsa.c b/src/mame/drivers/cidelsa.c
index 9cb5f4afb11..26d961fe89d 100644
--- a/src/mame/drivers/cidelsa.c
+++ b/src/mame/drivers/cidelsa.c
@@ -394,7 +394,7 @@ static CUSTOM_INPUT( cdp1869_predisplay_r )
}
static INPUT_PORTS_START( destryer )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) // CARTUCHO
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 ) // 1P
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) // 2P
@@ -404,7 +404,7 @@ static INPUT_PORTS_START( destryer )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(cdp1869_pcb_r, 0)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x00, "Very Conserv" )
PORT_DIPSETTING( 0x01, "Conserv" )
@@ -426,7 +426,7 @@ static INPUT_PORTS_START( destryer )
PORT_DIPSETTING( 0x40, "Slot A: 2 Slot B: 4" )
PORT_DIPSETTING( 0x00, "Slot A: 2.5 Slot B: 5" )
- PORT_START_TAG("EF")
+ PORT_START("EF")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(cdp1869_predisplay_r, 0)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) // ST
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 ) // M2
@@ -434,7 +434,7 @@ static INPUT_PORTS_START( destryer )
INPUT_PORTS_END
static INPUT_PORTS_START( altair )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) // CARTUCHO
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 ) // 1P
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) // 2P
@@ -444,7 +444,7 @@ static INPUT_PORTS_START( altair )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(cdp1869_pcb_r, 0)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x00, "Very Conserv" )
PORT_DIPSETTING( 0x01, "Conserv" )
@@ -466,7 +466,7 @@ static INPUT_PORTS_START( altair )
PORT_DIPSETTING( 0x40, "Slot A: 2 Slot B: 4" )
PORT_DIPSETTING( 0x00, "Slot A: 2.5 Slot B: 5" )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) // UP
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) // DN
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) // IN
@@ -476,7 +476,7 @@ static INPUT_PORTS_START( altair )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("EF")
+ PORT_START("EF")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(cdp1869_predisplay_r, 0)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) // ST
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 ) // M2
@@ -484,7 +484,7 @@ static INPUT_PORTS_START( altair )
INPUT_PORTS_END
static INPUT_PORTS_START( draco )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT )
@@ -494,7 +494,7 @@ static INPUT_PORTS_START( draco )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(cdp1869_pcb_r, 0)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x00, "Very Conserv" )
PORT_DIPSETTING( 0x01, "Conserv" )
@@ -518,7 +518,7 @@ static INPUT_PORTS_START( draco )
PORT_DIPSETTING( 0x20, "Slot A: 2.5 Slot B: 3" )
PORT_DIPSETTING( 0x00, "Slot A: 3 Slot B: 6" )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_UP )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT )
@@ -528,7 +528,7 @@ static INPUT_PORTS_START( draco )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT )
- PORT_START_TAG("EF")
+ PORT_START("EF")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(cdp1869_predisplay_r, 0)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) // ST
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 ) // M2
diff --git a/src/mame/drivers/cinemat.c b/src/mame/drivers/cinemat.c
index c72054f2a71..b34971eb6ce 100644
--- a/src/mame/drivers/cinemat.c
+++ b/src/mame/drivers/cinemat.c
@@ -342,7 +342,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( spacewar )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Option 3") PORT_CODE(KEYCODE_3_PAD)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Option 8") PORT_CODE(KEYCODE_8_PAD)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Option 4") PORT_CODE(KEYCODE_4_PAD)
@@ -360,7 +360,7 @@ static INPUT_PORTS_START( spacewar )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_START_TAG("SWITCHES")
+ PORT_START("SWITCHES")
PORT_DIPNAME( 0x03, 0x00, "Time" )
PORT_DIPSETTING( 0x03, "0:45/coin" )
PORT_DIPSETTING( 0x00, "1:00/coin" )
@@ -378,7 +378,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( barrier )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Skill A") PORT_CODE(KEYCODE_A)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Skill B") PORT_CODE(KEYCODE_B)
@@ -396,7 +396,7 @@ static INPUT_PORTS_START( barrier )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2)
- PORT_START_TAG("SWITCHES")
+ PORT_START("SWITCHES")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "5" )
@@ -423,14 +423,14 @@ INPUT_PORTS_END
static INPUT_PORTS_START( speedfrk )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_SPECIAL ) /* steering wheel, fake below */
PORT_BIT( 0x0070, IP_ACTIVE_LOW, IPT_SPECIAL ) /* gear shift, fake below */
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) /* gas */
PORT_BIT( 0xfe00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SWITCHES")
+ PORT_START("SWITCHES")
PORT_DIPNAME( 0x03, 0x02, "Extra Time" )
PORT_DIPSETTING( 0x00, "69" )
PORT_DIPSETTING( 0x01, "99" )
@@ -453,10 +453,10 @@ static INPUT_PORTS_START( speedfrk )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
- PORT_START_TAG("WHEEL")
+ PORT_START("WHEEL")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_RESET
- PORT_START_TAG("GEAR")
+ PORT_START("GEAR")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_NAME("1st gear") PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_NAME("2nd gear") PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_NAME("3rd gear") PORT_PLAYER(2)
@@ -466,7 +466,7 @@ INPUT_PORTS_END
/* TODO: 4way or 8way stick? */
static INPUT_PORTS_START( starhawk )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -483,7 +483,7 @@ static INPUT_PORTS_START( starhawk )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_START_TAG("SWITCHES")
+ PORT_START("SWITCHES")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Game_Time ) )
PORT_DIPSETTING( 0x03, "2:00/4:00" )
PORT_DIPSETTING( 0x01, "1:30/3:00" )
@@ -501,7 +501,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( sundance )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SPECIAL ) /* P1 Pad */
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -519,7 +519,7 @@ static INPUT_PORTS_START( sundance )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SPECIAL ) /* P1 Pad */
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_SPECIAL ) /* P2 Pad */
- PORT_START_TAG("SWITCHES")
+ PORT_START("SWITCHES")
PORT_DIPNAME( 0x03, 0x02, "Time" )
PORT_DIPSETTING( 0x00, "0:45/coin" )
PORT_DIPSETTING( 0x02, "1:00/coin" )
@@ -542,7 +542,7 @@ static INPUT_PORTS_START( sundance )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
- PORT_START_TAG("PAD1")
+ PORT_START("PAD1")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 Pad 1") PORT_CODE(KEYCODE_7_PAD) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 Pad 2") PORT_CODE(KEYCODE_8_PAD) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 Pad 3") PORT_CODE(KEYCODE_9_PAD) PORT_PLAYER(1)
@@ -553,7 +553,7 @@ static INPUT_PORTS_START( sundance )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 Pad 8") PORT_CODE(KEYCODE_2_PAD) PORT_PLAYER(1)
PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 Pad 9") PORT_CODE(KEYCODE_3_PAD) PORT_PLAYER(1)
- PORT_START_TAG("PAD2")
+ PORT_START("PAD2")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 Pad 1") PORT_CODE(KEYCODE_Q) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 Pad 2") PORT_CODE(KEYCODE_W) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 Pad 3") PORT_CODE(KEYCODE_E) PORT_PLAYER(2)
@@ -567,14 +567,14 @@ INPUT_PORTS_END
static INPUT_PORTS_START( tailg )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x001f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SWITCHES")
+ PORT_START("SWITCHES")
PORT_DIPNAME( 0x23, 0x23, "Shield Points" )
PORT_DIPSETTING( 0x00, "15" )
PORT_DIPSETTING( 0x02, "20" )
@@ -598,16 +598,16 @@ static INPUT_PORTS_START( tailg )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
- PORT_START_TAG("ANALOGX")
+ PORT_START("ANALOGX")
PORT_BIT( 0xfff, 0x800, IPT_AD_STICK_X ) PORT_MINMAX(0x200,0xe00) PORT_SENSITIVITY(100) PORT_KEYDELTA(50)
- PORT_START_TAG("ANALOGY")
+ PORT_START("ANALOGY")
PORT_BIT( 0xfff, 0x800, IPT_AD_STICK_Y ) PORT_MINMAX(0x200,0xe00) PORT_SENSITIVITY(100) PORT_KEYDELTA(50)
INPUT_PORTS_END
static INPUT_PORTS_START( warrior )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
@@ -621,7 +621,7 @@ static INPUT_PORTS_START( warrior )
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0xe000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SWITCHES")
+ PORT_START("SWITCHES")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -646,7 +646,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( armora )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
@@ -659,7 +659,7 @@ static INPUT_PORTS_START( armora )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_START_TAG("SWITCHES")
+ PORT_START("SWITCHES")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -682,7 +682,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( ripoff )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
@@ -695,7 +695,7 @@ static INPUT_PORTS_START( ripoff )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_START_TAG("SWITCHES")
+ PORT_START("SWITCHES")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "4" )
PORT_DIPSETTING( 0x03, "8" )
@@ -718,7 +718,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( starcas )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START2 )
@@ -732,7 +732,7 @@ static INPUT_PORTS_START( starcas )
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xe000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SWITCHES")
+ PORT_START("SWITCHES")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -755,7 +755,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( solarq )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) /* nova */
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) /* fire */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) /* thrust */
@@ -764,7 +764,7 @@ static INPUT_PORTS_START( solarq )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SWITCHES")
+ PORT_START("SWITCHES")
PORT_DIPNAME( 0x05, 0x05, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_3C ) )
@@ -787,7 +787,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( boxingb )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
@@ -797,7 +797,7 @@ static INPUT_PORTS_START( boxingb )
PORT_BIT( 0x0fc0, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xf000, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* dial */
- PORT_START_TAG("SWITCHES")
+ PORT_START("SWITCHES")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_3C ) )
@@ -818,13 +818,13 @@ static INPUT_PORTS_START( boxingb )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
- PORT_START_TAG("DIAL")
+ PORT_START("DIAL")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_REVERSE PORT_SENSITIVITY(100) PORT_KEYDELTA(5)
INPUT_PORTS_END
static INPUT_PORTS_START( wotw )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START2 )
@@ -838,7 +838,7 @@ static INPUT_PORTS_START( wotw )
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xe000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SWITCHES")
+ PORT_START("SWITCHES")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -863,7 +863,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( demon )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1)
@@ -881,7 +881,7 @@ static INPUT_PORTS_START( demon )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* also mapped to Button 3, player 2 */
- PORT_START_TAG("SWITCHES")
+ PORT_START("SWITCHES")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_3C ) )
@@ -905,7 +905,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( qb3 )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT )
@@ -927,7 +927,7 @@ static INPUT_PORTS_START( qb3 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_SPECIAL )
- PORT_START_TAG("SWITCHES")
+ PORT_START("SWITCHES")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x02, "3" )
diff --git a/src/mame/drivers/circus.c b/src/mame/drivers/circus.c
index 3d06d160984..aae0460554f 100644
--- a/src/mame/drivers/circus.c
+++ b/src/mame/drivers/circus.c
@@ -27,6 +27,9 @@ D000 Paddle Position and Interrupt Reset
Notes:
* Circus: Taito licensed and releasd the game as "Acrobat TV"
+
+ 2008-07
+ Dip locations verified with the manuals.
***************************************************************************/
@@ -56,10 +59,10 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1000, 0x1fff) AM_READ(SMH_ROM)
AM_RANGE(0x4000, 0x43ff) AM_READ(SMH_RAM)
AM_RANGE(0x8000, 0x8000) AM_READ(SMH_RAM)
- AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r)
- AM_RANGE(0xc000, 0xc000) AM_READ(input_port_1_r) /* DSW */
- AM_RANGE(0xd000, 0xd000) AM_READ(input_port_2_r) //AT
- //AM_RANGE(0xd000, 0xd000) AM_READ(ripcord_IN2_r)
+ AM_RANGE(0xa000, 0xa000) AM_READ_PORT("INPUTS")
+ AM_RANGE(0xc000, 0xc000) AM_READ_PORT("DSW")
+ AM_RANGE(0xd000, 0xd000) AM_READ_PORT("PADDLE")
+// AM_RANGE(0xd000, 0xd000) AM_READ(ripcord_IN2_r)
AM_RANGE(0xf000, 0xffff) AM_READ(SMH_ROM)
ADDRESS_MAP_END
@@ -75,76 +78,73 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( circus )
- PORT_START /* IN0 */
+ PORT_START("INPUTS")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x7c, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START /* Dip Switch */
- PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
+ PORT_START("DSW")
+ PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("14A:6,7")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "5" )
PORT_DIPSETTING( 0x02, "7" )
PORT_DIPSETTING( 0x03, "9" )
- PORT_DIPNAME( 0x0c, 0x04, DEF_STR( Coinage ) )
+ PORT_DIPNAME( 0x0c, 0x04, DEF_STR( Coinage ) ) PORT_DIPLOCATION("14A:4,5")
// PORT_DIPSETTING( 0x08, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x0c, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_2C ) )
- PORT_DIPNAME( 0x10, 0x00, "High Score" )
+ PORT_DIPNAME( 0x10, 0x00, "High Score" ) PORT_DIPLOCATION("14A:3")
PORT_DIPSETTING( 0x10, "Credit Awarded" )
PORT_DIPSETTING( 0x00, "No Award" )
- PORT_DIPNAME( 0x20, 0x00, "Bonus" )
+ PORT_DIPNAME( 0x20, 0x00, "Bonus" ) PORT_DIPLOCATION("14A:2")
PORT_DIPSETTING( 0x00, "Single Line" )
PORT_DIPSETTING( 0x20, "Super Bonus" )
- PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x40, DEF_STR( On ) )
+ PORT_DIPUNKNOWN_DIPLOC( 0x40, 0x00, "14A:1" ) /* Not mentioned in the manual */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START /* IN2 - paddle */
+ PORT_START("PADDLE")
PORT_BIT( 0xff, 115, IPT_PADDLE ) PORT_MINMAX(64,167) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_CENTERDELTA(0)
INPUT_PORTS_END
static INPUT_PORTS_START( robotbwl )
- PORT_START /* IN0 */
+ PORT_START("INPUTS")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 )
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Hook Right") PORT_CODE(KEYCODE_X)
- PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Hook Left") PORT_CODE(KEYCODE_Z)
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Hook Right") PORT_CODE(KEYCODE_X)
+ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Hook Left") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START /* Dip Switch */
- PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x01, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x02, DEF_STR( On ) )
- PORT_DIPNAME( 0x04, 0x04, "Beer Frame" )
+ PORT_START("DSW")
+ PORT_DIPUNKNOWN_DIPLOC( 0x01, 0x00, "14A:7" ) /* Manual says it's unused */
+ PORT_DIPUNKNOWN_DIPLOC( 0x02, 0x00, "14A:6" ) /* Manual says it's unused */
+ PORT_DIPNAME( 0x04, 0x04, "Beer Frame" ) PORT_DIPLOCATION("14A:5")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x04, DEF_STR( On ) )
- PORT_DIPNAME( 0x18, 0x08, DEF_STR( Coinage ) )
+ PORT_DIPNAME( 0x18, 0x08, DEF_STR( Coinage ) ) PORT_DIPLOCATION("14A:3,4")
PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_2C ) )
// PORT_DIPSETTING( 0x18, DEF_STR( 1C_2C ) )
- PORT_DIPNAME( 0x60, 0x00, "Bowl Timer" )
+ PORT_DIPNAME( 0x60, 0x00, "Bowl Timer" ) PORT_DIPLOCATION("14A:1,2")
PORT_DIPSETTING( 0x00, "3 seconds" )
PORT_DIPSETTING( 0x20, "5 seconds" )
PORT_DIPSETTING( 0x40, "7 seconds" )
PORT_DIPSETTING( 0x60, "9 seconds" )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
+
+ PORT_START("PADDLE")
+ PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
INPUT_PORTS_END
static INPUT_PORTS_START( crash )
- PORT_START /* IN0 */
+ PORT_START("INPUTS")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -154,33 +154,36 @@ static INPUT_PORTS_START( crash )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START /* Dip Switch */
- PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
+ PORT_START("DSW")
+ PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("14A:6,7")
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x02, "4" )
PORT_DIPSETTING( 0x03, "5" )
- PORT_DIPNAME( 0x0C, 0x04, DEF_STR( Coinage ) )
+ PORT_DIPNAME( 0x0C, 0x04, DEF_STR( Coinage ) ) PORT_DIPLOCATION("14A:4,5")
// PORT_DIPSETTING( 0x0c, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_2C ) )
- PORT_DIPNAME( 0x10, 0x00, "High Score" )
+ PORT_DIPNAME( 0x10, 0x00, "High Score" ) PORT_DIPLOCATION("14A:3")
PORT_DIPSETTING( 0x00, "No Award" )
PORT_DIPSETTING( 0x10, "Credit Awarded" )
- PORT_BIT( 0x60, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+ PORT_BIT( 0x60, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // "14A:1,2" not mentioned in the manual
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("R63")
+ PORT_START("PADDLE")
+ PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+
+ PORT_START("R63")
PORT_ADJUSTER( 90, "R63 - Music Volume" )
- PORT_START_TAG("R39")
+ PORT_START("R39")
PORT_ADJUSTER( 40, "R39 - Beeper Volume" )
INPUT_PORTS_END
static INPUT_PORTS_START( ripcord )
- PORT_START /* IN0 */
+ PORT_START("INPUTS")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 )
@@ -190,23 +193,24 @@ static INPUT_PORTS_START( ripcord )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START /* Dip Switch */
- PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
+ PORT_START("DSW")
+ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("14A:6,7")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "5" )
PORT_DIPSETTING( 0x02, "7" )
PORT_DIPSETTING( 0x03, "9" )
- PORT_DIPNAME( 0x0c, 0x04, DEF_STR( Coinage ) )
+ PORT_DIPNAME( 0x0c, 0x04, DEF_STR( Coinage ) ) PORT_DIPLOCATION("14A:4,5")
// PORT_DIPSETTING( 0x0c, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_2C ) )
- PORT_DIPNAME( 0x10, 0x00, "High Score" )
+ PORT_DIPNAME( 0x10, 0x00, "High Score" ) PORT_DIPLOCATION("14A:3")
PORT_DIPSETTING( 0x10, "Award Credit" )
PORT_DIPSETTING( 0x00, "No Award" )
+ /* "14A:1,2" switches are not mentioned in the manual */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START /* IN2 - paddle */
+ PORT_START("PADDLE")
PORT_BIT( 0xff, 115, IPT_PADDLE ) PORT_MINMAX(64,167) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_REVERSE
INPUT_PORTS_END
diff --git a/src/mame/drivers/circusc.c b/src/mame/drivers/circusc.c
index 6e4131f4a7a..72d3ca82cc9 100644
--- a/src/mame/drivers/circusc.c
+++ b/src/mame/drivers/circusc.c
@@ -115,12 +115,12 @@ static WRITE8_HANDLER(circusc_sound_w)
static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x03fc) AM_READ(input_port_0_r) /* IO Coin */
- AM_RANGE(0x1001, 0x1001) AM_MIRROR(0x03fc) AM_READ(input_port_1_r) /* P1 IO */
- AM_RANGE(0x1002, 0x1002) AM_MIRROR(0x03fc) AM_READ(input_port_2_r) /* P2 IO */
+ AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x03fc) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0x1001, 0x1001) AM_MIRROR(0x03fc) AM_READ_PORT("P1")
+ AM_RANGE(0x1002, 0x1002) AM_MIRROR(0x03fc) AM_READ_PORT("P2")
AM_RANGE(0x1003, 0x1003) AM_MIRROR(0x03fc) AM_READNOP /* unpopulated DIPSW 3*/
- AM_RANGE(0x1400, 0x1400) AM_MIRROR(0x03ff) AM_READ(input_port_3_r) /* DIPSW 1 */
- AM_RANGE(0x1800, 0x1800) AM_MIRROR(0x03ff) AM_READ(input_port_4_r) /* DIPSW 2 */
+ AM_RANGE(0x1400, 0x1400) AM_MIRROR(0x03ff) AM_READ_PORT("DSW1")
+ AM_RANGE(0x1800, 0x1800) AM_MIRROR(0x03ff) AM_READ_PORT("DSW2")
AM_RANGE(0x2000, 0x2fff) AM_READ(SMH_RAM)
AM_RANGE(0x3000, 0x33ff) AM_READ(SMH_RAM) /* colorram */
AM_RANGE(0x3400, 0x37ff) AM_READ(SMH_RAM) /* videoram */
@@ -165,7 +165,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( circusc )
- PORT_START /* IN0 */
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -175,7 +175,7 @@ static INPUT_PORTS_START( circusc )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN1 */
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) /* 1P UP - unused */
@@ -185,7 +185,7 @@ static INPUT_PORTS_START( circusc )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN2 */
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) /* 2P UP - unused */
@@ -194,8 +194,8 @@ static INPUT_PORTS_START( circusc )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) /* 2P SHOOT2 - unused */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* DSW0 */
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -231,7 +231,7 @@ static INPUT_PORTS_START( circusc )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
- PORT_START /* DSW1 */
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c
index 1c8eab53ccf..bee1eac2e6e 100644
--- a/src/mame/drivers/cischeat.c
+++ b/src/mame/drivers/cischeat.c
@@ -582,13 +582,13 @@ static ADDRESS_MAP_START( readmem_scudhamm, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0a0000, 0x0a3fff) AM_READ(SMH_RAM ) // Scroll RAM 0
AM_RANGE(0x0b0000, 0x0b3fff) AM_READ(SMH_RAM ) // Scroll RAM 2
AM_RANGE(0x0b8000, 0x0bffff) AM_READ(SMH_RAM ) // Palette
- AM_RANGE(0x100008, 0x100009) AM_READ(input_port_0_word_r ) // Buttons
+ AM_RANGE(0x100008, 0x100009) AM_READ_PORT("IN0") // Buttons
AM_RANGE(0x100014, 0x100015) AM_READ(OKIM6295_status_0_lsb_r ) // Sound
AM_RANGE(0x100018, 0x100019) AM_READ(OKIM6295_status_1_lsb_r ) //
AM_RANGE(0x100040, 0x100041) AM_READ(scudhamm_analog_r ) // A / D
AM_RANGE(0x100044, 0x100045) AM_READ(scudhamm_motor_pos_r ) // Motor Position
AM_RANGE(0x100050, 0x100051) AM_READ(scudhamm_motor_status_r ) // Motor Limit Switches
- AM_RANGE(0x10005c, 0x10005d) AM_READ(input_port_2_word_r ) // 2 x DSW
+ AM_RANGE(0x10005c, 0x10005d) AM_READ_PORT("IN2") // 2 x DSW
ADDRESS_MAP_END
static ADDRESS_MAP_START( writemem_scudhamm, ADDRESS_SPACE_PROGRAM, 16 )
@@ -678,8 +678,8 @@ static ADDRESS_MAP_START( readmem_armchmp2, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0a0000, 0x0a3fff) AM_READ(SMH_RAM ) // Scroll RAM 0
AM_RANGE(0x0b0000, 0x0b3fff) AM_READ(SMH_RAM ) // Scroll RAM 2
AM_RANGE(0x0b8000, 0x0bffff) AM_READ(SMH_RAM ) // Palette
- AM_RANGE(0x100000, 0x100001) AM_READ(input_port_2_word_r ) // DSW
- AM_RANGE(0x100004, 0x100005) AM_READ(input_port_3_word_r ) // DSW
+ AM_RANGE(0x100000, 0x100001) AM_READ_PORT("IN2") // DSW
+ AM_RANGE(0x100004, 0x100005) AM_READ_PORT("IN3") // DSW
AM_RANGE(0x100008, 0x100009) AM_READ(armchmp2_buttons_r ) // Buttons + Sensors
AM_RANGE(0x10000c, 0x10000d) AM_READ(armchmp2_analog_r ) // A / D
AM_RANGE(0x100010, 0x100011) AM_READ(armchmp2_motor_status_r ) // Motor Limit Switches?
@@ -994,12 +994,12 @@ ADDRESS_MAP_END
// [4] DSW 1 & 2 [5] DSW 3 [6] Driving Wheel
static INPUT_PORTS_START( bigrun )
- PORT_START_TAG("FAKE") // IN0 - Fake input port - Buttons status
+ PORT_START("FAKE") // IN0 - Fake input port - Buttons status
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("P1 Accelerator")\
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("P1 Low Gear")\
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("P1 High Gear")\
- PORT_START_TAG("IN1") // Coins - $80000.w
+ PORT_START("IN1") // Coins - $80000.w
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1009,7 +1009,7 @@ static INPUT_PORTS_START( bigrun )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") //Controls - $80002.w
+ PORT_START("IN2") //Controls - $80002.w
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Brake") // Brake
// PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) // Shift - We handle it using buttons 3&4
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1019,7 +1019,7 @@ static INPUT_PORTS_START( bigrun )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("P1 Horn") // Horn
- PORT_START_TAG("IN3") // Motor Control? - $80004.w
+ PORT_START("IN3") // Motor Control? - $80004.w
PORT_DIPNAME( 0x01, 0x01, "Up Limit SW" ) // Limit the Cockpit movements?
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1039,7 +1039,7 @@ static INPUT_PORTS_START( bigrun )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN4") // DSW 2 & 3 - $80006.w
+ PORT_START("IN4") // DSW 2 & 3 - $80006.w
// DSW 3
PORT_DIPNAME( 0x0003, 0x0003, "Extra Setting For Coin B" )
PORT_DIPSETTING( 0x0003, DEF_STR( Unused ) )
@@ -1096,7 +1096,7 @@ static INPUT_PORTS_START( bigrun )
PORT_DIPSETTING( 0x2000, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Free_Play ) )
- PORT_START_TAG("IN5") // DSW 3 (4 bits, Cabinet Linking) - $82200.w
+ PORT_START("IN5") // DSW 3 (4 bits, Cabinet Linking) - $82200.w
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x06, 0x00, "Unit ID" )
PORT_DIPSETTING( 0x00, "1 (Blue-White Car)" )
@@ -1109,7 +1109,7 @@ static INPUT_PORTS_START( bigrun )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN6") // Driving Wheel - $80010.w(0)
+ PORT_START("IN6") // Driving Wheel - $80010.w(0)
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30)
INPUT_PORTS_END
@@ -1123,11 +1123,11 @@ INPUT_PORTS_END
// [4] DSW 1 & 2 [5] DSW 3 [6] Driving Wheel
static INPUT_PORTS_START( cischeat )
- PORT_START_TAG("FAKE") // Fake input port - Buttons status
+ PORT_START("FAKE") // Fake input port - Buttons status
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("P1 Low Gear")\
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("P1 High Gear")\
- PORT_START_TAG("IN1") // Coins - $80000.w
+ PORT_START("IN1") // Coins - $80000.w
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1137,7 +1137,7 @@ static INPUT_PORTS_START( cischeat )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") // Controls - $80002.w
+ PORT_START("IN2") // Controls - $80002.w
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Brake") // Brake
// PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) // Shift - We handle it using buttons 3&4
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1147,7 +1147,7 @@ static INPUT_PORTS_START( cischeat )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("P1 Horn") // Horn
- PORT_START_TAG("IN3") // Motor Control? - $80004.w
+ PORT_START("IN3") // Motor Control? - $80004.w
PORT_DIPNAME( 0x01, 0x01, "Up Limit SW" ) // Limit the Cockpit movements?
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1165,7 +1165,7 @@ static INPUT_PORTS_START( cischeat )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN4") // DSW 1 & 2 - $80006.w -> !f000a.w(hi byte) !f0008.w(low byte)
+ PORT_START("IN4") // DSW 1 & 2 - $80006.w -> !f000a.w(hi byte) !f0008.w(low byte)
COINAGE_6BITS_2
PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) ) // unused?
PORT_DIPSETTING( 0x0040, DEF_STR( Off ) )
@@ -1197,7 +1197,7 @@ static INPUT_PORTS_START( cischeat )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN5") // DSW 3 (4 bits, Cabinet Linking) - $82200.w
+ PORT_START("IN5") // DSW 3 (4 bits, Cabinet Linking) - $82200.w
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x06, 0x06, "Unit ID (2)" ) // -> f0020 (like DSW2 !!)
PORT_DIPSETTING( 0x06, "Use other" )
@@ -1210,7 +1210,7 @@ static INPUT_PORTS_START( cischeat )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN6") // IN6 - Driving Wheel - $80010.w(0)
+ PORT_START("IN6") // IN6 - Driving Wheel - $80010.w(0)
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30)
INPUT_PORTS_END
@@ -1225,7 +1225,7 @@ INPUT_PORTS_END
// [6] Coinage JP&USA [7] Coinage UK&FR
static INPUT_PORTS_START( f1gpstar )
- PORT_START_TAG("FAKE") // Fake input port - Buttons status
+ PORT_START("FAKE") // Fake input port - Buttons status
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("P1 Accelerator")\
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("P1 Low Gear")\
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("P1 High Gear")\
@@ -1237,7 +1237,7 @@ static INPUT_PORTS_START( f1gpstar )
Europe English, Mph , "steering shock", "(c)1992"
France French, Km/h, "steering shock", "(c)1992" */
- PORT_START_TAG("IN1") // DSW 1 & 2 - $80000.w -> !f9012
+ PORT_START("IN1") // DSW 1 & 2 - $80000.w -> !f9012
// DSW 1 ( Coinage - it changes with Country: we use IN6 & IN7 )
PORT_DIPNAME( 0x0040, 0x0040, "Free Play (EU & FR)" )
PORT_DIPSETTING( 0x0040, DEF_STR( Off ) )
@@ -1269,7 +1269,7 @@ static INPUT_PORTS_START( f1gpstar )
PORT_DIPSETTING( 0x8000, "Torque" )
PORT_DIPSETTING( 0x0000, "Shake" )
- PORT_START_TAG("IN2") // Controls - $80004.w -> !f9016
+ PORT_START("IN2") // Controls - $80004.w -> !f9016
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1279,7 +1279,7 @@ static INPUT_PORTS_START( f1gpstar )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Brake")// Brake -> !f9010
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 ) // "Race Together"
- PORT_START_TAG("IN3") // ? Read at boot only - $80006.w
+ PORT_START("IN3") // ? Read at boot only - $80006.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1303,7 +1303,7 @@ static INPUT_PORTS_START( f1gpstar )
ON-OFF Blue-White Car
ON- ON Blue Car, "equipped with communication link" */
- PORT_START_TAG("IN4") // DSW 3 (4 bits, Cabinet Linking) - $8000c.w -> !f9014
+ PORT_START("IN4") // DSW 3 (4 bits, Cabinet Linking) - $8000c.w -> !f9014
PORT_DIPNAME( 0x01, 0x01, "This Unit Is" )
PORT_DIPSETTING( 0x01, "Slave" )
PORT_DIPSETTING( 0x00, "Master" )
@@ -1319,10 +1319,10 @@ static INPUT_PORTS_START( f1gpstar )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
// Accelerator - $80010.b -> !f9004.w
- PORT_START_TAG("IN5") // Driving Wheel - $80011.b -> !f9008.w
+ PORT_START("IN5") // Driving Wheel - $80011.b -> !f9008.w
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30)
- PORT_START_TAG("IN6") // Coinage Japan & USA (it changes with Country)
+ PORT_START("IN6") // Coinage Japan & USA (it changes with Country)
PORT_DIPNAME( 0x0007, 0x0007, "Coin A (JP US)" )
PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 3C_1C ) )
@@ -1341,7 +1341,7 @@ static INPUT_PORTS_START( f1gpstar )
PORT_DIPSETTING( 0x0028, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x0020, DEF_STR( 1C_4C ) )
- PORT_START_TAG("IN7") // Coinage Europe & France (it changes with Country)
+ PORT_START("IN7") // Coinage Europe & France (it changes with Country)
PORT_DIPNAME( 0x0007, 0x0007, "Coin A (EU FR)" )
PORT_DIPSETTING( 0x0007, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 2C_3C ) )
@@ -1368,7 +1368,7 @@ INPUT_PORTS_END
**************************************************************************/
static INPUT_PORTS_START( wildplt )
- PORT_START_TAG("IN0") // DSW 1 & 2
+ PORT_START("IN0") // DSW 1 & 2
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 3C_1C ) )
@@ -1417,7 +1417,7 @@ static INPUT_PORTS_START( wildplt )
PORT_DIPSETTING( 0xc000, DEF_STR( Japan ) )
PORT_DIPSETTING( 0x0000, "France?" )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 ) //service 1 too
@@ -1435,10 +1435,10 @@ static INPUT_PORTS_START( wildplt )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Senser SW. #2
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Emergency Button") //E Stop for motors? ( Senser SW. #3 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_SENSITIVITY(35) PORT_KEYDELTA(15) PORT_REVERSE
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_SENSITIVITY(35) PORT_KEYDELTA(15)
INPUT_PORTS_END
@@ -1448,7 +1448,7 @@ INPUT_PORTS_END
**************************************************************************/
static INPUT_PORTS_START( scudhamm )
- PORT_START_TAG("IN0") // Buttons
+ PORT_START("IN0") // Buttons
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) // GAME OVER if pressed on the selection screen
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1467,10 +1467,10 @@ static INPUT_PORTS_START( scudhamm )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_TILT )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") // A/D
+ PORT_START("IN1") // A/D
PORT_BIT( 0x00ff, 0x0000, IPT_PADDLE ) PORT_MINMAX(0x0000,0x00ff) PORT_SENSITIVITY(1) PORT_KEYDELTA(0)
- PORT_START_TAG("IN2") // DSW
+ PORT_START("IN2") // DSW
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
@@ -1526,7 +1526,7 @@ INPUT_PORTS_END
**************************************************************************/
static INPUT_PORTS_START( armchmp2 )
- PORT_START_TAG("IN0") // Buttons + Sensors
+ PORT_START("IN0") // Buttons + Sensors
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SPECIAL ) // left sensor
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SPECIAL ) // right sensor
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SPECIAL ) // center sensor
@@ -1540,10 +1540,10 @@ static INPUT_PORTS_START( armchmp2 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON2 ) // easy
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON3 ) // elbow (it always complains though)
- PORT_START_TAG("IN1") // A/D
+ PORT_START("IN1") // A/D
PORT_BIT( 0x00ff, 0x0000, IPT_DIAL ) PORT_MINMAX(0x0000,0x00ff) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START_TAG("IN2") // DSW
+ PORT_START("IN2") // DSW
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
@@ -1565,7 +1565,7 @@ static INPUT_PORTS_START( armchmp2 )
PORT_DIPSETTING( 0x0040, DEF_STR( Europe ) )
PORT_DIPSETTING( 0x0000, DEF_STR( World ) )
- PORT_START_TAG("IN3") // DSW
+ PORT_START("IN3") // DSW
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/citycon.c b/src/mame/drivers/citycon.c
index 1de72553721..1ac70962f6b 100644
--- a/src/mame/drivers/citycon.c
+++ b/src/mame/drivers/citycon.c
@@ -1,6 +1,9 @@
/***************************************************************************
+2008-07
+Dip locations added from dip listing at crazykong.com
+
***************************************************************************/
#include "driver.h"
@@ -21,7 +24,7 @@ VIDEO_START( citycon );
static READ8_HANDLER( citycon_in_r )
{
- return input_port_read(machine, flip_screen_get() ? "IN1" : "IN0");
+ return input_port_read(machine, flip_screen_get() ? "P2" : "P1");
}
@@ -29,8 +32,8 @@ static READ8_HANDLER( citycon_in_r )
static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_RAM)
AM_RANGE(0x3000, 0x3000) AM_READ(citycon_in_r) /* player 1 & 2 inputs multiplexed */
- AM_RANGE(0x3001, 0x3001) AM_READ_PORT("IN2")
- AM_RANGE(0x3002, 0x3002) AM_READ_PORT("IN3")
+ AM_RANGE(0x3001, 0x3001) AM_READ_PORT("DSW1")
+ AM_RANGE(0x3002, 0x3002) AM_READ_PORT("DSW2")
AM_RANGE(0x3007, 0x3007) AM_READ(watchdog_reset_r) /* ? */
AM_RANGE(0x4000, 0xffff) AM_READ(SMH_ROM)
ADDRESS_MAP_END
@@ -67,7 +70,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( citycon )
- PORT_START_TAG("IN0")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
@@ -77,7 +80,7 @@ static INPUT_PORTS_START( citycon )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
@@ -87,32 +90,26 @@ static INPUT_PORTS_START( citycon )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
- PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
+ PORT_START("DSW1")
+ PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
PORT_DIPSETTING( 0x02, "5" )
PORT_DIPSETTING( 0x03, "Infinite (Cheat)")
- PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x04, DEF_STR( On ) )
- PORT_DIPNAME( 0x08, 0x00, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x08, DEF_STR( On ) )
- PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x10, DEF_STR( On ) )
- PORT_DIPNAME( 0x20, 0x00, DEF_STR( Demo_Sounds ) )
+ PORT_DIPUNKNOWN_DIPLOC( 0x04, 0x00, "SW1:3" )
+ PORT_DIPUNKNOWN_DIPLOC( 0x08, 0x00, "SW1:4" )
+ PORT_DIPUNKNOWN_DIPLOC( 0x10, 0x00, "SW1:5" )
+ PORT_DIPNAME( 0x20, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:6")
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x40, 0x00, DEF_STR( Cabinet ) )
+ PORT_DIPNAME( 0x40, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:7")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) )
/* the coin input must stay low for exactly 2 frames to be consistently recognized. */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
- PORT_START_TAG("IN3")
- PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
+ PORT_START("DSW2")
+ PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW2:1,2,3")
PORT_DIPSETTING( 0x07, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x06, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -121,21 +118,17 @@ static INPUT_PORTS_START( citycon )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_4C ) )
- PORT_DIPNAME( 0x08, 0x00, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x08, DEF_STR( On ) )
- PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x10, DEF_STR( On ) )
- PORT_DIPNAME( 0x20, 0x00, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x20, DEF_STR( On ) )
- PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x40, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x08, 0x00, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:4")
+ PORT_DIPSETTING( 0x00, DEF_STR( Easy ) )
+ PORT_DIPSETTING( 0x08, DEF_STR( Hard ) )
+ PORT_DIPUNKNOWN_DIPLOC( 0x10, 0x00, "SW2:5" )
+ PORT_DIPUNKNOWN_DIPLOC( 0x20, 0x00, "SW2:6" )
+ PORT_DIPUNKNOWN_DIPLOC( 0x40, 0x00, "SW2:7" )
+ /* According to manual this is Flip Screen setting */
+// PORT_DIPNAME( 0x80, 0x80, DEF_STR( Flip Screen ) ) PORT_DIPLOCATION("SW2:8")
+// PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
+// PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x80, "SW2:8" )
INPUT_PORTS_END
diff --git a/src/mame/drivers/clayshoo.c b/src/mame/drivers/clayshoo.c
index b0daed904a7..0c8a9d365d8 100644
--- a/src/mame/drivers/clayshoo.c
+++ b/src/mame/drivers/clayshoo.c
@@ -236,7 +236,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( clayshoo )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_3C ) )
@@ -250,7 +250,7 @@ static INPUT_PORTS_START( clayshoo )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x07, 0x01, "Time/Bonus 1P-2P" )
PORT_DIPSETTING( 0x00, "60/6k-90/6k" )
PORT_DIPSETTING( 0x01, "60/6k-120/8k" )
@@ -262,7 +262,7 @@ static INPUT_PORTS_START( clayshoo )
PORT_DIPSETTING( 0x07, "90/11.5k-190/13k" )
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* doesn't appear to be used */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x03, IP_ACTIVE_LOW, IPT_SPECIAL ) /* amateur/expert/pro Player 2 */
PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_SPECIAL ) /* amateur/expert/pro Player 1 */
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START1 )
@@ -270,19 +270,19 @@ static INPUT_PORTS_START( clayshoo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("AN1") /* IN4 - Fake analog control. Visible in $c800 bit 1 */
+ PORT_START("AN1") /* IN4 - Fake analog control. Visible in $c800 bit 1 */
PORT_BIT( 0x0f, 0x08, IPT_AD_STICK_Y ) PORT_MINMAX(0,0x0f) PORT_SENSITIVITY(10) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("AN2") /* IN5 - Fake analog control. Visible in $c800 bit 0 */
+ PORT_START("AN2") /* IN5 - Fake analog control. Visible in $c800 bit 0 */
PORT_BIT( 0x0f, 0x08, IPT_AD_STICK_Y ) PORT_MINMAX(0,0x0f) PORT_SENSITIVITY(10) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2)
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("FAKE") /* IN6 - Fake. Visible in IN2 bits 0-1 and 2-3 */
+ PORT_START("FAKE") /* IN6 - Fake. Visible in IN2 bits 0-1 and 2-3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_TOGGLE PORT_PLAYER(2) PORT_NAME("P2 Amateur Difficulty")
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_TOGGLE PORT_PLAYER(2) PORT_NAME("P2 Expert Difficulty")
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_TOGGLE PORT_PLAYER(2) PORT_NAME("P2 Pro Difficulty")
diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c
index 597f9e1d61c..449e6c6a9f8 100644
--- a/src/mame/drivers/cliffhgr.c
+++ b/src/mame/drivers/cliffhgr.c
@@ -310,12 +310,12 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( cliffhgr )
- PORT_START_TAG("BANK0")
+ PORT_START("BANK0")
PORT_BIT ( 0x3F, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 ) /* SW2 on CPU PCB */
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) /* SW1 on CPU PCB */
- PORT_START_TAG("BANK1")
+ PORT_START("BANK1")
PORT_DIPNAME( 0xc0, 0xc0, "Should Have Hint" ) PORT_DIPLOCATION("E11:7,8")
PORT_DIPSETTING( 0xc0, "Never" )
PORT_DIPSETTING( 0x80, "After 1st Player Mistake" )
@@ -339,7 +339,7 @@ static INPUT_PORTS_START( cliffhgr )
PORT_DIPSETTING( 0x01, "5" )
PORT_DIPSETTING( 0x00, "6" )
- PORT_START_TAG("BANK2")
+ PORT_START("BANK2")
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("F11:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -364,7 +364,7 @@ static INPUT_PORTS_START( cliffhgr )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
- PORT_START_TAG("BANK3")
+ PORT_START("BANK3")
PORT_DIPNAME( 0x80, 0x00, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("G11:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -390,7 +390,7 @@ static INPUT_PORTS_START( cliffhgr )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("BANK4")
+ PORT_START("BANK4")
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("H11:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -421,7 +421,7 @@ static INPUT_PORTS_START( cliffhgr )
PORT_DIPSETTING( 0x01, "14" )
PORT_DIPSETTING( 0x00, "15 (Hardest)" )
- PORT_START_TAG("BANK5")
+ PORT_START("BANK5")
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -431,7 +431,7 @@ static INPUT_PORTS_START( cliffhgr )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_TILT )
- PORT_START_TAG("BANK6")
+ PORT_START("BANK6")
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
@@ -440,12 +440,12 @@ static INPUT_PORTS_START( cliffhgr )
INPUT_PORTS_END
static INPUT_PORTS_START( cliffhga )
- PORT_START_TAG("BANK0")
+ PORT_START("BANK0")
PORT_BIT ( 0x3F, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 ) /* SW2 on CPU PCB */
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) /* SW1 on CPU PCB */
- PORT_START_TAG("BANK1")
+ PORT_START("BANK1")
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("E11:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -470,7 +470,7 @@ static INPUT_PORTS_START( cliffhga )
PORT_DIPSETTING( 0x01, "5" )
PORT_DIPSETTING( 0x00, "6" )
- PORT_START_TAG("BANK2")
+ PORT_START("BANK2")
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("F11:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -495,7 +495,7 @@ static INPUT_PORTS_START( cliffhga )
// PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
- PORT_START_TAG("BANK3")
+ PORT_START("BANK3")
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("G11:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -521,7 +521,7 @@ static INPUT_PORTS_START( cliffhga )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("BANK4")
+ PORT_START("BANK4")
PORT_DIPNAME( 0xf0, 0xf0, "Hint Difficulty" ) PORT_DIPLOCATION("H11:5,6,7,8")
PORT_DIPSETTING( 0xf0, "0 (Most Hints)" )
PORT_DIPSETTING( 0xe0, "1" )
@@ -557,7 +557,7 @@ static INPUT_PORTS_START( cliffhga )
PORT_DIPSETTING( 0x01, "14" )
PORT_DIPSETTING( 0x00, "15 (Hardest)" )
- PORT_START_TAG("BANK5")
+ PORT_START("BANK5")
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -567,7 +567,7 @@ static INPUT_PORTS_START( cliffhga )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_TILT )
- PORT_START_TAG("BANK6")
+ PORT_START("BANK6")
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
@@ -576,12 +576,12 @@ static INPUT_PORTS_START( cliffhga )
INPUT_PORTS_END
static INPUT_PORTS_START( goaltogo )
- PORT_START_TAG("BANK0")
+ PORT_START("BANK0")
PORT_BIT ( 0x3F, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 ) /* SW2 on CPU PCB */
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) /* SW1 on CPU PCB */
- PORT_START_TAG("BANK1")
+ PORT_START("BANK1")
PORT_DIPNAME( 0x80, 0x80, "Should Have Hint" ) PORT_DIPLOCATION("E11:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -607,7 +607,7 @@ static INPUT_PORTS_START( goaltogo )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("BANK2")
+ PORT_START("BANK2")
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("F11:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -632,7 +632,7 @@ static INPUT_PORTS_START( goaltogo )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
- PORT_START_TAG("BANK3")
+ PORT_START("BANK3")
PORT_DIPNAME( 0x80, 0x00, "Display Diagram Before Play" ) PORT_DIPLOCATION("G11:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -658,7 +658,7 @@ static INPUT_PORTS_START( goaltogo )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("BANK4")
+ PORT_START("BANK4")
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPLOCATION("H11:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -689,7 +689,7 @@ static INPUT_PORTS_START( goaltogo )
PORT_DIPSETTING( 0x01, "14" )
PORT_DIPSETTING( 0x00, "15 (Hardest)" )
- PORT_START_TAG("BANK5")
+ PORT_START("BANK5")
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -699,7 +699,7 @@ static INPUT_PORTS_START( goaltogo )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_TILT )
- PORT_START_TAG("BANK6")
+ PORT_START("BANK6")
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
diff --git a/src/mame/drivers/cloak.c b/src/mame/drivers/cloak.c
index efcc8ce94c5..6aeafbbe629 100644
--- a/src/mame/drivers/cloak.c
+++ b/src/mame/drivers/cloak.c
@@ -93,6 +93,10 @@
Motion object ROM: 136023.307,136023.308
Playfield ROM: 136023.306,136023.305
+
+
+ 2008-07
+ Dip locations and suggested settings verified with manual.
****************************************************************************/
@@ -164,9 +168,9 @@ static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1000, 0x100f) AM_READWRITE(pokey1_r, pokey1_w) /* DSW0 also */
// AM_RANGE(0x1008, 0x1008) AM_READ(SMH_RAM)
AM_RANGE(0x1800, 0x180f) AM_READWRITE(pokey2_r, pokey2_w) /* DSW1 also */
- AM_RANGE(0x2000, 0x2000) AM_READ(input_port_0_r) /* IN0 */
- AM_RANGE(0x2200, 0x2200) AM_READ(input_port_1_r) /* IN1 */
- AM_RANGE(0x2400, 0x2400) AM_READ(input_port_2_r) /* IN2 */
+ AM_RANGE(0x2000, 0x2000) AM_READ_PORT("P1")
+ AM_RANGE(0x2200, 0x2200) AM_READ_PORT("P2")
+ AM_RANGE(0x2400, 0x2400) AM_READ_PORT("SYSTEM")
AM_RANGE(0x2600, 0x2600) AM_WRITE(cloak_custom_w)
AM_RANGE(0x2800, 0x29ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
AM_RANGE(0x3000, 0x30ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size)
@@ -208,7 +212,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( cloak )
- PORT_START /* IN0 */
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_UP ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_8WAY
@@ -218,10 +222,10 @@ static INPUT_PORTS_START( cloak )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_8WAY
- PORT_START /* IN1 */
+ PORT_START("P2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) // player 2 controls, not used
- PORT_START /* IN2 */
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_SERVICE( 0x02, IP_ACTIVE_LOW )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -231,31 +235,31 @@ static INPUT_PORTS_START( cloak )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) // player 2 button 1, not used
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START /* IN3 */
+ PORT_START("START")
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED ) // not connected
PORT_BIT( 0x30, IP_ACTIVE_HIGH, IPT_UNUSED ) // pulled high
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START /* DSW0 */
- PORT_DIPNAME( 0x03, 0x02, "Credits" )
+ PORT_START("DSW")
+ PORT_DIPNAME( 0x03, 0x02, "Credits" ) PORT_DIPLOCATION("5A:!7,!8")
PORT_DIPSETTING( 0x02, "1 Credit/1 Game" )
PORT_DIPSETTING( 0x01, "1 Credit/2 Games" )
PORT_DIPSETTING( 0x03, "2 Credits/1 Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
- PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Coin_B ) )
+ PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("5A:!5,!6")
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 1C_5C ) )
PORT_DIPSETTING( 0x0c, DEF_STR( 1C_6C ) )
- PORT_DIPNAME( 0x10, 0x00, DEF_STR( Coin_A ) )
+ PORT_DIPNAME( 0x10, 0x00, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("5A:!4")
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x10, DEF_STR( 1C_2C ) )
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_DIPNAME( 0x40, 0x00, "Demo Freeze Mode" ) // when active, press button 1 to freeze
+ PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED ) // "5A:!3" - it must be OFF according to manual.
+ PORT_DIPNAME( 0x40, 0x00, "Demo Freeze Mode" ) PORT_DIPLOCATION("5A:!2") // when active, press button 1 to freeze
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) // "5A:!1" - Not Used according to manual.
INPUT_PORTS_END
diff --git a/src/mame/drivers/cloud9.c b/src/mame/drivers/cloud9.c
index a5a1d99bc77..ca6fb6bf75c 100644
--- a/src/mame/drivers/cloud9.c
+++ b/src/mame/drivers/cloud9.c
@@ -330,7 +330,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( cloud9 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x07, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE( 0x08, IP_ACTIVE_LOW )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -338,14 +338,14 @@ static INPUT_PORTS_START( cloud9 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(get_vblank, 0)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -362,16 +362,16 @@ static INPUT_PORTS_START( cloud9 )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
- PORT_START_TAG("TRACKY")
+ PORT_START("TRACKY")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_REVERSE
- PORT_START_TAG("TRACKX")
+ PORT_START("TRACKX")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30)
INPUT_PORTS_END
static INPUT_PORTS_START( firebeas )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x07, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE( 0x08, IP_ACTIVE_LOW )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -379,7 +379,7 @@ static INPUT_PORTS_START( firebeas )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(get_vblank, 0)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x07, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -387,7 +387,7 @@ static INPUT_PORTS_START( firebeas )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -413,10 +413,10 @@ static INPUT_PORTS_START( firebeas )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("TRACKY")
+ PORT_START("TRACKY")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_REVERSE
- PORT_START_TAG("TRACKX")
+ PORT_START("TRACKX")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_REVERSE
INPUT_PORTS_END
diff --git a/src/mame/drivers/clshroad.c b/src/mame/drivers/clshroad.c
index b8d4018c074..83e6a9a45e7 100644
--- a/src/mame/drivers/clshroad.c
+++ b/src/mame/drivers/clshroad.c
@@ -49,8 +49,8 @@ static MACHINE_RESET( clshroad )
static READ8_HANDLER( clshroad_input_r )
{
- return ((~input_port_read(machine, "IN0") & (1 << offset)) ? 1 : 0) |
- ((~input_port_read(machine, "IN1") & (1 << offset)) ? 2 : 0) |
+ return ((~input_port_read(machine, "P1") & (1 << offset)) ? 1 : 0) |
+ ((~input_port_read(machine, "P2") & (1 << offset)) ? 2 : 0) |
((~input_port_read(machine, "DSW1") & (1 << offset)) ? 4 : 0) |
((~input_port_read(machine, "DSW2") & (1 << offset)) ? 8 : 0) ;
}
@@ -80,27 +80,27 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( clshroad )
- PORT_START_TAG("IN0") // Player 1
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("IN1") // Player 2
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_COCKTAIL
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_COCKTAIL
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
-
- PORT_START_TAG("DSW1")
+ PORT_START("P1")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START("P2")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_COCKTAIL
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_COCKTAIL
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
+
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -124,7 +124,7 @@ static INPUT_PORTS_START( clshroad )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
/*
first bit OFF is: 0 0 <- value
1 1
@@ -164,27 +164,27 @@ But the values seems unused then.
INPUT_PORTS_END
static INPUT_PORTS_START( firebatl )
- PORT_START_TAG("IN0")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("IN1")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_COCKTAIL
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_COCKTAIL
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
-
- PORT_START_TAG("DSW1")
+ PORT_START("P1")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START("P2")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_COCKTAIL
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_COCKTAIL
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
+
+ PORT_START("DSW1")
PORT_DIPNAME( 0x7f, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x01, "2" )
@@ -198,7 +198,7 @@ static INPUT_PORTS_START( firebatl )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c
index 92d1761ecad..1b8e57a124b 100644
--- a/src/mame/drivers/cninja.c
+++ b/src/mame/drivers/cninja.c
@@ -429,16 +429,16 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( edrandy )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
DATAEAST_2BUTTON
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
DATAEAST_COINAGE
PORT_DIPNAME( 0x0040, 0x0000, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:7")
@@ -483,16 +483,16 @@ INPUT_PORTS_END
static INPUT_PORTS_START( cninja )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
DATAEAST_2BUTTON
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW") /* Dip switch bank 1 */
+ PORT_START("DSW") /* Dip switch bank 1 */
DATAEAST_COINAGE
@@ -537,7 +537,7 @@ static INPUT_PORTS_START( cninjau )
INPUT_PORTS_END
static INPUT_PORTS_START( robocop2 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -555,13 +555,13 @@ static INPUT_PORTS_START( robocop2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW") /* Dip switch bank 1 */
+ PORT_START("DSW") /* Dip switch bank 1 */
DATAEAST_COINAGE
@@ -594,7 +594,7 @@ static INPUT_PORTS_START( robocop2 )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x0003, 0x0003, "Bullets" ) PORT_DIPLOCATION("SW3:1,2") /* Dip switch bank 3 */
PORT_DIPSETTING( 0x0000, "Least" )
PORT_DIPSETTING( 0x0001, "Less" )
@@ -620,16 +620,16 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mutantf )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
DATAEAST_2BUTTON
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW") /* Dip switch bank 1 */
+ PORT_START("DSW") /* Dip switch bank 1 */
DATAEAST_COINAGE
diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c
index e2a7f7a0071..0d245e4eb7f 100644
--- a/src/mame/drivers/cntsteer.c
+++ b/src/mame/drivers/cntsteer.c
@@ -343,13 +343,13 @@ static ADDRESS_MAP_START( cntsteer_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(cntsteer_foreground_w) AM_BASE(&videoram)
AM_RANGE(0x2800, 0x2fff) AM_RAM
-// { 0x1b00, 0x1b00, input_port_0_r },
-// { 0x1b01, 0x1b01, input_port_0_r },
-// { 0x3000, 0x3003, zerotrgt_ctrl_w },
-// { 0x3000, 0x3000, cntsteer_halt_cpu0_w },
-// { 0x3001, 0x3001, gekitsui_int2_w },
+// AM_RANGE(0x1b00, 0x1b00) AM_READ_PORT("DSW0")
+// AM_RANGE(0x1b01, 0x1b01) AM_READ_PORT("DSW0")
+// AM_RANGE(0x3000, 0x3003) AM_WRITE(zerotrgt_ctrl_w)
+// AM_RANGE(0x3000, 0x3000) AM_WRITE(cntsteer_halt_cpu0_w)
+// AM_RANGE(0x3001, 0x3001) AM_WRITE(gekitsui_int2_w)
-// AM_RANGE(0x3003, 0x3003) AM_READ(input_port_1_r)
+// AM_RANGE(0x3003, 0x3003) AM_READ_PORT("DSW1")
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -357,19 +357,19 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( cntsteer_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE(1)
AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(cntsteer_background_w) AM_BASE(&videoram2)
- AM_RANGE(0x3000, 0x3000) AM_READ(input_port_0_r)
- AM_RANGE(0x3001, 0x3001) AM_READ(input_port_1_r)
- AM_RANGE(0x3002, 0x3002) AM_READ(input_port_2_r)
- AM_RANGE(0x3003, 0x3003) AM_READ(input_port_3_r)
-// { 0x3002, 0x3002, gekitsui_int_w },
-// { 0x3000, 0x3003, zerotrgt_ctrl_w },
+ AM_RANGE(0x3000, 0x3000) AM_READ_PORT("DSW0")
+ AM_RANGE(0x3001, 0x3001) AM_READ_PORT("DSW1")
+ AM_RANGE(0x3002, 0x3002) AM_READ_PORT("P1")
+ AM_RANGE(0x3003, 0x3003) AM_READ_PORT("P2")
+// AM_RANGE(0x3002, 0x3002) AM_WRITE(gekitsui_int_w)
+// AM_RANGE(0x3000, 0x3003) AM_WRITE(zerotrgt_ctrl_w)
// wrong 0 1 2 3 are scroll/rotate
-// { 0x3002, 0x3002, cntsteer_restart_cpu0_w },
-// { 0x3000, 0x3003, MWA_NOP },
+// AM_RANGE(0x3002, 0x3002) AM_WRITE(cntsteer_restart_cpu0_w)
+// AM_RANGE(0x3000, 0x3003) AM_WRITENOP
// 3007 and 3003 have values..
AM_RANGE(0x3007, 0x3007) AM_WRITE(cntsteer_sound_w)
-// { 0x300a, 0x300a, cntsteer_int_w },
-// { 0x3004, 0x3004, cntsteer_int_w },
+// AM_RANGE(0x300a, 0x300a) AM_WRITE(cntsteer_int_w)
+// AM_RANGE(0x3004, 0x3004) AM_WRITE(cntsteer_int_w)
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
#endif
@@ -454,10 +454,10 @@ static WRITE8_HANDLER(scrivi)
static ADDRESS_MAP_START( gekitsui_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE(1)
AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(cntsteer_background_w) AM_BASE(&videoram2)
- AM_RANGE(0x3000, 0x3000) AM_READ(input_port_0_r)
- AM_RANGE(0x3001, 0x3001) AM_READ(input_port_1_r)
- AM_RANGE(0x3002, 0x3002) AM_READ(input_port_2_r)
- AM_RANGE(0x3003, 0x3003) AM_READ(input_port_3_r)
+ AM_RANGE(0x3000, 0x3000) AM_READ_PORT("DSW0")
+ AM_RANGE(0x3001, 0x3001) AM_READ_PORT("DSW1")
+ AM_RANGE(0x3002, 0x3002) AM_READ_PORT("P1")
+ AM_RANGE(0x3003, 0x3003) AM_READ_PORT("P2")
AM_RANGE(0x3000, 0x3004) AM_WRITE(scrivi) /* Scroll, gfx? */
AM_RANGE(0x3005, 0x3005) AM_WRITE(gekitsui_sub_irq_ack)
AM_RANGE(0x3007, 0x3007) AM_WRITE(cntsteer_sound_w)
@@ -487,7 +487,7 @@ ADDRESS_MAP_END
/***************************************************************************/
static INPUT_PORTS_START( cntsteer )
- PORT_START
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x01, "0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -513,7 +513,7 @@ static INPUT_PORTS_START( cntsteer )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -539,7 +539,7 @@ static INPUT_PORTS_START( cntsteer )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -549,7 +549,7 @@ static INPUT_PORTS_START( cntsteer )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -567,7 +567,7 @@ INPUT_PORTS_END
#ifdef UNUSED_DEFINITION
static INPUT_PORTS_START( zerotrgt )
- PORT_START
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x01, "0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -593,7 +593,7 @@ static INPUT_PORTS_START( zerotrgt )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -619,7 +619,7 @@ static INPUT_PORTS_START( zerotrgt )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -629,7 +629,7 @@ static INPUT_PORTS_START( zerotrgt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c
index 7dc807fd2a7..c2872761039 100644
--- a/src/mame/drivers/coinmstr.c
+++ b/src/mame/drivers/coinmstr.c
@@ -182,29 +182,29 @@ static ADDRESS_MAP_START( supnudg2_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( quizmstr )
- PORT_START
- PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1) PORT_NAME("Bookkeeping") PORT_TOGGLE /* Button 2 for second page, Button 3 erases data */
- PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
- PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_SERVICE) PORT_TOGGLE
- PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 )
-
- PORT_START
- PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 )
- PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_BUTTON5 )
- PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 )
- PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
- /* If 0x40 is HIGH the DIP Test Mode does work but bookkeeping shows always 0's */
- /* If 0x40 is LOW Bookkeeping does work, but the second page (selected categories) is missing */
- PORT_BIT ( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START
+ PORT_START("IN0")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1) PORT_NAME("Bookkeeping") PORT_TOGGLE /* Button 2 for second page, Button 3 erases data */
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE) PORT_TOGGLE
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 )
+
+ PORT_START("IN1")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON5 )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
+ /* If 0x40 is HIGH the DIP Test Mode does work but bookkeeping shows always 0's */
+ /* If 0x40 is LOW Bookkeeping does work, but the second page (selected categories) is missing */
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START("IN2")
PORT_DIPNAME( 0x01, 0x01, "2-01" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -230,7 +230,7 @@ static INPUT_PORTS_START( quizmstr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN3")
PORT_DIPNAME( 0x01, 0x01, "3-01" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -256,7 +256,7 @@ static INPUT_PORTS_START( quizmstr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN4")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -284,7 +284,7 @@ static INPUT_PORTS_START( quizmstr )
INPUT_PORTS_END
static INPUT_PORTS_START( trailblz )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -298,7 +298,7 @@ static INPUT_PORTS_START( trailblz )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_DIPNAME( 0x02, 0x02, "1" )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -316,7 +316,7 @@ static INPUT_PORTS_START( trailblz )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN2")
PORT_DIPNAME( 0x01, 0x01, "2" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -342,7 +342,7 @@ static INPUT_PORTS_START( trailblz )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN3")
PORT_DIPNAME( 0x01, 0x01, "3" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -368,7 +368,7 @@ static INPUT_PORTS_START( trailblz )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN4")
PORT_DIPNAME( 0x01, 0x01, "4" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -396,7 +396,7 @@ static INPUT_PORTS_START( trailblz )
INPUT_PORTS_END
static INPUT_PORTS_START( supnudg2 )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -410,7 +410,7 @@ static INPUT_PORTS_START( supnudg2 )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_HIGH )
- PORT_START
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_DIPNAME( 0x02, 0x02, "1" )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -428,7 +428,7 @@ static INPUT_PORTS_START( supnudg2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN2")
PORT_DIPNAME( 0x01, 0x01, "2" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -454,7 +454,7 @@ static INPUT_PORTS_START( supnudg2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN3")
PORT_DIPNAME( 0x01, 0x01, "3" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -480,7 +480,7 @@ static INPUT_PORTS_START( supnudg2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN4")
PORT_DIPNAME( 0x01, 0x01, "4" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/cojag.c b/src/mame/drivers/cojag.c
index 25bd98ff653..52f8b4bb19c 100644
--- a/src/mame/drivers/cojag.c
+++ b/src/mame/drivers/cojag.c
@@ -484,11 +484,6 @@ static READ32_HANDLER( jaguar_wave_rom_r )
*
*************************************/
-static READ32_HANDLER( jamma_r )
-{
- return input_port_read(machine, "IN0") | (input_port_read(machine, "IN1") << 16);
-}
-
static READ32_HANDLER( status_r )
{
@@ -499,7 +494,7 @@ static READ32_HANDLER( status_r )
// D5 = /VOLUMEUP
// D4 = /VOLUMEDOWN
// D3-D0 = ACTC4-1
- return input_port_read(machine, "IN2") | (input_port_read(machine, "IN2") << 16);
+ return input_port_read(machine, "SYSTEM") | (input_port_read(machine, "SYSTEM") << 16);
}
@@ -819,8 +814,8 @@ static ADDRESS_MAP_START( r3000_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x04f10000, 0x04f103ff) AM_READWRITE(jaguar_jerry_regs32_r, jaguar_jerry_regs32_w)
AM_RANGE(0x04f16000, 0x04f1600b) AM_READ(cojag_gun_input_r) // GPI02
AM_RANGE(0x04f17000, 0x04f17003) AM_READ(status_r) // GPI03
- AM_RANGE(0x04f17800, 0x04f17803) AM_WRITE(latch_w) // GPI04
- AM_RANGE(0x04f17c00, 0x04f17c03) AM_READ(jamma_r) // GPI05
+ AM_RANGE(0x04f17800, 0x04f17803) AM_WRITE(latch_w) // GPI04
+ AM_RANGE(0x04f17c00, 0x04f17c03) AM_READ_PORT("P1_P2") // GPI05
AM_RANGE(0x04f1a100, 0x04f1a13f) AM_READWRITE(dspctrl_r, dspctrl_w)
AM_RANGE(0x04f1a140, 0x04f1a17f) AM_READWRITE(jaguar_serial_r, jaguar_serial_w)
AM_RANGE(0x04f1b000, 0x04f1cfff) AM_RAM AM_BASE(&jaguar_dsp_ram) AM_SHARE(4)
@@ -853,8 +848,8 @@ static ADDRESS_MAP_START( m68020_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xf10000, 0xf103ff) AM_READWRITE(jaguar_jerry_regs32_r, jaguar_jerry_regs32_w)
AM_RANGE(0xf16000, 0xf1600b) AM_READ(cojag_gun_input_r) // GPI02
AM_RANGE(0xf17000, 0xf17003) AM_READ(status_r) // GPI03
-// AM_RANGE(0xf17800, 0xf17803) AM_WRITE(latch_w) // GPI04
- AM_RANGE(0xf17c00, 0xf17c03) AM_READ(jamma_r) // GPI05
+// AM_RANGE(0xf17800, 0xf17803) AM_WRITE(latch_w) // GPI04
+ AM_RANGE(0xf17c00, 0xf17c03) AM_READ_PORT("P1_P2") // GPI05
AM_RANGE(0xf1a100, 0xf1a13f) AM_READWRITE(dspctrl_r, dspctrl_w)
AM_RANGE(0xf1a140, 0xf1a17f) AM_READWRITE(jaguar_serial_r, jaguar_serial_w)
AM_RANGE(0xf1b000, 0xf1cfff) AM_RAM AM_BASE(&jaguar_dsp_ram) AM_SHARE(4)
@@ -909,17 +904,16 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( area51 )
- PORT_START_TAG("IN0")
- PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0xfe00, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_START("P1_P2")
+ PORT_BIT( 0x000000ff, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x00000100, IP_ACTIVE_LOW, IPT_START2 )
+ PORT_BIT( 0x0000fe00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
- PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0xfe00, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x00ff0000, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x01000000, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_BIT( 0xfe000000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -930,19 +924,19 @@ static INPUT_PORTS_START( area51 )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) // vsyncneq
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("FAKE1_X") /* fake analog X */
+ PORT_START("FAKE1_X") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 320.0/(320.0 - 7 -7), 0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("FAKE1_Y") /* fake analog Y */
+ PORT_START("FAKE1_Y") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, (240.0 - 1)/240, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10)
- PORT_START_TAG("FAKE2_X") /* fake analog X */
+ PORT_START("FAKE2_X") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 320.0/(320.0 - 7 -7), 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("FAKE2_Y") /* fake analog Y */
+ PORT_START("FAKE2_Y") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, (240.0 - 1)/240, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("IN3") /* gun triggers */
+ PORT_START("IN3") /* gun triggers */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SPECIAL ) // gun data valid
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SPECIAL ) // gun data valid
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
@@ -952,29 +946,28 @@ INPUT_PORTS_END
static INPUT_PORTS_START( freezeat )
- PORT_START_TAG("IN0")
- PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
- PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
-
- PORT_START_TAG("IN1")
- PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
- PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
-
- PORT_START_TAG("IN2")
+ PORT_START("P1_P2")
+ PORT_BIT( 0x000000ff, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x00000100, IP_ACTIVE_LOW, IPT_START2 )
+ PORT_BIT( 0x00000200, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
+ PORT_BIT( 0x00000400, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
+ PORT_BIT( 0x00000800, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
+ PORT_BIT( 0x00001000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
+ PORT_BIT( 0x00002000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
+ PORT_BIT( 0x00004000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
+ PORT_BIT( 0x00008000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
+
+ PORT_BIT( 0x00ff0000, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x01000000, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_BIT( 0x02000000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
+ PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
+ PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
+ PORT_BIT( 0x10000000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
+ PORT_BIT( 0x20000000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
+ PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
+ PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
+
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -985,7 +978,7 @@ static INPUT_PORTS_START( freezeat )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) // vsyncneq
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x000f, IP_ACTIVE_HIGH, IPT_SPECIAL ) // coin returns
PORT_BIT( 0x00f0, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -993,29 +986,28 @@ INPUT_PORTS_END
static INPUT_PORTS_START( fishfren )
- PORT_START_TAG("IN0")
- PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
- PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
-
- PORT_START_TAG("IN1")
- PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
- PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
-
- PORT_START_TAG("IN2")
+ PORT_START("P1_P2")
+ PORT_BIT( 0x000000ff, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x00000100, IP_ACTIVE_LOW, IPT_START2 )
+ PORT_BIT( 0x00000200, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
+ PORT_BIT( 0x00000400, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
+ PORT_BIT( 0x00000800, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
+ PORT_BIT( 0x00001000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
+ PORT_BIT( 0x00002000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
+ PORT_BIT( 0x00004000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
+ PORT_BIT( 0x00008000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
+
+ PORT_BIT( 0x00ff0000, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x01000000, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_BIT( 0x02000000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
+ PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
+ PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
+ PORT_BIT( 0x10000000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
+ PORT_BIT( 0x20000000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
+ PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
+ PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
+
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -1026,7 +1018,7 @@ static INPUT_PORTS_START( fishfren )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) // vsyncneq
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x000f, IP_ACTIVE_HIGH, IPT_SPECIAL ) // coin returns
PORT_BIT( 0x00f0, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1034,35 +1026,34 @@ INPUT_PORTS_END
static INPUT_PORTS_START( vcircle )
- PORT_START_TAG("IN0")
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2)
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(2)
- PORT_BIT( 0x00f8, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
- PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
-
- PORT_START_TAG("IN1")
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1)
- PORT_BIT( 0x00f8, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
- PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
-
- PORT_START_TAG("IN2")
+ PORT_START("P1_P2")
+ PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
+ PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2)
+ PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(2)
+ PORT_BIT( 0x000000f8, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x00000100, IP_ACTIVE_LOW, IPT_START2 )
+ PORT_BIT( 0x00000200, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
+ PORT_BIT( 0x00000400, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
+ PORT_BIT( 0x00000800, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
+ PORT_BIT( 0x00001000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
+ PORT_BIT( 0x00002000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
+ PORT_BIT( 0x00004000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
+ PORT_BIT( 0x00008000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
+
+ PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
+ PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
+ PORT_BIT( 0x00040000, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1)
+ PORT_BIT( 0x00f80000, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x01000000, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_BIT( 0x02000000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
+ PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
+ PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
+ PORT_BIT( 0x10000000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
+ PORT_BIT( 0x20000000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
+ PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
+ PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
+
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -1073,7 +1064,7 @@ static INPUT_PORTS_START( vcircle )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) // vsyncneq
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x000f, IP_ACTIVE_HIGH, IPT_SPECIAL ) // coin returns
PORT_BIT( 0x00f0, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c
index 814aa572348..f930b69d402 100644
--- a/src/mame/drivers/combatsc.c
+++ b/src/mame/drivers/combatsc.c
@@ -392,7 +392,7 @@ ADDRESS_MAP_END
PORT_DIPSETTING( 0x00, "coin 2 invalidity" )
static INPUT_PORTS_START( combasc )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -402,7 +402,7 @@ static INPUT_PORTS_START( combasc )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW3") /* DSW #3 */
+ PORT_START("DSW3") /* DSW #3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
@@ -418,10 +418,10 @@ static INPUT_PORTS_START( combasc )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* DSW # 1 */
+ PORT_START("DSW1") /* DSW # 1 */
COINAGE
- PORT_START_TAG("DSW2") /* DSW #2 */
+ PORT_START("DSW2") /* DSW #2 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -446,7 +446,7 @@ static INPUT_PORTS_START( combasc )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -456,21 +456,21 @@ static INPUT_PORTS_START( combasc )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
- PORT_START_TAG("TRACK0_Y") /* only used in trackball version */
+ PORT_START("TRACK0_Y") /* only used in trackball version */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("TRACK0_X") /* only used in trackball version */
+ PORT_START("TRACK0_X") /* only used in trackball version */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("TRACK1_Y") /* only used in trackball version */
+ PORT_START("TRACK1_Y") /* only used in trackball version */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("TRACK1_X") /* only used in trackball version */
+ PORT_START("TRACK1_X") /* only used in trackball version */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( combasct )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -480,7 +480,7 @@ static INPUT_PORTS_START( combasct )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW3") /* DSW #3 */
+ PORT_START("DSW3") /* DSW #3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
@@ -496,10 +496,10 @@ static INPUT_PORTS_START( combasct )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* DSW # 1 */
+ PORT_START("DSW1") /* DSW # 1 */
COINAGE
- PORT_START_TAG("DSW2") /* DSW #2 */
+ PORT_START("DSW2") /* DSW #2 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -525,22 +525,22 @@ static INPUT_PORTS_START( combasct )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
/* trackball 1P */
- PORT_START_TAG("TRACK0_Y")
+ PORT_START("TRACK0_Y")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(10) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("TRACK0_X")
+ PORT_START("TRACK0_X")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(10) PORT_KEYDELTA(10) PORT_PLAYER(1)
/* trackball 2P (not implemented yet) */
- PORT_START_TAG("TRACK1_Y")
+ PORT_START("TRACK1_Y")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(10) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("TRACK1_X")
+ PORT_START("TRACK1_X")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(10) PORT_KEYDELTA(10) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( combascb )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -550,7 +550,7 @@ static INPUT_PORTS_START( combascb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -560,10 +560,10 @@ static INPUT_PORTS_START( combascb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
COINAGE
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c
index a861c0d1447..d7e68d7dbf3 100644
--- a/src/mame/drivers/commando.c
+++ b/src/mame/drivers/commando.c
@@ -64,11 +64,11 @@ extern VIDEO_EOF( commando );
static ADDRESS_MAP_START( commando_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
- AM_RANGE(0xc000, 0xc000) AM_READ(input_port_0_r)
- AM_RANGE(0xc001, 0xc001) AM_READ(input_port_1_r)
- AM_RANGE(0xc002, 0xc002) AM_READ(input_port_2_r)
- AM_RANGE(0xc003, 0xc003) AM_READ(input_port_3_r)
- AM_RANGE(0xc004, 0xc004) AM_READ(input_port_4_r)
+ AM_RANGE(0xc000, 0xc000) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0xc001, 0xc001) AM_READ_PORT("P1")
+ AM_RANGE(0xc002, 0xc002) AM_READ_PORT("P2")
+ AM_RANGE(0xc003, 0xc003) AM_READ_PORT("DSW1")
+ AM_RANGE(0xc004, 0xc004) AM_READ_PORT("DSW2")
AM_RANGE(0xc800, 0xc800) AM_WRITE(soundlatch_w)
AM_RANGE(0xc804, 0xc804) AM_WRITE(commando_c804_w)
AM_RANGE(0xc808, 0xc809) AM_WRITE(commando_scrollx_w)
@@ -95,7 +95,7 @@ ADDRESS_MAP_END
/* Input Ports */
static INPUT_PORTS_START( commando )
- PORT_START_TAG("IN0")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -103,48 +103,48 @@ static INPUT_PORTS_START( commando )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Starting Area" ) PORT_DIPLOCATION("SW1:8,7")
PORT_DIPSETTING( 0x03, "0 (Forest 1)" )
PORT_DIPSETTING( 0x01, "2 (Desert 1)" )
PORT_DIPSETTING( 0x02, "4 (Forest 2)" )
PORT_DIPSETTING( 0x00, "6 (Desert 2)" )
- PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:6,5")
+ PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:6,5")
PORT_DIPSETTING( 0x04, "2" )
PORT_DIPSETTING( 0x0c, "3" )
PORT_DIPSETTING( 0x08, "4" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:4,3")
+ PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:4,3")
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x20, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) )
- PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2")
+ PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_3C ) )
- PORT_START_TAG("DSW1")
- PORT_DIPNAME( 0x07, 0x07, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:8,7,6")
+ PORT_START("DSW2")
+ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:8,7,6")
PORT_DIPSETTING( 0x07, "10K 50K+" )
PORT_DIPSETTING( 0x03, "10K 60K+" )
PORT_DIPSETTING( 0x05, "20K 60K+" )
@@ -153,16 +153,16 @@ static INPUT_PORTS_START( commando )
PORT_DIPSETTING( 0x02, "30K 80K+" )
PORT_DIPSETTING( 0x04, "40K 100K+" )
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
- PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:5")
+ PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:5")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
- PORT_DIPNAME( 0x10, 0x10, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:4")
+ PORT_DIPNAME( 0x10, 0x10, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:4")
PORT_DIPSETTING( 0x10, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x00, "Difficult" )
- PORT_DIPNAME( 0x20, 0x00, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:3")
+ PORT_DIPNAME( 0x20, 0x00, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:3")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x20, DEF_STR( On ) )
- PORT_DIPNAME( 0xc0, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:2,1")
+ PORT_DIPNAME( 0xc0, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:2,1")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x40, "Upright Two Players" )
PORT_DIPSETTING( 0xc0, DEF_STR( Cocktail ) )
@@ -171,8 +171,8 @@ INPUT_PORTS_END
static INPUT_PORTS_START( commandu )
PORT_INCLUDE(commando)
- PORT_MODIFY("DSW1")
- PORT_SERVICE( 0x08, IP_ACTIVE_LOW )
+ PORT_MODIFY("DSW2")
+ PORT_SERVICE_DIPLOC( 0x08, IP_ACTIVE_LOW, "SW2:5" )
INPUT_PORTS_END
/* Graphics Layouts */
diff --git a/src/mame/drivers/compgolf.c b/src/mame/drivers/compgolf.c
index fe1c410ad9a..f62428d1a93 100644
--- a/src/mame/drivers/compgolf.c
+++ b/src/mame/drivers/compgolf.c
@@ -54,10 +54,10 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1000, 0x17ff) AM_READ(SMH_RAM)
AM_RANGE(0x1800, 0x1fff) AM_READ(SMH_RAM)
AM_RANGE(0x2000, 0x2060) AM_READ(SMH_RAM)
- AM_RANGE(0x3000, 0x3000) AM_READ(input_port_0_r) //player 1 + start buttons
- AM_RANGE(0x3001, 0x3001) AM_READ(input_port_1_r) //player 2 + vblank
- AM_RANGE(0x3002, 0x3002) AM_READ(input_port_2_r) //dip-switches
- AM_RANGE(0x3003, 0x3003) AM_READ(input_port_3_r) //coins
+ AM_RANGE(0x3000, 0x3000) AM_READ_PORT("P1")
+ AM_RANGE(0x3001, 0x3001) AM_READ_PORT("P2")
+ AM_RANGE(0x3002, 0x3002) AM_READ_PORT("DSW1")
+ AM_RANGE(0x3003, 0x3003) AM_READ_PORT("DSW2")
AM_RANGE(0x3800, 0x3800) AM_READ(YM2203_status_port_0_r)
AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1)
AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM)
@@ -79,30 +79,27 @@ ADDRESS_MAP_END
/***************************************************************************/
static INPUT_PORTS_START( compgolf )
- /* Player 1 Port */
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- /* Player 2 Port */
- PORT_START
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
+ PORT_START("P2")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- /* Dip-Switch Port */
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -126,8 +123,7 @@ static INPUT_PORTS_START( compgolf )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- /* System Port */
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/contra.c b/src/mame/drivers/contra.c
index 069ff77cf58..d97fcc3f075 100644
--- a/src/mame/drivers/contra.c
+++ b/src/mame/drivers/contra.c
@@ -11,6 +11,9 @@ Credits:
Jose Tejada Gomez (of Grytra fame) for precious information on sprites
Eric Hustvedt: palette optimizations and cocktail support
+2008-07
+Dip locations and factory settings verified with manual
+
***************************************************************************/
#include "driver.h"
@@ -66,13 +69,13 @@ static WRITE8_HANDLER( cpu_sound_command_w )
static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0010, 0x0010) AM_READ(input_port_0_r) /* IN0 */
- AM_RANGE(0x0011, 0x0011) AM_READ(input_port_1_r) /* IN1 */
- AM_RANGE(0x0012, 0x0012) AM_READ(input_port_2_r) /* IN2 */
+ AM_RANGE(0x0010, 0x0010) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0x0011, 0x0011) AM_READ_PORT("P1")
+ AM_RANGE(0x0012, 0x0012) AM_READ_PORT("P2")
- AM_RANGE(0x0014, 0x0014) AM_READ(input_port_3_r) /* DIPSW1 */
- AM_RANGE(0x0015, 0x0015) AM_READ(input_port_4_r) /* DIPSW2 */
- AM_RANGE(0x0016, 0x0016) AM_READ(input_port_5_r) /* DIPSW3 */
+ AM_RANGE(0x0014, 0x0014) AM_READ_PORT("DSW1")
+ AM_RANGE(0x0015, 0x0015) AM_READ_PORT("DSW2")
+ AM_RANGE(0x0016, 0x0016) AM_READ_PORT("DSW3")
AM_RANGE(0x0c00, 0x0cff) AM_READ(SMH_RAM)
AM_RANGE(0x1000, 0x5fff) AM_READ(SMH_RAM)
@@ -121,7 +124,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( contra )
- PORT_START /* IN0 */
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -131,7 +134,7 @@ static INPUT_PORTS_START( contra )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -141,7 +144,7 @@ static INPUT_PORTS_START( contra )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN2 */
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -151,8 +154,8 @@ static INPUT_PORTS_START( contra )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* DSW0 */
- PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
+ PORT_START("DSW1")
+ PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 2C_1C ) )
@@ -169,7 +172,7 @@ static INPUT_PORTS_START( contra )
PORT_DIPSETTING( 0x0a, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x09, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
- PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_B ) )
+ PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:5,6,7,8")
PORT_DIPSETTING( 0x20, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x50, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ) )
@@ -187,38 +190,38 @@ static INPUT_PORTS_START( contra )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )//marvins.c
/* 0x00 is invalid */
- PORT_START /* DSW1 */
- PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
+ PORT_START("DSW2")
+ PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
PORT_DIPSETTING( 0x01, "5" )
PORT_DIPSETTING( 0x00, "7" )
- PORT_DIPNAME( 0x04, 0x00, DEF_STR( Cabinet ) )
+ PORT_DIPNAME( 0x04, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:3") /* Not Used according to manual */
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x04, DEF_STR( Cocktail ) )
- PORT_DIPNAME( 0x18, 0x18, DEF_STR( Bonus_Life ) )
+ PORT_DIPNAME( 0x18, 0x18, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:4,5")
PORT_DIPSETTING( 0x18, "30000 70000" )
PORT_DIPSETTING( 0x10, "40000 80000" )
PORT_DIPSETTING( 0x08, "40000" )
PORT_DIPSETTING( 0x00, "50000" )
- PORT_DIPNAME( 0x60, 0x60, DEF_STR( Difficulty ) )
+ PORT_DIPNAME( 0x60, 0x60, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:6,7")
PORT_DIPSETTING( 0x60, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x40, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x20, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) )
+ PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW2 */
- PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
+ PORT_START("DSW3")
+ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW3:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, "Upright Controls" )
+ PORT_DIPNAME( 0x02, 0x02, "Upright Controls" ) PORT_DIPLOCATION("SW3:2") /* Not Used according to manual */
PORT_DIPSETTING( 0x02, DEF_STR( Single ) )
PORT_DIPSETTING( 0x00, DEF_STR( Dual ) )
- PORT_SERVICE( 0x04, IP_ACTIVE_LOW )
- PORT_DIPNAME( 0x08, 0x08, "Sound" )
+ PORT_SERVICE_DIPLOC( 0x04, IP_ACTIVE_LOW, "SW3:3" )
+ PORT_DIPNAME( 0x08, 0x08, "Sound" ) PORT_DIPLOCATION("SW3:4")
PORT_DIPSETTING( 0x00, DEF_STR( Mono ) )
PORT_DIPSETTING( 0x08, DEF_STR( Stereo ) )
INPUT_PORTS_END
diff --git a/src/mame/drivers/coolpool.c b/src/mame/drivers/coolpool.c
index cd592dae855..91848ce3974 100644
--- a/src/mame/drivers/coolpool.c
+++ b/src/mame/drivers/coolpool.c
@@ -542,8 +542,8 @@ static ADDRESS_MAP_START( dsp_io_map, ADDRESS_SPACE_IO, 16 )
AM_RANGE(0x02, 0x02) AM_READWRITE(dsp_cmd_r, dsp_answer_w)
AM_RANGE(0x03, 0x03) AM_WRITE(dsp_dac_w)
AM_RANGE(0x04, 0x04) AM_READ(dsp_rom_r)
- AM_RANGE(0x05, 0x05) AM_READ(input_port_0_word_r)
- AM_RANGE(0x07, 0x07) AM_READ(input_port_1_word_r)
+ AM_RANGE(0x05, 0x05) AM_READ_PORT("IN0")
+ AM_RANGE(0x07, 0x07) AM_READ_PORT("IN1")
AM_RANGE(TMS32025_BIO, TMS32025_BIO) AM_READ(dsp_bio_line_r)
AM_RANGE(TMS32025_HOLD, TMS32025_HOLD) AM_READ(dsp_hold_line_r)
// AM_RANGE(TMS32025_HOLDA, TMS32025_HOLDA) AM_WRITE(dsp_HOLDA_signal_w)
@@ -558,7 +558,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( amerdart )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -569,22 +569,22 @@ static INPUT_PORTS_START( amerdart )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("XAXIS1")
+ PORT_START("XAXIS1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_RESET PORT_PLAYER(1)
- PORT_START_TAG("YAXIS1")
+ PORT_START("YAXIS1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_RESET PORT_PLAYER(1)
- PORT_START_TAG("XAXIS2")
+ PORT_START("XAXIS2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_RESET PORT_PLAYER(2)
- PORT_START_TAG("YAXIS2")
+ PORT_START("YAXIS2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_RESET PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( 9ballsht )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x00ff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x0300, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
@@ -594,7 +594,7 @@ static INPUT_PORTS_START( 9ballsht )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -615,14 +615,14 @@ INPUT_PORTS_END
static INPUT_PORTS_START( coolpool )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x00ff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x0f00, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0xc000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -633,10 +633,10 @@ static INPUT_PORTS_START( coolpool )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_SPECIAL )
- PORT_START_TAG("XAXIS")
+ PORT_START("XAXIS")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START_TAG("YAXIS")
+ PORT_START("YAXIS")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE
INPUT_PORTS_END
diff --git a/src/mame/drivers/cop01.c b/src/mame/drivers/cop01.c
index 7dd91e5eb4f..4c486bd5007 100644
--- a/src/mame/drivers/cop01.c
+++ b/src/mame/drivers/cop01.c
@@ -127,18 +127,18 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READ(input_port_0_r)
- AM_RANGE(0x01, 0x01) AM_READ(input_port_1_r)
- AM_RANGE(0x02, 0x02) AM_READ(input_port_2_r)
- AM_RANGE(0x03, 0x03) AM_READ(input_port_3_r)
- AM_RANGE(0x04, 0x04) AM_READ(input_port_4_r)
+ AM_RANGE(0x00, 0x00) AM_READ_PORT("P1")
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("P2")
+ AM_RANGE(0x02, 0x02) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW1")
+ AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW2")
ADDRESS_MAP_END
static ADDRESS_MAP_START( mightguy_readport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READ(input_port_0_r)
- AM_RANGE(0x01, 0x01) AM_READ(input_port_1_r)
- AM_RANGE(0x02, 0x02) AM_READ(input_port_2_r)
+ AM_RANGE(0x00, 0x00) AM_READ_PORT("P1")
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("P2")
+ AM_RANGE(0x02, 0x02) AM_READ_PORT("SYSTEM")
AM_RANGE(0x03, 0x04) AM_READ(mightguy_dsw_r)
ADDRESS_MAP_END
@@ -195,7 +195,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( cop01 )
- PORT_START_TAG("IN0")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -205,7 +205,7 @@ static INPUT_PORTS_START( cop01 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -215,7 +215,7 @@ static INPUT_PORTS_START( cop01 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* TEST, COIN, START */
+ PORT_START("SYSTEM") /* TEST, COIN, START */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -225,7 +225,7 @@ static INPUT_PORTS_START( cop01 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -249,7 +249,7 @@ static INPUT_PORTS_START( cop01 )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x01, DEF_STR( Medium ) )
@@ -276,7 +276,7 @@ INPUT_PORTS_END
/* There is an ingame bug at 0x00e4 to 0x00e6 that performs the 'rrca' instead of 'rlca'
so you DSW1-8 has no effect and you can NOT start a game at areas 5 to 8. */
static INPUT_PORTS_START( mightguy )
- PORT_START_TAG("IN0")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -286,7 +286,7 @@ static INPUT_PORTS_START( mightguy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -296,7 +296,7 @@ static INPUT_PORTS_START( mightguy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -306,7 +306,7 @@ static INPUT_PORTS_START( mightguy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -327,7 +327,7 @@ static INPUT_PORTS_START( mightguy )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) // "Start Area" - see fake Dip Switch
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -345,7 +345,7 @@ static INPUT_PORTS_START( mightguy )
PORT_DIPSETTING( 0x00, "Invincibility")
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_SPECIAL ) // "Start Area" - see fake Dip Switch
- PORT_START_TAG("FAKE") /* FAKE Dip Switch */
+ PORT_START("FAKE") /* FAKE Dip Switch */
PORT_DIPNAME( 0x07, 0x07, "Starting Area" )
PORT_DIPSETTING( 0x07, "1" )
PORT_DIPSETTING( 0x06, "2" )
diff --git a/src/mame/drivers/copsnrob.c b/src/mame/drivers/copsnrob.c
index 98bde1b6f9b..d143c1c51fa 100644
--- a/src/mame/drivers/copsnrob.c
+++ b/src/mame/drivers/copsnrob.c
@@ -137,18 +137,18 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( copsnrob )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("DSW") /* DIP1 */
+ PORT_START("DSW") /* DIP1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, "1 Coin/1 Player" )
PORT_DIPSETTING( 0x02, "1 Coin/2 Players" )
@@ -165,22 +165,22 @@ static INPUT_PORTS_START( copsnrob )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1) PORT_PLAYER(1)
/* These input ports are fake */
- PORT_START_TAG("FAKE0") /* IN3 */
+ PORT_START("FAKE0") /* IN3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH,IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH,IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_START_TAG("FAKE1") /* IN4 */
+ PORT_START("FAKE1") /* IN4 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH,IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH,IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_START_TAG("FAKE2") /* IN5 */
+ PORT_START("FAKE2") /* IN5 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH,IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_HIGH,IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
- PORT_START_TAG("FAKE3") /* IN6 */
+ PORT_START("FAKE3") /* IN6 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH,IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_HIGH,IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c
index 4c74a34780d..70aa5d329be 100644
--- a/src/mame/drivers/cosmic.c
+++ b/src/mame/drivers/cosmic.c
@@ -375,7 +375,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( panic )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
@@ -385,7 +385,7 @@ static INPUT_PORTS_START( panic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
@@ -395,7 +395,7 @@ static INPUT_PORTS_START( panic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_START_TAG("DSW") /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 2C_3C ) )
@@ -419,7 +419,7 @@ static INPUT_PORTS_START( panic )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_3C ) )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -432,7 +432,7 @@ static INPUT_PORTS_START( panic )
INPUT_PORTS_END
static INPUT_PORTS_START( cosmica )
- PORT_START_TAG("P1") /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
@@ -442,7 +442,7 @@ static INPUT_PORTS_START( cosmica )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2") /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
@@ -452,7 +452,7 @@ static INPUT_PORTS_START( cosmica )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") /* IN2 */
+ PORT_START("DSW") /* IN2 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -478,7 +478,7 @@ static INPUT_PORTS_START( cosmica )
/* trigger exactly one interrupt, without having to check when the */
/* user releases the key. */
- PORT_START_TAG("FAKE") /* FAKE */
+ PORT_START("FAKE") /* FAKE */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
INPUT_PORTS_END
@@ -489,14 +489,14 @@ INPUT_PORTS_END
/* Offsets are in BYTES, so bits 0-7 are at offset 0 etc. */
static INPUT_PORTS_START( cosmicg )
- PORT_START_TAG("IN0") /* 4-7 */
+ PORT_START("IN0") /* 4-7 */
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_SPECIAL ) /* pixel clock */
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
- PORT_START_TAG("IN1") /* 8-15 */
+ PORT_START("IN1") /* 8-15 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_2WAY PORT_COCKTAIL
@@ -513,7 +513,7 @@ static INPUT_PORTS_START( cosmicg )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x80, "5" )
- PORT_START_TAG("IN2") /* Hard wired settings */
+ PORT_START("IN2") /* Hard wired settings */
/* The coin slots are not memory mapped. Coin causes INT 4 */
/* This fake input port is used by the interrupt handler */
@@ -539,7 +539,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( magspot )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x1c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -550,14 +550,14 @@ static INPUT_PORTS_START( magspot )
PORT_DIPSETTING( 0xc0, "15000" )
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x1c, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x01, "2000" )
PORT_DIPSETTING( 0x02, "3000" )
@@ -577,7 +577,7 @@ static INPUT_PORTS_START( magspot )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN3") /* IN3 */
+ PORT_START("IN3") /* IN3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0x1e, IP_ACTIVE_LOW, IPT_UNUSED ) /* always HI */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SPECIAL ) /* reads what was written to 4808. Probably not used?? */
@@ -585,12 +585,12 @@ static INPUT_PORTS_START( magspot )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
/* Fake port to handle coins */
- PORT_START_TAG("COINS") /* IN4 */
+ PORT_START("COINS") /* IN4 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(1)
/* Fake port to handle coinage dip switches. Each bit goes to 3800-3807 */
- PORT_START_TAG("DSW") /* IN5 */
+ PORT_START("DSW") /* IN5 */
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0c, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -628,21 +628,21 @@ static INPUT_PORTS_START( magspot )
INPUT_PORTS_END
static INPUT_PORTS_START( devzone )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x1c, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x1c, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x01, "4000" )
PORT_DIPSETTING( 0x02, "6000" )
@@ -662,18 +662,18 @@ static INPUT_PORTS_START( devzone )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN3") /* IN3 */
+ PORT_START("IN3") /* IN3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x3e, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
/* Fake port to handle coins */
- PORT_START_TAG("COINS") /* IN4 */
+ PORT_START("COINS") /* IN4 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(1)
- PORT_START_TAG("DSW") /* IN5 */
+ PORT_START("DSW") /* IN5 */
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0c, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -712,21 +712,21 @@ INPUT_PORTS_END
static INPUT_PORTS_START( devzone2 )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x1c, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x1c, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x01, "2000" )
PORT_DIPSETTING( 0x02, "3000" )
@@ -746,18 +746,18 @@ static INPUT_PORTS_START( devzone2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN3") /* IN3 */
+ PORT_START("IN3") /* IN3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x3e, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
/* Fake port to handle coins */
- PORT_START_TAG("COINS") /* IN4 */
+ PORT_START("COINS") /* IN4 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(1)
- PORT_START_TAG("DSW") /* IN5 */
+ PORT_START("DSW") /* IN5 */
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0c, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -796,21 +796,21 @@ INPUT_PORTS_END
static INPUT_PORTS_START( nomnlnd )
- PORT_START_TAG("IN0") /* Controls - Remapped for game */
+ PORT_START("IN0") /* Controls - Remapped for game */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x55, IP_ACTIVE_LOW, IPT_SPECIAL ) /* diagonals */
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x55, IP_ACTIVE_LOW, IPT_SPECIAL ) /* diagonals */
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x01, "2000" )
PORT_DIPSETTING( 0x02, "3000" )
@@ -830,7 +830,7 @@ static INPUT_PORTS_START( nomnlnd )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN3") /* IN3 */
+ PORT_START("IN3") /* IN3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0x1e, IP_ACTIVE_LOW, IPT_UNUSED ) /* always HI */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SPECIAL ) /* reads what was written to 4808. Probably not used?? */
@@ -838,27 +838,27 @@ static INPUT_PORTS_START( nomnlnd )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
/* Fake port to handle coin */
- PORT_START_TAG("COIN") /* IN4 */
+ PORT_START("COIN") /* IN4 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
INPUT_PORTS_END
static INPUT_PORTS_START( nomnlndg )
- PORT_START_TAG("IN0") /* Controls - Remapped for game */
+ PORT_START("IN0") /* Controls - Remapped for game */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x55, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x55, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x01, "3000" )
PORT_DIPSETTING( 0x02, "5000" )
@@ -878,7 +878,7 @@ static INPUT_PORTS_START( nomnlndg )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN3") /* IN3 */
+ PORT_START("IN3") /* IN3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0x1e, IP_ACTIVE_LOW, IPT_UNUSED ) /* always HI */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SPECIAL ) /* reads what was written to 4808. Probably not used?? */
@@ -886,7 +886,7 @@ static INPUT_PORTS_START( nomnlndg )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
/* Fake port to handle coin */
- PORT_START_TAG("COIN") /* IN4 */
+ PORT_START("COIN") /* IN4 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
INPUT_PORTS_END
diff --git a/src/mame/drivers/couple.c b/src/mame/drivers/couple.c
index adbc2765bac..6f1305f6ef1 100644
--- a/src/mame/drivers/couple.c
+++ b/src/mame/drivers/couple.c
@@ -152,9 +152,9 @@ static ADDRESS_MAP_START( merit_mem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0xc004, 0xc007 ) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w)
AM_RANGE( 0xc008, 0xc00a ) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w)
AM_RANGE( 0xc00b, 0xc00b ) AM_WRITE(merit_prot_w)
-// AM_RANGE( 0xc000, 0xc00f ) AM_READ(dummy_inputs_r)
-// AM_RANGE( 0xc008, 0xc008 ) AM_READ(input_port_0_r)
-// AM_RANGE( 0xc00a, 0xc00a ) AM_READ(input_port_1_r)
+// AM_RANGE( 0xc000, 0xc00f ) AM_READ(dummy_inputs_r)
+// AM_RANGE( 0xc008, 0xc008 ) AM_READ_PORT("P1")
+// AM_RANGE( 0xc00a, 0xc00a ) AM_READ_PORT("DSW")
AM_RANGE( 0xe000, 0xe000 ) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w)
AM_RANGE( 0xe001, 0xe001 ) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w)
AM_RANGE( 0xe800, 0xefff ) AM_RAM_WRITE(couple_vram_hi_w) AM_BASE(&vram_hi)
@@ -163,7 +163,7 @@ static ADDRESS_MAP_START( merit_mem, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static ADDRESS_MAP_START( merit_io, ADDRESS_SPACE_IO, 8 )
-// ADDRESS_MAP_GLOBAL_MASK(0xff)
+// ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0xc00c, 0xc00c) AM_WRITE(AY8910_control_port_0_w)
AM_RANGE(0xc10c, 0xc10c) AM_WRITE(AY8910_write_port_0_w)
ADDRESS_MAP_END
@@ -199,8 +199,8 @@ static PALETTE_INIT( couple )
}
}
-#define PORT_INPUTS \
- PORT_START \
+static INPUT_PORTS_START( couple )
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) \
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) \
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) \
@@ -210,8 +210,7 @@ static PALETTE_INIT( couple )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_IMPULSE(1) \
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) PORT_IMPULSE(1) \
-#define PORT_DSW \
- PORT_START \
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, "Number of Attempts" ) \
PORT_DIPSETTING( 0x01, "99" ) \
PORT_DIPSETTING( 0x00, "9" ) \
@@ -230,11 +229,6 @@ static PALETTE_INIT( couple )
PORT_DIPNAME( 0x20, 0x00, "Sound" ) \
PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) \
PORT_DIPSETTING( 0x00, DEF_STR( On ) ) \
-
-static INPUT_PORTS_START( couple )
- PORT_INPUTS
-
- PORT_DSW
PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -242,10 +236,8 @@ static INPUT_PORTS_START( couple )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
- PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -265,7 +257,8 @@ static INPUT_PORTS_START( couple )
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+
+ PORT_START("IN3")
PORT_DIPNAME( 0x01, 0x01, "3" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -290,7 +283,8 @@ static INPUT_PORTS_START( couple )
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+
+ PORT_START("IN4")
PORT_DIPNAME( 0x01, 0x01, "4" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -319,88 +313,15 @@ INPUT_PORTS_END
/*Different DSWs*/
static INPUT_PORTS_START( couplep )
- PORT_INPUTS
+ PORT_INCLUDE( couple )
- PORT_DSW
+ PORT_MODIFY("DSW")
PORT_DIPNAME( 0x40, 0x40, "Bonus Play" )
PORT_DIPSETTING( 0x40, "at 150.000" )
PORT_DIPSETTING( 0x00, "at 200.000" )
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
- PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_SERVICE( 0x04, IP_ACTIVE_LOW )
- PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
- PORT_DIPNAME( 0x01, 0x01, "3" )
- PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
- PORT_DIPNAME( 0x01, 0x01, "4" )
- PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
INPUT_PORTS_END
diff --git a/src/mame/drivers/cowrace.c b/src/mame/drivers/cowrace.c
index bf17ca66643..43b70c78112 100644
--- a/src/mame/drivers/cowrace.c
+++ b/src/mame/drivers/cowrace.c
@@ -146,7 +146,7 @@ static GFXDECODE_START( cowrace )
GFXDECODE_END
static INPUT_PORTS_START( cowrace )
- PORT_START // IN0
+ PORT_START("IN0")
INPUT_PORTS_END
static const struct YM2203interface ym2203_interface_1 =
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index 0d370a4c91a..61df0acbe27 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -152,6 +152,9 @@ Stephh's log (2006.09.20) :
* 'forgottu' and 'lostwrld'
* 'ghouls' and 'daimakai'
* 'dynwar' and 'dynwarj'
+
+2008-07:
+ - replaced input read handler with direct AM_READ_PORT where suitable
***************************************************************************/
@@ -179,22 +182,6 @@ static READ16_HANDLER( cps1_hack_dsw_r )
return (in << 8) | in;
}
-READ16_HANDLER( cps1_in1_r )
-{
- return input_port_read(machine, "IN1");
-}
-
-READ16_HANDLER( cps1_in2_r )
-{
- return input_port_read(machine, "IN2");
-}
-
-READ16_HANDLER( cps1_in3_r )
-{
- return input_port_read(machine, "IN3");
-}
-
-
static int dial[2];
static READ16_HANDLER( forgottn_dial_0_r )
@@ -517,15 +504,15 @@ All PRGx go to B-board. Provision for up to 4MB of ROM space, which was never us
static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x3fffff) AM_ROM
- AM_RANGE(0x800000, 0x800007) AM_READ(cps1_in1_r) /* Player input ports */
+ AM_RANGE(0x800000, 0x800007) AM_READ_PORT("IN1") /* Player input ports */
/* forgottn, willow, cawing, nemo, varth read from 800010. Probably debug input leftover from development */
- AM_RANGE(0x800018, 0x80001f) AM_READ(cps1_dsw_r) /* System input ports / Dip Switches */
- AM_RANGE(0x800020, 0x800021) AM_READNOP /* ? Used by Rockman ? not mapped according to PAL */
+ AM_RANGE(0x800018, 0x80001f) AM_READ(cps1_dsw_r) /* System input ports / Dip Switches */
+ AM_RANGE(0x800020, 0x800021) AM_READNOP /* ? Used by Rockman ? not mapped according to PAL */
AM_RANGE(0x800030, 0x800037) AM_WRITE(cps1_coinctrl_w)
/* Forgotten Worlds has dial controls on B-board mapped at 800040-80005f. See DRIVER_INIT */
AM_RANGE(0x800100, 0x80013f) AM_WRITE(cps1_cps_a_w) AM_BASE(&cps1_cps_a_regs) /* CPS-A custom */
AM_RANGE(0x800140, 0x80017f) AM_READWRITE(cps1_cps_b_r, cps1_cps_b_w) AM_BASE(&cps1_cps_b_regs) /* CPS-B custom */
- AM_RANGE(0x800180, 0x800187) AM_WRITE(cps1_soundlatch_w) /* Sound command */
+ AM_RANGE(0x800180, 0x800187) AM_WRITE(cps1_soundlatch_w) /* Sound command */
AM_RANGE(0x800188, 0x80018f) AM_WRITE(cps1_soundlatch2_w) /* Sound timer fade */
AM_RANGE(0x8001c0, 0x8001ff) AM_READWRITE(cps1_cps_b_r, cps1_cps_b_w) /* mirror (SF2 revision "E" US 910228) */
AM_RANGE(0x900000, 0x92ffff) AM_RAM_WRITE(cps1_gfxram_w) AM_BASE(&cps1_gfxram) AM_SIZE(&cps1_gfxram_size) /* SF2CE executes code from here */
@@ -571,17 +558,17 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( qsound_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
- AM_RANGE(0x800000, 0x800007) AM_READ(cps1_in1_r) /* Player input ports */
- AM_RANGE(0x800018, 0x80001f) AM_READ(cps1_dsw_r) /* System input ports / Dip Switches */
+ AM_RANGE(0x800000, 0x800007) AM_READ_PORT("IN1") /* Player input ports */
+ AM_RANGE(0x800018, 0x80001f) AM_READ(cps1_dsw_r) /* System input ports / Dip Switches */
AM_RANGE(0x800030, 0x800037) AM_WRITE(cps1_coinctrl_w)
AM_RANGE(0x800100, 0x80013f) AM_WRITE(cps1_cps_a_w) AM_BASE(&cps1_cps_a_regs) /* CPS-A custom */
AM_RANGE(0x800140, 0x80017f) AM_READWRITE(cps1_cps_b_r, cps1_cps_b_w) AM_BASE(&cps1_cps_b_regs) /* CPS-B custom */
AM_RANGE(0x900000, 0x92ffff) AM_RAM_WRITE(cps1_gfxram_w) AM_BASE(&cps1_gfxram) AM_SIZE(&cps1_gfxram_size) /* SF2CE executes code from here */
- AM_RANGE(0xf00000, 0xf0ffff) AM_READ(qsound_rom_r) /* Slammasters protection */
+ AM_RANGE(0xf00000, 0xf0ffff) AM_READ(qsound_rom_r) /* Slammasters protection */
AM_RANGE(0xf18000, 0xf19fff) AM_READWRITE(qsound_sharedram1_r, qsound_sharedram1_w) /* Q RAM */
- AM_RANGE(0xf1c000, 0xf1c001) AM_READ(cps1_in2_r) /* Player 3 controls (later games) */
- AM_RANGE(0xf1c002, 0xf1c003) AM_READ(cps1_in3_r) /* Player 4 controls ("Muscle Bombers") */
- AM_RANGE(0xf1c004, 0xf1c005) AM_WRITE(cpsq_coinctrl2_w) /* Coin control2 (later games) */
+ AM_RANGE(0xf1c000, 0xf1c001) AM_READ_PORT("IN2") /* Player 3 controls (later games) */
+ AM_RANGE(0xf1c002, 0xf1c003) AM_READ_PORT("IN3") /* Player 4 controls ("Muscle Bombers") */
+ AM_RANGE(0xf1c004, 0xf1c005) AM_WRITE(cpsq_coinctrl2_w) /* Coin control2 (later games) */
AM_RANGE(0xf1c006, 0xf1c007) AM_READWRITE(cps1_eeprom_port_r, cps1_eeprom_port_w)
AM_RANGE(0xf1e000, 0xf1ffff) AM_READWRITE(qsound_sharedram2_r, qsound_sharedram2_w) /* Q RAM */
AM_RANGE(0xff0000, 0xffffff) AM_RAM
@@ -678,7 +665,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( forgottn )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -688,7 +675,7 @@ static INPUT_PORTS_START( forgottn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWC") // The manual only mentions two DIP switch banks.
+ PORT_START("DSWC") // The manual only mentions two DIP switch banks.
PORT_DIPUNUSED( 0x80, 0x80 ) // Is this port brought out to DIP switches or not?
PORT_DIPUNKNOWN( 0x40, 0x40 ) // Check code at 0x013c78 (0x013690 in 'lostwrld')
PORT_DIPUNUSED( 0x20, 0x20 )
@@ -698,7 +685,7 @@ static INPUT_PORTS_START( forgottn )
PORT_DIPUNUSED( 0x02, 0x02 )
PORT_DIPUNUSED( 0x01, 0x01 )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
CPS1_DIFFICULTY_1( "DIP-B" )
PORT_DIPUNUSED_DIPLOC( 0x20, 0x20, "DIP-B:4" )
PORT_DIPUNUSED_DIPLOC( 0x10, 0x10, "DIP-B:5" )
@@ -708,7 +695,7 @@ static INPUT_PORTS_START( forgottn )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_1( "DIP-A" )
PORT_DIPNAME( 0x40, 0x40, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("DIP-A:7")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -717,7 +704,7 @@ static INPUT_PORTS_START( forgottn )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -735,15 +722,15 @@ static INPUT_PORTS_START( forgottn )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DIAL0")
+ PORT_START("DIAL0")
PORT_BIT( 0x0fff, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X) PORT_PLAYER(1)
- PORT_START_TAG("DIAL1")
+ PORT_START("DIAL1")
PORT_BIT( 0x0fff, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( ghouls )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) /* Service, but it doesn't give any credit */
@@ -753,7 +740,7 @@ static INPUT_PORTS_START( ghouls )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW(C):1,2")
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -774,7 +761,7 @@ static INPUT_PORTS_START( ghouls )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
CPS1_DIFFICULTY_2( "SW(B)" )
PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "SW(B):4" )
PORT_DIPNAME( 0x30, 0x30, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW(B):5,6")
@@ -785,7 +772,7 @@ static INPUT_PORTS_START( ghouls )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW(B):7" )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(B):8" )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_1( "SW(A)" )
PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW(A):7,8")
PORT_DIPSETTING( 0xc0, "Upright 1 Player" )
@@ -793,7 +780,7 @@ static INPUT_PORTS_START( ghouls )
// PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) ) // Manual says these are both valid settings
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) ) // for 2-player cocktail cabinet
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -815,7 +802,7 @@ INPUT_PORTS_END
/* Same as 'ghouls' but additional "Freeze" Dip Switch, different "Lives" Dip Switch,
and LOTS of "debug" features (read the notes to know how to activate them) */
static INPUT_PORTS_START( ghoulsu )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) /* Service, but it doesn't give any credit */
@@ -825,7 +812,7 @@ static INPUT_PORTS_START( ghoulsu )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW(C):1,2")
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x03, "3" )
@@ -846,7 +833,7 @@ static INPUT_PORTS_START( ghoulsu )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
/* Standard Dip Switches */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW(B):1,2,3")
PORT_CONDITION("DSWC",0x80,PORTCOND_EQUALS,0x80)
@@ -895,7 +882,7 @@ static INPUT_PORTS_START( ghoulsu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
/* Standard Dip Switches */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW(A):1,2,3")
PORT_CONDITION("DSWC",0x80,PORTCOND_EQUALS,0x80)
@@ -951,7 +938,7 @@ static INPUT_PORTS_START( ghoulsu )
// PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) ) // Manual says these are both valid settings
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) ) // for 2-player cocktail cabinet
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -982,7 +969,7 @@ INPUT_PORTS_END
/* "Debug" features to be implemented */
static INPUT_PORTS_START( strider )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -992,7 +979,7 @@ static INPUT_PORTS_START( strider )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_1( "SW(A)" )
PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW(A):7,8")
PORT_DIPSETTING( 0xc0, "Upright 1 Player" ) // These switches are not documented in the manual
@@ -1000,7 +987,7 @@ static INPUT_PORTS_START( strider )
// PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
CPS1_DIFFICULTY_2( "SW(B)" )
/* In 'striderj', bit 3 is stored at 0xff8e77 ($e77,A5) via code at 0x000a2a,
but this address is never checked again.
@@ -1019,7 +1006,7 @@ static INPUT_PORTS_START( strider )
PORT_DIPSETTING( 0x00, "-1" )
PORT_DIPSETTING( 0x80, "Default" )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW(C):1,2")
PORT_DIPSETTING( 0x00, "2" ) // "6" in the "test mode" and manual
PORT_DIPSETTING( 0x03, "3" )
@@ -1044,7 +1031,7 @@ static INPUT_PORTS_START( strider )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) ) // To enable the "debug" features
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -1066,7 +1053,7 @@ INPUT_PORTS_END
/* Same as 'strider' but additional "2 Coins to Start, 1 to Continue" Dip Switch */
/* "Debug" features to be implemented */
static INPUT_PORTS_START( stridrua )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1076,7 +1063,7 @@ static INPUT_PORTS_START( stridrua )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_1( "SW(A)" )
PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW(A):7,8")
PORT_DIPSETTING( 0xc0, "Upright 1 Player" ) // These switches are not documented in the
@@ -1084,7 +1071,7 @@ static INPUT_PORTS_START( stridrua )
// PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
CPS1_DIFFICULTY_2( "SW(B)" )
/* In 'striderj', bit 3 is stored at 0xff8e77 ($e77,A5) via code at 0x000a2a,
but this address is never checked again.
@@ -1103,7 +1090,7 @@ static INPUT_PORTS_START( stridrua )
PORT_DIPSETTING( 0x00, "-1" ) // manual
PORT_DIPSETTING( 0x80, "Default" )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW(C):1,2")
PORT_DIPSETTING( 0x00, "2" ) // "6" in the "test mode" and manual
PORT_DIPSETTING( 0x03, "3" )
@@ -1128,7 +1115,7 @@ static INPUT_PORTS_START( stridrua )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) ) // To enable the "debug" features
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -1148,7 +1135,7 @@ static INPUT_PORTS_START( stridrua )
INPUT_PORTS_END
static INPUT_PORTS_START( dynwar )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1158,7 +1145,7 @@ static INPUT_PORTS_START( dynwar )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPNAME( 0x01, 0x01, "Freeze" ) PORT_DIPLOCATION("SW(C):1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) // Also affects energy cost - read notes
PORT_DIPSETTING( 0x00, DEF_STR( On ) ) // This switch is not documented in the manual
@@ -1180,7 +1167,7 @@ static INPUT_PORTS_START( dynwar )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
CPS1_DIFFICULTY_2( "SW(B)" )
PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "SW(B):4" ) // These five switches are not documented in the
PORT_DIPUNUSED_DIPLOC( 0x10, 0x10, "SW(B):5" ) // manual
@@ -1188,7 +1175,7 @@ static INPUT_PORTS_START( dynwar )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW(B):7" )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(B):8" )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
/* According to the manual, ALL switches 1 to 6 must be ON to have
"2 Coins/1 Credit (1 to continue)" for both coin slots */
CPS1_COINAGE_3( "SW(A)" )
@@ -1197,7 +1184,7 @@ static INPUT_PORTS_START( dynwar )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) // This switch is not documented in the manual
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -1218,7 +1205,7 @@ INPUT_PORTS_END
/* Read the notes to know how to activate the "debug" features */
static INPUT_PORTS_START( willow )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1228,7 +1215,7 @@ static INPUT_PORTS_START( willow )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
/* Standard Dip Switches */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW(C):1,2")
PORT_CONDITION("DSWC",0x80,PORTCOND_EQUALS,0x80)
@@ -1282,7 +1269,7 @@ static INPUT_PORTS_START( willow )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) ) // To enable the "debug" features
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
/* Standard Dip Switches */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW(B):1,2,3")
PORT_CONDITION("DSWC",0x80,PORTCOND_EQUALS,0x80)
@@ -1346,7 +1333,7 @@ static INPUT_PORTS_START( willow )
// PORT_DIPSETTING( 0x20, "INVALID !" ) PORT_CONDITION("DSWC",0x80,PORTCOND_EQUALS,0x00)
// PORT_DIPSETTING( 0x00, "INVALID !" ) PORT_CONDITION("DSWC",0x80,PORTCOND_EQUALS,0x00)
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
/* Standard Dip Switches */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW(A):1,2,3")
PORT_CONDITION("DSWC",0x80,PORTCOND_EQUALS,0x80)
@@ -1389,7 +1376,7 @@ static INPUT_PORTS_START( willow )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_CONDITION("DSWC",0x80,PORTCOND_EQUALS,0x00)
PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_CONDITION("DSWC",0x80,PORTCOND_EQUALS,0x00)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -1410,7 +1397,7 @@ INPUT_PORTS_END
/* To enable extra choices in the "test mode", you must press "Coin 1" ('5') AND "Service Mode" ('F2') */
static INPUT_PORTS_START( unsquad )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1420,14 +1407,14 @@ static INPUT_PORTS_START( unsquad )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_3( "SW(A)" )
/* According to the manual, ALL bits 0 to 5 must be ON to have
"2 Coins/1 Credit (1 to continue)" for both coin slots */
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW(A):7" )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(A):8" )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
CPS1_DIFFICULTY_1( "SW(B)" )
PORT_DIPNAME( 0x18, 0x18, "Damage" ) PORT_DIPLOCATION("SW(B):4,5")
PORT_DIPSETTING( 0x10, "Small" ) // Check code at 0x006f4e
@@ -1438,7 +1425,7 @@ static INPUT_PORTS_START( unsquad )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW(B):7" )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(B):8" )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW(C):1" )
PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "SW(C):2" )
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW(C):3")
@@ -1460,7 +1447,7 @@ static INPUT_PORTS_START( unsquad )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -1482,7 +1469,7 @@ INPUT_PORTS_END
/* To enable other choices in the "test mode", you must press ("P1 Button 1" ('Ctrl')
or "P1 Button 2" ('Alt')) when "Service Mode" is ON */
static INPUT_PORTS_START( ffight )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1492,14 +1479,14 @@ static INPUT_PORTS_START( ffight )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_1( "SW(A)" )
PORT_DIPNAME( 0x40, 0x40, "2 Coins to Start, 1 to Continue" ) PORT_DIPLOCATION("SW(A):7")
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(A):8" )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x07, 0x04, "Difficulty Level 1" ) PORT_DIPLOCATION("SW(B):1,2,3")
PORT_DIPSETTING( 0x07, DEF_STR( Easiest ) ) // "01"
PORT_DIPSETTING( 0x06, DEF_STR( Easier ) ) // "02"
@@ -1521,7 +1508,7 @@ static INPUT_PORTS_START( ffight )
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(B):8" )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW(C):1,2")
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x03, "2" )
@@ -1546,7 +1533,7 @@ static INPUT_PORTS_START( ffight )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -1566,7 +1553,7 @@ static INPUT_PORTS_START( ffight )
INPUT_PORTS_END
static INPUT_PORTS_START( 1941 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1576,14 +1563,14 @@ static INPUT_PORTS_START( 1941 )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_1( "SW(A)" )
PORT_DIPNAME( 0x40, 0x40, "2 Coins to Start, 1 to Continue" ) PORT_DIPLOCATION("SW(A):7")
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(A):8" )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
CPS1_DIFFICULTY_1( "SW(B)" )
PORT_DIPNAME( 0x18, 0x18, "Level Up Timer" ) PORT_DIPLOCATION("SW(B):4,5")
PORT_DIPSETTING( 0x18, "More Slowly" )
@@ -1599,7 +1586,7 @@ static INPUT_PORTS_START( 1941 )
PORT_DIPSETTING( 0x80, "3 Bars" )
PORT_DIPSETTING( 0x00, "4 Bars" )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPNAME( 0x01, 0x01, "Throttle Game Speed" ) PORT_DIPLOCATION("SW(C):1")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) // turning this off will break the game
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1623,7 +1610,7 @@ static INPUT_PORTS_START( 1941 )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -1643,7 +1630,7 @@ static INPUT_PORTS_START( 1941 )
INPUT_PORTS_END
static INPUT_PORTS_START( mercs )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1653,7 +1640,7 @@ static INPUT_PORTS_START( mercs )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_2( "SW(A)" )
PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "SW(A):4" ) // These three switches are not documented in
PORT_DIPUNUSED_DIPLOC( 0x10, 0x10, "SW(A):5" ) // the manual
@@ -1663,7 +1650,7 @@ static INPUT_PORTS_START( mercs )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(A):8" ) // This switch is not documented in the manual
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
CPS1_DIFFICULTY_1( "SW(B)" )
PORT_DIPNAME( 0x08, 0x08, "Coin Slots" ) PORT_DIPLOCATION("SW(B):4")
PORT_DIPSETTING( 0x00, "1" )
@@ -1675,7 +1662,7 @@ static INPUT_PORTS_START( mercs )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW(B):7" ) // the manual
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(B):8" )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW(C):1" ) // These three switches are not documented in
PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "SW(C):2" ) // the manual
PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "SW(C):3" )
@@ -1693,7 +1680,7 @@ static INPUT_PORTS_START( mercs )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW(C):8" )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -1711,7 +1698,7 @@ static INPUT_PORTS_START( mercs )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
@@ -1736,7 +1723,7 @@ INPUT_PORTS_END
- 0xff156b.w : energy (player 2)
*/
static INPUT_PORTS_START( mtwins )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1746,12 +1733,12 @@ static INPUT_PORTS_START( mtwins )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_1( "SW(A)" )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW(A):7" )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(A):8" )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
CPS1_DIFFICULTY_1( "SW(B)" )
PORT_DIPNAME( 0x38, 0x18, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW(B):4,5,6")
// PORT_DIPSETTING( 0x30, "1" ) // 0x38 energy, smallest damage
@@ -1765,7 +1752,7 @@ static INPUT_PORTS_START( mtwins )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW(B):7" )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(B):8" )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW(C):1" )
PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "SW(C):2" )
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW(C):3")
@@ -1787,7 +1774,7 @@ static INPUT_PORTS_START( mtwins )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -1812,7 +1799,7 @@ INPUT_PORTS_END
- code at 0x01c322 ('msword' and 'mswordr1'), 0x01c39e ('mswordu') or 0x01c3e0 ('mswordj') : unknown effect
These features are not available because of the 'bra' instruction after the test of bit 7. */
static INPUT_PORTS_START( msword )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1822,14 +1809,14 @@ static INPUT_PORTS_START( msword )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_1( "SW(A)" )
PORT_DIPNAME( 0x40, 0x40, "2 Coins to Start, 1 to Continue" ) PORT_DIPLOCATION("SW(A):7")
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(A):8" )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x07, 0x04, "Player's vitality consumption" ) PORT_DIPLOCATION("SW(B):1,2,3") // "Level 1"
PORT_DIPSETTING( 0x07, "1 (Easiest)" ) // "Easy 3" (-1 every 28 frames)
PORT_DIPSETTING( 0x06, "2" ) // "Easy 2" (-1 every 24 frames)
@@ -1853,7 +1840,7 @@ static INPUT_PORTS_START( msword )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(B):8" )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPNAME( 0x03, 0x03, "Vitality Packs" ) PORT_DIPLOCATION("SW(C):1,2")
PORT_DIPSETTING( 0x00, "1" ) // 0x0320
PORT_DIPSETTING( 0x03, "2" ) // 0x0640
@@ -1878,7 +1865,7 @@ static INPUT_PORTS_START( msword )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -1898,7 +1885,7 @@ static INPUT_PORTS_START( msword )
INPUT_PORTS_END
static INPUT_PORTS_START( cawing )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1908,14 +1895,14 @@ static INPUT_PORTS_START( cawing )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_1( "SW(A)" )
PORT_DIPNAME( 0x40, 0x40, "2 Coins to Start, 1 to Continue" ) PORT_DIPLOCATION("SW(A):7")
PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) // Overrides all other coinage settings
PORT_DIPSETTING( 0x00, DEF_STR( On ) ) // according to manual
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(A):8" ) // This switch is not documented
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x07, 0x04, "Difficulty Level (Enemy's Strength)" ) PORT_DIPLOCATION("SW(B):1,2,3")
PORT_DIPSETTING( 0x07, "1 (Easiest)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1934,7 +1921,7 @@ static INPUT_PORTS_START( cawing )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW(B):7" ) // This switch is not documented
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(B):8" ) // This switch is not documented
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW(C):1" ) // This switch is not documented
PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "SW(C):2" ) // This switch is not documented
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW(C):3")
@@ -1956,7 +1943,7 @@ static INPUT_PORTS_START( cawing )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -1977,7 +1964,7 @@ INPUT_PORTS_END
/* "Debug" features to be implemented */
static INPUT_PORTS_START( nemo )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1987,14 +1974,14 @@ static INPUT_PORTS_START( nemo )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_1( "SW(A)" )
PORT_DIPNAME( 0x40, 0x40, "2 Coins to Start, 1 to Continue" ) PORT_DIPLOCATION("SW(A):7")
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(A):8" )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
CPS1_DIFFICULTY_1( "SW(B)" )
PORT_DIPNAME( 0x18, 0x18, "Life Bar" ) PORT_DIPLOCATION("SW(B):4,5")
PORT_DIPSETTING( 0x00, "Minimun" )
@@ -2005,7 +1992,7 @@ static INPUT_PORTS_START( nemo )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW(B):7" )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(B):8" )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW(C):1,2")
PORT_DIPSETTING( 0x02, "1" )
PORT_DIPSETTING( 0x03, "2" )
@@ -2030,7 +2017,7 @@ static INPUT_PORTS_START( nemo )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) ) // To enable the "debug" features
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -2050,7 +2037,7 @@ static INPUT_PORTS_START( nemo )
INPUT_PORTS_END
static INPUT_PORTS_START( sf2 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2060,14 +2047,14 @@ static INPUT_PORTS_START( sf2 )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_1( "SW(A)" )
PORT_DIPNAME( 0x40, 0x40, "2 Coins to Start, 1 to Continue" ) PORT_DIPLOCATION("SW(A):7")
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(A):8" )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
CPS1_DIFFICULTY_1( "SW(B)" )
PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "SW(B):4" )
PORT_DIPUNUSED_DIPLOC( 0x10, 0x10, "SW(B):5" )
@@ -2075,7 +2062,7 @@ static INPUT_PORTS_START( sf2 )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW(B):7" )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(B):8" )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW(C):1" )
PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "SW(C):2" )
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW(C):3")
@@ -2097,7 +2084,7 @@ static INPUT_PORTS_START( sf2 )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -2115,7 +2102,7 @@ static INPUT_PORTS_START( sf2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* Extra buttons */
+ PORT_START("IN2") /* Extra buttons */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1)
@@ -2128,7 +2115,7 @@ INPUT_PORTS_END
/* Needs further checking */
static INPUT_PORTS_START( sf2j )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2138,14 +2125,14 @@ static INPUT_PORTS_START( sf2j )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_1( "SW(A)" )
PORT_DIPNAME( 0x40, 0x40, "2 Coins to Start, 1 to Continue" ) PORT_DIPLOCATION("SW(A):7")
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(A):8" )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
CPS1_DIFFICULTY_1( "SW(B)" )
PORT_DIPNAME( 0x08, 0x00, "2 Players Game" ) PORT_DIPLOCATION("SW(B):4")
PORT_DIPSETTING( 0x08, "1 Credit/No Continue" )
@@ -2155,7 +2142,7 @@ static INPUT_PORTS_START( sf2j )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW(B):7" )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(B):8" )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW(C):1" )
PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "SW(C):2" )
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW(C):3")
@@ -2177,7 +2164,7 @@ static INPUT_PORTS_START( sf2j )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -2195,7 +2182,7 @@ static INPUT_PORTS_START( sf2j )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* Extra buttons */
+ PORT_START("IN2") /* Extra buttons */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1)
@@ -2207,7 +2194,7 @@ static INPUT_PORTS_START( sf2j )
INPUT_PORTS_END
static INPUT_PORTS_START( 3wonders )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2217,7 +2204,7 @@ static INPUT_PORTS_START( 3wonders )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_1( "SW(A)" )
PORT_DIPNAME( 0x40, 0x40, "2 Coins to Start, 1 to Continue" ) PORT_DIPLOCATION("SW(A):7")
PORT_CONDITION("DSWA",0x3f,PORTCOND_NOTEQUALS,0x00)
@@ -2232,7 +2219,7 @@ static INPUT_PORTS_START( 3wonders )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x03, 0x02, "Lives (Midnight Wanderers)" ) PORT_DIPLOCATION("SW(B):1,2")
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -2254,7 +2241,7 @@ static INPUT_PORTS_START( 3wonders )
PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPNAME( 0x03, 0x01, "Lives (Don't Pull)" ) PORT_DIPLOCATION("SW(C):1,2")
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -2278,7 +2265,7 @@ static INPUT_PORTS_START( 3wonders )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -2298,7 +2285,7 @@ static INPUT_PORTS_START( 3wonders )
INPUT_PORTS_END
static INPUT_PORTS_START( kod )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2308,7 +2295,7 @@ static INPUT_PORTS_START( kod )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_2( "SW(A)" )
PORT_DIPNAME( 0x08, 0x08, "Coin Slots" ) PORT_DIPLOCATION("SW(A):4")
PORT_DIPSETTING( 0x00, "1" )
@@ -2322,7 +2309,7 @@ static INPUT_PORTS_START( kod )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(A):8" )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
CPS1_DIFFICULTY_1( "SW(B)" )
PORT_DIPNAME( 0x38, 0x38, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW(B):4,5,6")
PORT_DIPSETTING( 0x30, "1" )
@@ -2339,7 +2326,7 @@ static INPUT_PORTS_START( kod )
PORT_DIPSETTING( 0x40, "160k and every 450k" )
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW(C):1" )
PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "SW(C):2" )
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW(C):3")
@@ -2361,7 +2348,7 @@ static INPUT_PORTS_START( kod )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -2379,7 +2366,7 @@ static INPUT_PORTS_START( kod )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* Player 3 */
+ PORT_START("IN2") /* Player 3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
@@ -2405,7 +2392,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( captcomm )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2415,7 +2402,7 @@ static INPUT_PORTS_START( captcomm )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_2( "SW(A)" )
PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "SW(A):4" ) // The manual says to leave these three
PORT_DIPUNUSED_DIPLOC( 0x10, 0x10, "SW(A):5" ) // switches off. Does turning them on cause
@@ -2425,7 +2412,7 @@ static INPUT_PORTS_START( captcomm )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(A):8" ) // Unused according to manual
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x07, 0x04, "Difficulty 1" ) PORT_DIPLOCATION("SW(B):1,2,3")
PORT_DIPSETTING( 0x07, "1 (Easiest)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -2447,7 +2434,7 @@ static INPUT_PORTS_START( captcomm )
PORT_DIPSETTING( 0x80, "3 Players" )
PORT_DIPSETTING( 0x00, "4 Players" )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW(C):1,2")
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x03, "2" )
@@ -2472,7 +2459,7 @@ static INPUT_PORTS_START( captcomm )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -2490,7 +2477,7 @@ static INPUT_PORTS_START( captcomm )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* Player 3 */
+ PORT_START("IN2") /* Player 3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
@@ -2500,7 +2487,7 @@ static INPUT_PORTS_START( captcomm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START_TAG("IN3") /* Player 4 */
+ PORT_START("IN3") /* Player 4 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(4)
@@ -2512,7 +2499,7 @@ static INPUT_PORTS_START( captcomm )
INPUT_PORTS_END
static INPUT_PORTS_START( knights )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2522,7 +2509,7 @@ static INPUT_PORTS_START( knights )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_2( "SW(A)" )
PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "SW(A):4" )
PORT_DIPUNUSED_DIPLOC( 0x10, 0x10, "SW(A):5" )
@@ -2532,7 +2519,7 @@ static INPUT_PORTS_START( knights )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(A):8" )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x07, 0x04, "Enemy's attack frequency" ) PORT_DIPLOCATION("SW(B):1,2,3")
PORT_DIPSETTING( 0x07, "1 (Easiest)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -2558,7 +2545,7 @@ static INPUT_PORTS_START( knights )
PORT_DIPSETTING( 0x00, "2 Players" )
PORT_DIPSETTING( 0x80, "3 Players" )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW(C):1,2")
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x03, "2" )
@@ -2583,7 +2570,7 @@ static INPUT_PORTS_START( knights )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -2601,7 +2588,7 @@ static INPUT_PORTS_START( knights )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* Player 3 */
+ PORT_START("IN2") /* Player 3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
@@ -2613,7 +2600,7 @@ static INPUT_PORTS_START( knights )
INPUT_PORTS_END
static INPUT_PORTS_START( varth )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2623,14 +2610,14 @@ static INPUT_PORTS_START( varth )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_1( "SW(A)" )
PORT_DIPNAME( 0x40, 0x40, "2 Coins to Start, 1 to Continue" ) PORT_DIPLOCATION("SW(A):7")
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(A):8" )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
CPS1_DIFFICULTY_1( "SW(B)" )
PORT_DIPNAME( 0x18, 0x10, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW(B):4,5")
PORT_DIPSETTING( 0x18, "600k and every 1.400k" )
@@ -2641,7 +2628,7 @@ static INPUT_PORTS_START( varth )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW(B):7" )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(B):8" )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW(C):1,2")
PORT_DIPSETTING( 0x02, "1" )
PORT_DIPSETTING( 0x01, "2" )
@@ -2666,7 +2653,7 @@ static INPUT_PORTS_START( varth )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -2687,7 +2674,7 @@ INPUT_PORTS_END
/* Needs further checking */
static INPUT_PORTS_START( cworld2j )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2697,7 +2684,7 @@ static INPUT_PORTS_START( cworld2j )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_2( "SW(A)" )
PORT_DIPUNKNOWN_DIPLOC( 0x08, 0x08, "SW(A):4" )
PORT_DIPUNKNOWN_DIPLOC( 0x10, 0x10, "SW(A):5" )
@@ -2709,7 +2696,7 @@ static INPUT_PORTS_START( cworld2j )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x07, 0x06, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW(B):1,2,3")
PORT_DIPSETTING( 0x06, "0" )
PORT_DIPSETTING( 0x05, "1" )
@@ -2727,7 +2714,7 @@ static INPUT_PORTS_START( cworld2j )
PORT_DIPSETTING( 0xa0, "4" )
PORT_DIPSETTING( 0xc0, "5" )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPUNKNOWN_DIPLOC( 0x01, 0x01, "SW(C):1" )
PORT_DIPUNKNOWN_DIPLOC( 0x02, 0x02, "SW(C):2" )
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW(C):3")
@@ -2749,7 +2736,7 @@ static INPUT_PORTS_START( cworld2j )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2767,13 +2754,13 @@ static INPUT_PORTS_START( cworld2j )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_START_TAG("IN2") /* check code at 0x000614, 0x0008ac and 0x000e36 */
+ PORT_START("IN2") /* check code at 0x000614, 0x0008ac and 0x000e36 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
/* Needs further checking */
static INPUT_PORTS_START( wof )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2783,19 +2770,19 @@ static INPUT_PORTS_START( wof )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA") /* (not used, EEPROM) */
+ PORT_START("DSWA") /* (not used, EEPROM) */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWB") /* (not used, EEPROM) */
+ PORT_START("DSWB") /* (not used, EEPROM) */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPNAME( 0x08, 0x08, "Freeze" )
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0xf7, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -2813,7 +2800,7 @@ static INPUT_PORTS_START( wof )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* Player 3 */
+ PORT_START("IN2") /* Player 3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
@@ -2826,7 +2813,7 @@ INPUT_PORTS_END
/* Needs further checking */
static INPUT_PORTS_START( dino )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2836,19 +2823,19 @@ static INPUT_PORTS_START( dino )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA") /* (not used, EEPROM) */
+ PORT_START("DSWA") /* (not used, EEPROM) */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWB") /* (not used, EEPROM) */
+ PORT_START("DSWB") /* (not used, EEPROM) */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPNAME( 0x08, 0x08, "Freeze" )
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0xf7, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -2866,7 +2853,7 @@ static INPUT_PORTS_START( dino )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* Player 3 */
+ PORT_START("IN2") /* Player 3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
@@ -2879,7 +2866,7 @@ INPUT_PORTS_END
/* Needs further checking */
static INPUT_PORTS_START( punisher )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2889,19 +2876,19 @@ static INPUT_PORTS_START( punisher )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA") /* (not used, EEPROM) */
+ PORT_START("DSWA") /* (not used, EEPROM) */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWB") /* (not used, EEPROM) */
+ PORT_START("DSWB") /* (not used, EEPROM) */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPNAME( 0x08, 0x08, "Freeze" )
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0xf7, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -2922,7 +2909,7 @@ INPUT_PORTS_END
/* Needs further checking */
static INPUT_PORTS_START( slammast )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2932,19 +2919,19 @@ static INPUT_PORTS_START( slammast )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA") /* (not used, EEPROM) */
+ PORT_START("DSWA") /* (not used, EEPROM) */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWB") /* (not used, EEPROM) */
+ PORT_START("DSWB") /* (not used, EEPROM) */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPNAME( 0x08, 0x08, "Freeze" )
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0xf7, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -2962,7 +2949,7 @@ static INPUT_PORTS_START( slammast )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
- PORT_START_TAG("IN2") /* Player 3 */
+ PORT_START("IN2") /* Player 3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
@@ -2972,7 +2959,7 @@ static INPUT_PORTS_START( slammast )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START_TAG("IN3") /* Player 4 */
+ PORT_START("IN3") /* Player 4 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(4)
@@ -2985,7 +2972,7 @@ INPUT_PORTS_END
/* Needs further checking */
static INPUT_PORTS_START( pnickj )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2995,7 +2982,7 @@ static INPUT_PORTS_START( pnickj )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_2( "SW(A)" )
PORT_DIPNAME( 0x08, 0x08, "Coin Slots" ) PORT_DIPLOCATION("SW(A):4")
PORT_DIPSETTING( 0x08, "1" )
@@ -3005,7 +2992,7 @@ static INPUT_PORTS_START( pnickj )
PORT_DIPUNKNOWN_DIPLOC( 0x40, 0x40, "SW(A):7" )
PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x80, "SW(A):8" )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
CPS1_DIFFICULTY_1( "SW(B)" )
PORT_DIPUNKNOWN_DIPLOC( 0x08, 0x08, "SW(B):4" )
PORT_DIPUNKNOWN_DIPLOC( 0x10, 0x10, "SW(B):5" )
@@ -3016,7 +3003,7 @@ static INPUT_PORTS_START( pnickj )
PORT_DIPSETTING( 0x40, "5 Games Match" )
PORT_DIPSETTING( 0x00, "7 Games Match" )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPUNKNOWN_DIPLOC( 0x01, 0x01, "SW(C):1" )
PORT_DIPUNKNOWN_DIPLOC( 0x02, 0x02, "SW(C):2" )
PORT_DIPUNKNOWN_DIPLOC( 0x04, 0x04, "SW(C):3" )
@@ -3034,7 +3021,7 @@ static INPUT_PORTS_START( pnickj )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -3055,7 +3042,7 @@ INPUT_PORTS_END
/* Needs further checking */
static INPUT_PORTS_START( qad )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -3065,7 +3052,7 @@ static INPUT_PORTS_START( qad )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_2( "SW(A)" )
PORT_DIPUNKNOWN_DIPLOC( 0x08, 0x08, "SW(A):4" ) // Manual says these are for coin 2, but they
PORT_DIPUNKNOWN_DIPLOC( 0x10, 0x10, "SW(A):5" ) // coin to setting, but they clearly don't do
@@ -3075,7 +3062,7 @@ static INPUT_PORTS_START( qad )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(A):8" )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x07, 0x04, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW(B):1,2,3")
// PORT_DIPSETTING( 0x07, DEF_STR( Easiest ) ) // Controls overall difficulty
PORT_DIPSETTING( 0x06, DEF_STR( Easiest ) ) // Manual documents duplicate settings
@@ -3100,7 +3087,7 @@ static INPUT_PORTS_START( qad )
// PORT_DIPSETTING( 0x20, "1" )
// PORT_DIPSETTING( 0x00, "1" )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW(C):1" )
PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "SW(C):2" )
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW(C):3")
@@ -3122,7 +3109,7 @@ static INPUT_PORTS_START( qad )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -3140,13 +3127,13 @@ static INPUT_PORTS_START( qad )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_START_TAG("IN2") /* check code at 0x01d2d2 */
+ PORT_START("IN2") /* check code at 0x01d2d2 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
/* Needs further checking */
static INPUT_PORTS_START( qadj )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -3156,7 +3143,7 @@ static INPUT_PORTS_START( qadj )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_2( "SW(A)" )
PORT_DIPUNKNOWN_DIPLOC( 0x08, 0x08, "SW(A):4" ) // Manual says these are for coin 2, but they
PORT_DIPUNKNOWN_DIPLOC( 0x10, 0x10, "SW(A):5" ) // coin to setting, but they clearly don't do
@@ -3166,7 +3153,7 @@ static INPUT_PORTS_START( qadj )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(A):8" )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW(B):1,2,3")
PORT_DIPSETTING( 0x07, "0" )
PORT_DIPSETTING( 0x06, "1" )
@@ -3188,7 +3175,7 @@ static INPUT_PORTS_START( qadj )
// PORT_DIPSETTING( 0x40, "2" )
// PORT_DIPSETTING( 0x60, "3" )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPUNKNOWN_DIPLOC( 0x01, 0x01, "SW(C):1" )
PORT_DIPUNKNOWN_DIPLOC( 0x02, 0x02, "SW(C):2" )
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW(C):3")
@@ -3210,7 +3197,7 @@ static INPUT_PORTS_START( qadj )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -3228,16 +3215,16 @@ static INPUT_PORTS_START( qadj )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_START_TAG("IN2") /* check code at 0x000c48 */
+ PORT_START("IN2") /* check code at 0x000c48 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* check code at 0x000c3e */
+ PORT_START("IN3") /* check code at 0x000c3e */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
/* Needs further checking */
static INPUT_PORTS_START( qtono2 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -3247,7 +3234,7 @@ static INPUT_PORTS_START( qtono2 )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_2( "SW(A)" )
PORT_DIPUNKNOWN_DIPLOC( 0x08, 0x08, "SW(A):4" )
PORT_DIPUNKNOWN_DIPLOC( 0x10, 0x10, "SW(A):5" )
@@ -3257,7 +3244,7 @@ static INPUT_PORTS_START( qtono2 )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x80, "SW(A):8" )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
CPS1_DIFFICULTY_1( "SW(B)" )
PORT_DIPUNKNOWN_DIPLOC( 0x08, 0x08, "SW(B):4" )
PORT_DIPUNKNOWN_DIPLOC( 0x10, 0x10, "SW(B):5" )
@@ -3271,7 +3258,7 @@ static INPUT_PORTS_START( qtono2 )
// PORT_DIPSETTING( 0x20, "?" )
// PORT_DIPSETTING( 0x00, "?" )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPUNKNOWN_DIPLOC( 0x01, 0x01, "SW(C):1" )
PORT_DIPNAME( 0x02, 0x02, "Infinite Lives (Cheat)") PORT_DIPLOCATION("SW(C):2")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -3295,7 +3282,7 @@ static INPUT_PORTS_START( qtono2 )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -3313,16 +3300,16 @@ static INPUT_PORTS_START( qtono2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_START_TAG("IN2") /* check code at 0x000f80 */
+ PORT_START("IN2") /* check code at 0x000f80 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* check code at 0x000f76 */
+ PORT_START("IN3") /* check code at 0x000f76 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
/* Needs further checking */
static INPUT_PORTS_START( pang3 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -3332,18 +3319,18 @@ static INPUT_PORTS_START( pang3 )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA") /* (not used, EEPROM) */
+ PORT_START("DSWA") /* (not used, EEPROM) */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWB") /* (not used, EEPROM) */
+ PORT_START("DSWB") /* (not used, EEPROM) */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPNAME( 0x08, 0x08, "Freeze" )
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -3364,7 +3351,7 @@ INPUT_PORTS_END
/* Needs further checking */
static INPUT_PORTS_START( megaman )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -3374,7 +3361,7 @@ static INPUT_PORTS_START( megaman )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x1f, 0x1f, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW(A):1,2,3,4,5")
PORT_DIPSETTING( 0x0f, DEF_STR( 9C_1C ) )
PORT_DIPSETTING( 0x10, DEF_STR( 8C_1C ) )
@@ -3403,7 +3390,7 @@ static INPUT_PORTS_START( megaman )
PORT_DIPSETTING( 0x40, "2, Individual" )
PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x80, "SW(A):8" )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW(B):1,2")
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -3421,7 +3408,7 @@ static INPUT_PORTS_START( megaman )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x80, "SW(B):8" )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW(C):1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3439,7 +3426,7 @@ static INPUT_PORTS_START( megaman )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c
index 1743014d63c..6ade9ba4df2 100644
--- a/src/mame/drivers/cps2.c
+++ b/src/mame/drivers/cps2.c
@@ -912,8 +912,9 @@ ADDRESS_MAP_END
*
*************************************/
-static INPUT_PORTS_START( cps2 )
- PORT_START_TAG("IN0") /* IN0 (0x00) */
+/* 4 players and 4 buttons */
+static INPUT_PORTS_START( cps2_4p4b )
+ PORT_START("IN0") /* IN0 (0x00) */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -931,7 +932,7 @@ static INPUT_PORTS_START( cps2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_START_TAG("IN1") /* IN1 (0x10) */
+ PORT_START("IN1") /* IN1 (0x10) */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
@@ -949,7 +950,7 @@ static INPUT_PORTS_START( cps2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(4)
- PORT_START_TAG("IN2") /* IN2 (0x20) */
+ PORT_START("IN2") /* IN2 (0x20) */
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(eeprom_bit_r, NULL)
PORT_SERVICE_NO_TOGGLE( 0x0002, IP_ACTIVE_LOW )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -964,11 +965,6 @@ static INPUT_PORTS_START( cps2 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN4 )
INPUT_PORTS_END
-/* 4 players and 4 buttons */
-static INPUT_PORTS_START( cps2_4p4b )
- PORT_INCLUDE(cps2)
-INPUT_PORTS_END
-
/* 4 players and 3 buttons */
static INPUT_PORTS_START( cps2_4p3b )
PORT_INCLUDE(cps2_4p4b)
@@ -1158,10 +1154,10 @@ INPUT_PORTS_END
static INPUT_PORTS_START( pzloop2 )
PORT_INCLUDE(cps2_2p1b)
- PORT_START_TAG("PADDLE1")
+ PORT_START("PADDLE1")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("PADDLE2")
+ PORT_START("PADDLE2")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_PLAYER(2)
INPUT_PORTS_END
diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c
index ac192d8b433..b83ec42e4a0 100644
--- a/src/mame/drivers/cps3.c
+++ b/src/mame/drivers/cps3.c
@@ -1777,16 +1777,6 @@ static WRITE32_HANDLER( cram_gfxflash_bank_w )
}
}
-static READ32_HANDLER( cps3_io1_r )
-{
- return input_port_read(machine, "IN0");
-}
-
-static READ32_HANDLER( cps3_io2_r )
-{
- return input_port_read(machine, "IN1");
-}
-
// this seems to be dma active flags, and maybe vblank... not if it is anything else
static READ32_HANDLER( cps3_vbl_r )
{
@@ -2341,8 +2331,8 @@ static ADDRESS_MAP_START( cps3_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x04100000, 0x041fffff) AM_READWRITE(cram_data_r, cram_data_w)
AM_RANGE(0x04200000, 0x043fffff) AM_READWRITE(cps3_gfxflash_r, cps3_gfxflash_w) // GFX Flash ROMS
- AM_RANGE(0x05000000, 0x05000003) AM_READ( cps3_io1_r )
- AM_RANGE(0x05000004, 0x05000007) AM_READ( cps3_io2_r )
+ AM_RANGE(0x05000000, 0x05000003) AM_READ_PORT("INPUTS")
+ AM_RANGE(0x05000004, 0x05000007) AM_READ_PORT("EXTRA")
AM_RANGE(0x05000008, 0x0500000b) AM_WRITE( SMH_NOP ) // ?? every frame
@@ -2370,7 +2360,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( cps3 )
- PORT_START_TAG("IN0")
+ PORT_START("INPUTS")
PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -2398,7 +2388,7 @@ static INPUT_PORTS_START( cps3 )
PORT_BIT( 0x20000000, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xc0000000, IP_ACTIVE_LOW, IPT_UNUSED ) // nothing here?
- PORT_START_TAG("IN1")
+ PORT_START("EXTRA")
PORT_BIT( 0x0001ffff, IP_ACTIVE_LOW, IPT_UNUSED ) // nothing here?
PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1)
PORT_BIT( 0x00040000, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
diff --git a/src/mame/drivers/crbaloon.c b/src/mame/drivers/crbaloon.c
index 34c7f4bcc96..53c2bfeb595 100644
--- a/src/mame/drivers/crbaloon.c
+++ b/src/mame/drivers/crbaloon.c
@@ -243,7 +243,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( crbaloon )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x01, "Test?" ) PORT_DIPLOCATION("SW A:1")
PORT_DIPSETTING( 0x01, "I/O Check?" )
PORT_DIPSETTING( 0x00, "RAM Check?" )
@@ -268,7 +268,7 @@ static INPUT_PORTS_START( crbaloon )
PORT_DIPSETTING( 0xe0, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0x00, "Disable" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -278,7 +278,7 @@ static INPUT_PORTS_START( crbaloon )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* PC3259 */
PORT_DIPNAME( 0x10, 0x10, "Invulnerability") PORT_DIPLOCATION("SW B:1")
PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
@@ -293,7 +293,7 @@ static INPUT_PORTS_START( crbaloon )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW B:5")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -302,16 +302,16 @@ static INPUT_PORTS_START( crbaloon )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(pc3092_r, 0)
- PORT_START_TAG("PC3092")
+ PORT_START("PC3092")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("VR2")
+ PORT_START("VR2")
PORT_ADJUSTER(50, "VR2 - Beep")
- PORT_START_TAG("VR3")
+ PORT_START("VR3")
PORT_ADJUSTER(50, "VR3 - Music")
INPUT_PORTS_END
diff --git a/src/mame/drivers/crgolf.c b/src/mame/drivers/crgolf.c
index 7ef49d059ce..1d59cfb5d3e 100644
--- a/src/mame/drivers/crgolf.c
+++ b/src/mame/drivers/crgolf.c
@@ -271,12 +271,12 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( crgolf )
- PORT_START_TAG("IN0") /* CREDIT */
+ PORT_START("IN0") /* CREDIT */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN1") /* SELECT */
+ PORT_START("IN1") /* SELECT */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START2 )
@@ -284,7 +284,7 @@ static INPUT_PORTS_START( crgolf )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_START4 )
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("P1") /* PLAY1 */
+ PORT_START("P1") /* PLAY1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_PLAYER(1) /* club select */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) /* backward address */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) /* forward address */
@@ -294,7 +294,7 @@ static INPUT_PORTS_START( crgolf )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) /* direction right */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) /* shot switch */
- PORT_START_TAG("P2") /* PLAY2 */
+ PORT_START("P2") /* PLAY2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_COCKTAIL /* club select */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL /* backward address */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_COCKTAIL /* forward address */
@@ -304,7 +304,7 @@ static INPUT_PORTS_START( crgolf )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL /* direction right */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL /* shot switch */
- PORT_START_TAG("DSW") /* DIPSW */
+ PORT_START("DSW") /* DIPSW */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Difficulty ))
PORT_DIPSETTING( 0x00, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x01, DEF_STR( Hard ) )
@@ -325,16 +325,16 @@ static INPUT_PORTS_START( crgolf )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_SERVICE( 0x80, IP_ACTIVE_HIGH )
- PORT_START_TAG("UNUSED0")
+ PORT_START("UNUSED0")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("UNUSED1")
+ PORT_START("UNUSED1")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("STICK0")
+ PORT_START("STICK0")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(70) PORT_KEYDELTA(16) PORT_REVERSE
- PORT_START_TAG("STICK1")
+ PORT_START("STICK1")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(70) PORT_KEYDELTA(16) PORT_REVERSE PORT_COCKTAIL
INPUT_PORTS_END
diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c
index 80024179902..5cdb846671b 100644
--- a/src/mame/drivers/crimfght.c
+++ b/src/mame/drivers/crimfght.c
@@ -51,14 +51,14 @@ static WRITE8_HANDLER( crimfght_snd_bankswitch_w )
static ADDRESS_MAP_START( crimfght_readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_READ(SMH_BANK1) /* banked RAM */
AM_RANGE(0x0400, 0x1fff) AM_READ(SMH_RAM) /* RAM */
- AM_RANGE(0x3f80, 0x3f80) AM_READ(input_port_7_r) /* Coinsw */
- AM_RANGE(0x3f81, 0x3f81) AM_READ(input_port_3_r) /* 1P controls */
- AM_RANGE(0x3f82, 0x3f82) AM_READ(input_port_4_r) /* 2P controls */
- AM_RANGE(0x3f83, 0x3f83) AM_READ(input_port_1_r) /* DSW #2 */
- AM_RANGE(0x3f84, 0x3f84) AM_READ(input_port_2_r) /* DSW #3 */
- AM_RANGE(0x3f85, 0x3f85) AM_READ(input_port_5_r) /* 3P controls */
- AM_RANGE(0x3f86, 0x3f86) AM_READ(input_port_6_r) /* 4P controls */
- AM_RANGE(0x3f87, 0x3f87) AM_READ(input_port_0_r) /* DSW #1 */
+ AM_RANGE(0x3f80, 0x3f80) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0x3f81, 0x3f81) AM_READ_PORT("P1")
+ AM_RANGE(0x3f82, 0x3f82) AM_READ_PORT("P2")
+ AM_RANGE(0x3f83, 0x3f83) AM_READ_PORT("DSW2")
+ AM_RANGE(0x3f84, 0x3f84) AM_READ_PORT("DSW3")
+ AM_RANGE(0x3f85, 0x3f85) AM_READ_PORT("P3")
+ AM_RANGE(0x3f86, 0x3f86) AM_READ_PORT("P4")
+ AM_RANGE(0x3f87, 0x3f87) AM_READ_PORT("DSW1")
AM_RANGE(0x3f88, 0x3f88) AM_READ(watchdog_reset_r) /* watchdog reset */
AM_RANGE(0x2000, 0x5fff) AM_READ(K052109_051960_r) /* video RAM + sprite RAM */
AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_BANK2) /* banked ROM */
@@ -98,7 +98,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( crimfght )
- PORT_START /* DSW #1 */
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -134,7 +134,7 @@ static INPUT_PORTS_START( crimfght )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x00, "Invalid" ) */
- PORT_START /* DSW #2 */
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -159,7 +159,7 @@ static INPUT_PORTS_START( crimfght )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW #3 */
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -172,7 +172,7 @@ static INPUT_PORTS_START( crimfght )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* PLAYER 1 INPUTS */
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -182,7 +182,7 @@ static INPUT_PORTS_START( crimfght )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* PLAYER 2 INPUTS */
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -192,7 +192,7 @@ static INPUT_PORTS_START( crimfght )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* PLAYER 3 INPUTS */
+ PORT_START("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
@@ -202,7 +202,7 @@ static INPUT_PORTS_START( crimfght )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* PLAYER 4 INPUTS */
+ PORT_START("P4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
@@ -212,7 +212,7 @@ static INPUT_PORTS_START( crimfght )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* COINSW */
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -224,7 +224,7 @@ static INPUT_PORTS_START( crimfght )
INPUT_PORTS_END
static INPUT_PORTS_START( crimfgtj )
- PORT_START /* DSW #1 */
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -260,7 +260,7 @@ static INPUT_PORTS_START( crimfgtj )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START /* DSW #2 */
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -284,7 +284,7 @@ static INPUT_PORTS_START( crimfgtj )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW #3 */
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -297,7 +297,7 @@ static INPUT_PORTS_START( crimfgtj )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* PLAYER 1 INPUTS */
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -307,7 +307,7 @@ static INPUT_PORTS_START( crimfgtj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START /* PLAYER 2 INPUTS */
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -317,13 +317,13 @@ static INPUT_PORTS_START( crimfgtj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START /* PLAYER 3 INPUTS */
+ PORT_START("P3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* PLAYER 4 INPUTS */
+ PORT_START("P4")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* COINSW */
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c
index b62172d78fc..c86807e1758 100644
--- a/src/mame/drivers/crospang.c
+++ b/src/mame/drivers/crospang.c
@@ -10,7 +10,7 @@
Heuk Sun Baek Sa (c)199? Oksan / F2 System
Bestri (c)199? F2 System
- Cross Pang New - Is snown on the website but is not currently dumped
+ Cross Pang New - Is shown on the website but is not currently dumped
No Copyright Notice is displayed for Cross Pang however the following page
lists it as being by F2 System, Released April 1998
@@ -65,9 +65,9 @@ static ADDRESS_MAP_START( crospang_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x122000, 0x1227ff) AM_READ(SMH_RAM)
AM_RANGE(0x200000, 0x2005ff) AM_READ(SMH_RAM)
AM_RANGE(0x210000, 0x2107ff) AM_READ(SMH_RAM)
- AM_RANGE(0x280000, 0x280001) AM_READ(input_port_0_word_r)
- AM_RANGE(0x280002, 0x280003) AM_READ(input_port_1_word_r)
- AM_RANGE(0x280004, 0x280005) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x280000, 0x280001) AM_READ_PORT("P1_P2")
+ AM_RANGE(0x280002, 0x280003) AM_READ_PORT("COIN")
+ AM_RANGE(0x280004, 0x280005) AM_READ_PORT("DSW")
AM_RANGE(0x320000, 0x32ffff) AM_READ(SMH_RAM)
ADDRESS_MAP_END
@@ -93,9 +93,9 @@ static ADDRESS_MAP_START( bestri_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x122000, 0x1227ff) AM_READ(SMH_RAM)
AM_RANGE(0x200000, 0x2005ff) AM_READ(SMH_RAM)
AM_RANGE(0x210000, 0x2107ff) AM_READ(SMH_RAM)
- AM_RANGE(0x280000, 0x280001) AM_READ(input_port_0_word_r)
- AM_RANGE(0x280002, 0x280003) AM_READ(input_port_1_word_r)
- AM_RANGE(0x280004, 0x280005) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x280000, 0x280001) AM_READ_PORT("P1_P2")
+ AM_RANGE(0x280002, 0x280003) AM_READ_PORT("COIN")
+ AM_RANGE(0x280004, 0x280005) AM_READ_PORT("DSW")
AM_RANGE(0x3a0000, 0x3affff) AM_READ(SMH_RAM)
ADDRESS_MAP_END
@@ -147,31 +147,31 @@ static ADDRESS_MAP_START( crospang_sound_writeport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( crospang )
- PORT_START /* Inputs */
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1)
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1)
+ PORT_START("P1_P2")
+ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1)
+ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
+ PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2)
+ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2)
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
+ PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START /* Coins */
+ PORT_START("COIN")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0xfc00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* DSW */
+ PORT_START("DSW")
PORT_DIPNAME( 0x0003, 0x0002, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) )
@@ -218,31 +218,31 @@ static INPUT_PORTS_START( crospang )
INPUT_PORTS_END
static INPUT_PORTS_START( heuksun )
- PORT_START
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1)
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1)
+ PORT_START("P1_P2")
+ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1)
+ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
+ PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2)
+ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2)
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
+ PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START
+ PORT_START("COIN")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0xfc00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x0003, 0x0002, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) )
@@ -293,31 +293,31 @@ static INPUT_PORTS_START( heuksun )
INPUT_PORTS_END
static INPUT_PORTS_START( bestri )
- PORT_START
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1)
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1)
+ PORT_START("P1_P2")
+ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1)
+ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
+ PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2)
+ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2)
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
+ PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START
+ PORT_START("COIN")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0xfc00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c
index 7daa500b4cf..4e2a7bb69cc 100644
--- a/src/mame/drivers/crshrace.c
+++ b/src/mame/drivers/crshrace.c
@@ -193,12 +193,12 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfe0000, 0xfeffff) AM_READ(SMH_RAM)
AM_RANGE(0xffd000, 0xffdfff) AM_READ(SMH_RAM)
AM_RANGE(0xffe000, 0xffefff) AM_READ(SMH_RAM)
- AM_RANGE(0xfff000, 0xfff001) AM_READ(input_port_0_word_r)
- AM_RANGE(0xfff002, 0xfff003) AM_READ(input_port_1_word_r)
- AM_RANGE(0xfff004, 0xfff005) AM_READ(input_port_2_word_r)
+ AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("P1")
+ AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("P2")
+ AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW0")
AM_RANGE(0xfff006, 0xfff007) AM_READ(country_sndpending_r)
- AM_RANGE(0xfff00a, 0xfff00b) AM_READ(input_port_3_word_r)
- AM_RANGE(0xfff00e, 0xfff00f) AM_READ(input_port_4_word_r)
+ AM_RANGE(0xfff00a, 0xfff00b) AM_READ_PORT("DSW1")
+ AM_RANGE(0xfff00e, 0xfff00f) AM_READ_PORT("P3")
ADDRESS_MAP_END
static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 )
@@ -248,7 +248,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( crshrace )
- PORT_START_TAG("IN0")
+ PORT_START("P1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -266,7 +266,7 @@ static INPUT_PORTS_START( crshrace )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("IN1")
+ PORT_START("P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -276,32 +276,7 @@ static INPUT_PORTS_START( crshrace )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
- /* DSW1 : 0xfe1c83 = !(0xfff004) */
- PORT_DIPNAME( 0x0100, 0x0100, "Coin Slot" )
- PORT_DIPSETTING( 0x0100, "Same" )
- PORT_DIPSETTING( 0x0000, "Individual" )
- PORT_DIPNAME( 0x0e00, 0x0e00, DEF_STR( Coin_A ) )
- PORT_DIPSETTING( 0x0a00, DEF_STR( 3C_1C ) )
- PORT_DIPSETTING( 0x0c00, DEF_STR( 2C_1C ) )
- PORT_DIPSETTING( 0x0e00, DEF_STR( 1C_1C ) )
- PORT_DIPSETTING( 0x0800, DEF_STR( 1C_2C ) )
- PORT_DIPSETTING( 0x0600, DEF_STR( 1C_3C ) )
- PORT_DIPSETTING( 0x0400, DEF_STR( 1C_4C ) )
- PORT_DIPSETTING( 0x0200, DEF_STR( 1C_5C ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( 1C_6C ) )
- PORT_DIPNAME( 0x7000, 0x7000, DEF_STR( Coin_B ) )
- PORT_DIPSETTING( 0x5000, DEF_STR( 3C_1C ) )
- PORT_DIPSETTING( 0x6000, DEF_STR( 2C_1C ) )
- PORT_DIPSETTING( 0x7000, DEF_STR( 1C_1C ) )
- PORT_DIPSETTING( 0x4000, DEF_STR( 1C_2C ) )
- PORT_DIPSETTING( 0x3000, DEF_STR( 1C_3C ) )
- PORT_DIPSETTING( 0x2000, DEF_STR( 1C_4C ) )
- PORT_DIPSETTING( 0x1000, DEF_STR( 1C_5C ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( 1C_6C ) )
- PORT_DIPNAME( 0x8000, 0x8000, "2 to Start, 1 to Cont." ) // Other desc. was too long !
- PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_START("DSW0")
/* DSW2 : 0xfe1c84 = !(0xfff005) */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
@@ -313,143 +288,8 @@ static INPUT_PORTS_START( crshrace )
PORT_DIPSETTING( 0x0004, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_SERVICE( 0x0008, IP_ACTIVE_LOW )
- PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x0010, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x0020, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x00c0, 0x00c0, DEF_STR( Difficulty ) )
- PORT_DIPSETTING( 0x0080, DEF_STR( Easy ) )
- PORT_DIPSETTING( 0x00c0, DEF_STR( Normal ) )
- PORT_DIPSETTING( 0x0040, DEF_STR( Hard ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( Hardest ) )
-
- PORT_START_TAG("DSW1")
- /* DSW3 : 0xfe1c85 = !(0xfff00b) */
-#if CRSHRACE_3P_HACK
- PORT_DIPNAME( 0x0001, 0x0001, "Maximum Players" )
- PORT_DIPSETTING( 0x0001, "2" )
- PORT_DIPSETTING( 0x0000, "3" )
- PORT_DIPNAME( 0x000e, 0x000e, "Coin C" )
- PORT_DIPSETTING( 0x000a, DEF_STR( 3C_1C ) )
- PORT_DIPSETTING( 0x000c, DEF_STR( 2C_1C ) )
- PORT_DIPSETTING( 0x000e, DEF_STR( 1C_1C ) )
- PORT_DIPSETTING( 0x0008, DEF_STR( 1C_2C ) )
- PORT_DIPSETTING( 0x0006, DEF_STR( 1C_3C ) )
- PORT_DIPSETTING( 0x0004, DEF_STR( 1C_4C ) )
- PORT_DIPSETTING( 0x0002, DEF_STR( 1C_5C ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( 1C_6C ) )
-#else
- PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x0002, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x0004, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x0008, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
-#endif
- PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x0010, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x0020, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x0040, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0080, 0x0080, "Reset on P.O.S.T. Error" ) // Check code at 0x003812
- PORT_DIPSETTING( 0x0000, DEF_STR( No ) )
- PORT_DIPSETTING( 0x0080, DEF_STR( Yes ) )
-
- PORT_START_TAG("IN2")
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START3 )
-
- PORT_START_TAG("DSW2")
- PORT_DIPNAME( 0x0f00, 0x0100, "Country" )
- PORT_DIPSETTING( 0x0100, DEF_STR( World ) )
- PORT_DIPSETTING( 0x0800, "USA & Canada" )
- PORT_DIPSETTING( 0x0000, DEF_STR( Japan ) )
- PORT_DIPSETTING( 0x0200, "Korea" )
- PORT_DIPSETTING( 0x0400, "Hong Kong & Taiwan" )
-/*
- the following are all the same and seem to act like the World setting, possibly
- with a slightly different attract sequence
- PORT_DIPSETTING( 0x0300, "5" )
- PORT_DIPSETTING( 0x0500, "5" )
- PORT_DIPSETTING( 0x0600, "5" )
- PORT_DIPSETTING( 0x0700, "5" )
- PORT_DIPSETTING( 0x0900, "5" )
- PORT_DIPSETTING( 0x0a00, "5" )
- PORT_DIPSETTING( 0x0b00, "5" )
- PORT_DIPSETTING( 0x0c00, "5" )
- PORT_DIPSETTING( 0x0d00, "5" )
- PORT_DIPSETTING( 0x0e00, "5" )
- PORT_DIPSETTING( 0x0f00, "5" )
-*/
- PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* pending sound command */
-INPUT_PORTS_END
-
-/* Same as 'crshrace', but additional "unknown" Dip Switch (see notes) */
-static INPUT_PORTS_START( crshrac2 )
- PORT_START_TAG("IN0")
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) // "Accel"
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) // "Brake"
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN3 )
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_SERVICE2 ) // "Test"
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_TILT )
- PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_SERVICE1 )
-
- PORT_START_TAG("IN1")
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) // "Accel"
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) // "Brake"
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("DSW0")
- /* DSW2 : 0xfe1c84 = !(0xfff005) */
- PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) )
- PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Demo_Sounds ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0002, DEF_STR( On ) )
- PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Free_Play ) )
- PORT_DIPSETTING( 0x0004, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_SERVICE( 0x0008, IP_ACTIVE_LOW )
- PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) ) // Check code at 0x00ea36
- PORT_DIPSETTING( 0x0010, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x0020, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPUNUSED( 0x0010, 0x0010 )
+ PORT_DIPUNUSED( 0x0020, 0x0020 )
PORT_DIPNAME( 0x00c0, 0x00c0, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0080, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x00c0, DEF_STR( Normal ) )
@@ -481,7 +321,7 @@ static INPUT_PORTS_START( crshrac2 )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
/* DSW3 : 0xfe1c85 = !(0xfff00b) */
#if CRSHRACE_3P_HACK
PORT_DIPNAME( 0x0001, 0x0001, "Maximum Players" )
@@ -497,33 +337,19 @@ static INPUT_PORTS_START( crshrac2 )
PORT_DIPSETTING( 0x0002, DEF_STR( 1C_5C ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 1C_6C ) )
#else
- PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x0002, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x0004, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x0008, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPUNUSED( 0x0001, 0x0001 )
+ PORT_DIPUNUSED( 0x0002, 0x0002 )
+ PORT_DIPUNUSED( 0x0004, 0x0004 )
+ PORT_DIPUNUSED( 0x0008, 0x0008 )
#endif
- PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x0010, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x0020, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x0040, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0080, 0x0080, "Reset on P.O.S.T. Error" ) // Check code at 0x003830
+ PORT_DIPUNUSED( 0x0010, 0x0010 )
+ PORT_DIPUNUSED( 0x0020, 0x0020 )
+ PORT_DIPUNUSED( 0x0040, 0x0040 )
+ PORT_DIPNAME( 0x0080, 0x0080, "Reset on P.O.S.T. Error" ) // Check code at 0x003812
PORT_DIPSETTING( 0x0000, DEF_STR( No ) )
PORT_DIPSETTING( 0x0080, DEF_STR( Yes ) )
- PORT_START_TAG("IN2")
+ PORT_START("P3")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -533,7 +359,7 @@ static INPUT_PORTS_START( crshrac2 )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0f00, 0x0100, "Country" )
PORT_DIPSETTING( 0x0100, DEF_STR( World ) )
PORT_DIPSETTING( 0x0800, "USA & Canada" )
@@ -558,6 +384,14 @@ static INPUT_PORTS_START( crshrac2 )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* pending sound command */
INPUT_PORTS_END
+/* Same as 'crshrace', but additional "unknown" Dip Switch (see notes) */
+static INPUT_PORTS_START( crshrac2 )
+ PORT_INCLUDE( crshrace )
+
+ PORT_MODIFY("DSW0")
+ PORT_DIPUNKNOWN( 0x0010, 0x0010 ) // Check code at 0x00ea36
+INPUT_PORTS_END
+
static const gfx_layout charlayout =
diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c
index 53887ba8dfa..7b4657f99fc 100644
--- a/src/mame/drivers/crystal.c
+++ b/src/mame/drivers/crystal.c
@@ -181,12 +181,12 @@ static WRITE32_HANDLER(FlipCount_w)
static READ32_HANDLER(Input_r)
{
if(offset == 0)
- return input_port_read(machine, "IN0")|(input_port_read(machine, "IN1")<<16);
+ return input_port_read(machine, "P1_P2");
else if(offset == 1)
- return input_port_read(machine, "IN2")|(input_port_read(machine, "IN3")<<16);
+ return input_port_read(machine, "P3_P4");
else if(offset == 2)
{
- UINT8 Port4 = input_port_read(machine, "IN4");
+ UINT8 Port4 = input_port_read(machine, "SYSTEM");
if(!(Port4 & 0x10) && ((OldPort4^Port4) & 0x10)) //coin buttons trigger IRQs
IntReq(machine, 12);
if(!(Port4 & 0x20) && ((OldPort4^Port4) & 0x20))
@@ -719,47 +719,49 @@ static INTERRUPT_GEN(crystal_interrupt)
}
static INPUT_PORTS_START(crystal)
- PORT_START_TAG("IN0")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
-
- PORT_START_TAG("IN1")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
-
- PORT_START_TAG("IN2")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(3)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(4)
-
- PORT_START_TAG("IN3")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3)
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(4)
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(4)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(3)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(4)
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(3)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(4)
-
- PORT_START_TAG("IN4")
+ PORT_START("P1_P2")
+ PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
+ PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
+ PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
+ PORT_BIT( 0x00000008, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
+ PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
+ PORT_BIT( 0x00000020, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
+ PORT_BIT( 0x00000040, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
+ PORT_BIT( 0x00000080, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
+ PORT_BIT( 0x0000ff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
+ PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
+ PORT_BIT( 0x00040000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
+ PORT_BIT( 0x00080000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
+ PORT_BIT( 0x00100000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
+ PORT_BIT( 0x00200000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
+ PORT_BIT( 0x00400000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
+ PORT_BIT( 0x00800000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
+ PORT_BIT( 0xff000000, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START("P3_P4")
+ PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
+ PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
+ PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
+ PORT_BIT( 0x00000008, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
+ PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
+ PORT_BIT( 0x00000020, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
+ PORT_BIT( 0x00000040, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(3)
+ PORT_BIT( 0x00000080, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(4)
+ PORT_BIT( 0x0000ff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3)
+ PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(4)
+ PORT_BIT( 0x00040000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3)
+ PORT_BIT( 0x00080000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(4)
+ PORT_BIT( 0x00100000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(3)
+ PORT_BIT( 0x00200000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(4)
+ PORT_BIT( 0x00400000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(3)
+ PORT_BIT( 0x00800000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(4)
+ PORT_BIT( 0xff000000, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START3 )
@@ -769,7 +771,7 @@ static INPUT_PORTS_START(crystal)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Pause ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -794,7 +796,6 @@ static INPUT_PORTS_START(crystal)
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Test ) )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-
INPUT_PORTS_END
static const struct VR0Interface vr0_interface =
diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c
index 602f902759e..c3f72ab6573 100644
--- a/src/mame/drivers/cshooter.c
+++ b/src/mame/drivers/cshooter.c
@@ -370,7 +370,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( cshooter )
- PORT_START_TAG("IN0") /* IN0 (0xc200) */
+ PORT_START("IN0") /* IN0 (0xc200) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -380,7 +380,7 @@ static INPUT_PORTS_START( cshooter )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 (0xc201) */
+ PORT_START("IN1") /* IN1 (0xc201) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -390,7 +390,7 @@ static INPUT_PORTS_START( cshooter )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* START (0xc202) */
+ PORT_START("IN2") /* START (0xc202) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -400,7 +400,7 @@ static INPUT_PORTS_START( cshooter )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW2") /* DSW2 (0xc203) */
+ PORT_START("DSW2") /* DSW2 (0xc203) */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Medium ) )
@@ -419,7 +419,7 @@ static INPUT_PORTS_START( cshooter )
PORT_DIPUNUSED( 0x40, IP_ACTIVE_LOW )
PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW1") /* DSW1 (0xc204) */
+ PORT_START("DSW1") /* DSW1 (0xc204) */
PORT_DIPNAME( 0x01, 0x01, "Coin Slots" )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x00, "2" )
@@ -439,7 +439,7 @@ static INPUT_PORTS_START( cshooter )
PORT_DIPUNUSED( 0x40, IP_ACTIVE_LOW )
PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("COIN") /* COIN (0xc205) */
+ PORT_START("COIN") /* COIN (0xc205) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/csk.c b/src/mame/drivers/csk.c
index b63293206de..e07641c12ef 100644
--- a/src/mame/drivers/csk.c
+++ b/src/mame/drivers/csk.c
@@ -258,7 +258,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( csk227 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SWA:8")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -281,7 +281,7 @@ static INPUT_PORTS_START( csk227 )
PORT_DIPSETTING( 0x80, "100000" )
PORT_DIPSETTING( 0x00, "Unlimited" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x07, 0x07, "Coin In Rate" ) PORT_DIPLOCATION("SWB:8,7,6")
PORT_DIPSETTING( 0x07, "1" )
PORT_DIPSETTING( 0x06, "2" )
@@ -305,7 +305,7 @@ static INPUT_PORTS_START( csk227 )
PORT_DIPSETTING( 0x80, "Manual" )
PORT_DIPSETTING( 0x00, "Auto" )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x03, 0x03, "W-UP Bonus Rate" ) PORT_DIPLOCATION("SWC:8,7")
PORT_DIPSETTING( 0x03, "200" )
PORT_DIPSETTING( 0x02, "300" )
@@ -327,7 +327,7 @@ static INPUT_PORTS_START( csk227 )
PORT_DIPSETTING( 0x80, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
- PORT_START_TAG("DSW4")
+ PORT_START("DSW4")
PORT_DIPNAME( 0x0f, 0x07, "Main Game Chance" ) PORT_DIPLOCATION("SWD:8,7,6,5")
PORT_DIPSETTING( 0x0f, "69%" )
PORT_DIPSETTING( 0x0e, "72%" )
@@ -358,7 +358,7 @@ static INPUT_PORTS_START( csk227 )
PORT_DIPSETTING( 0x80, "Ticket" )
PORT_DIPSETTING( 0x00, "Hopper" )
- PORT_START_TAG("DSW5")
+ PORT_START("DSW5")
PORT_DIPNAME( 0x07, 0x07, "Key Out Rate" ) PORT_DIPLOCATION("SWE:8,7,6")
PORT_DIPSETTING( 0x07, "1:1" )
PORT_DIPSETTING( 0x06, "10:1" )
@@ -381,7 +381,7 @@ static INPUT_PORTS_START( csk227 )
PORT_DIPSETTING( 0x80, "Change" )
PORT_DIPSETTING( 0x00, "Fixed" )
- PORT_START_TAG("5081")
+ PORT_START("5081")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -391,7 +391,7 @@ static INPUT_PORTS_START( csk227 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_F1) PORT_NAME("Statistics")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Hold5/Bet")
- PORT_START_TAG("5082")
+ PORT_START("5082")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -401,7 +401,7 @@ static INPUT_PORTS_START( csk227 )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Hold4/Take")
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Hold3/W-Up")
- PORT_START_TAG("5091")
+ PORT_START("5091")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
@@ -411,7 +411,7 @@ static INPUT_PORTS_START( csk227 )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Hold1/High/Low")
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Hold2/Red/Black")
- PORT_START_TAG("50A0")
+ PORT_START("50A0")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -419,7 +419,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( csk234 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SWA:8")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -442,7 +442,7 @@ static INPUT_PORTS_START( csk234 )
PORT_DIPSETTING( 0x80, "5000" )
PORT_DIPSETTING( 0x00, "10000" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x07, 0x07, "Coin In Rate" ) PORT_DIPLOCATION("SWB:8,7,6")
PORT_DIPSETTING( 0x07, "1" )
PORT_DIPSETTING( 0x06, "2" )
@@ -466,7 +466,7 @@ static INPUT_PORTS_START( csk234 )
PORT_DIPSETTING( 0x80, "Manual" )
PORT_DIPSETTING( 0x00, "Auto" )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, "W-UP Bonus Target" ) PORT_DIPLOCATION("SWC:8")
PORT_DIPSETTING( 0x01, "3000" )
PORT_DIPSETTING( 0x00, "5000" )
@@ -487,7 +487,7 @@ static INPUT_PORTS_START( csk234 )
PORT_DIPSETTING( 0x00, "Symbols" )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW4")
+ PORT_START("DSW4")
PORT_DIPNAME( 0x0f, 0x07, "Main Game Chance" ) PORT_DIPLOCATION("SWD:8,7,6,5")
PORT_DIPSETTING( 0x0f, "69%" )
PORT_DIPSETTING( 0x0e, "72%" )
@@ -513,7 +513,7 @@ static INPUT_PORTS_START( csk234 )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
PORT_BIT( 0xC0, IP_ACTIVE_LOW, IPT_UNUSED ) /* Joker and Royal Flush are always enabled */
- PORT_START_TAG("DSW5")
+ PORT_START("DSW5")
PORT_DIPNAME( 0x01, 0x00, "Hopper" ) PORT_DIPLOCATION("SWE:8")
PORT_DIPSETTING( 0x01, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
@@ -530,13 +530,13 @@ static INPUT_PORTS_START( csk234 )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("5081")
+ PORT_START("5081")
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_E) PORT_NAME("HPSW")
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_4) PORT_NAME("Payout")
PORT_SERVICE_NO_TOGGLE( 0x20, IP_ACTIVE_LOW )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_F1) PORT_NAME("Statistics")
- PORT_START_TAG("5082")
+ PORT_START("5082")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -544,10 +544,10 @@ static INPUT_PORTS_START( csk234 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_W) PORT_NAME("Key Down")
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("5091") /* Custom IO */
+ PORT_START("5091") /* Custom IO */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("50A0")
+ PORT_START("50A0")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Hold1/High/Low")
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Hold5/Bet")
@@ -560,7 +560,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( cpoker )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SWA:8")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -583,7 +583,7 @@ static INPUT_PORTS_START( cpoker )
PORT_DIPSETTING( 0x80, "5000" )
PORT_DIPSETTING( 0x00, "10000" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x07, 0x07, "Coin In Rate" ) PORT_DIPLOCATION("SWB:8,7,6")
PORT_DIPSETTING( 0x07, "1" )
PORT_DIPSETTING( 0x06, "2" )
@@ -607,7 +607,7 @@ static INPUT_PORTS_START( cpoker )
PORT_DIPSETTING( 0x80, "Manual" )
PORT_DIPSETTING( 0x00, "Auto" )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, "W-UP Bonus Target" ) PORT_DIPLOCATION("SWC:8")
PORT_DIPSETTING( 0x01, "3000" )
PORT_DIPSETTING( 0x00, "5000" )
@@ -630,7 +630,7 @@ static INPUT_PORTS_START( cpoker )
PORT_DIPSETTING( 0x80, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
- PORT_START_TAG("DSW4")
+ PORT_START("DSW4")
PORT_DIPNAME( 0x0f, 0x07, "Main Game Chance" ) PORT_DIPLOCATION("SWD:8,7,6,5")
PORT_DIPSETTING( 0x0f, "69%" )
PORT_DIPSETTING( 0x0e, "72%" )
@@ -661,16 +661,16 @@ static INPUT_PORTS_START( cpoker )
PORT_DIPSETTING( 0x80, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
- PORT_START_TAG("DSW5")
+ PORT_START("DSW5")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("5081")
+ PORT_START("5081")
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_E) PORT_NAME("HPSW")
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_4) PORT_NAME("Payout")
PORT_SERVICE_NO_TOGGLE( 0x20, IP_ACTIVE_LOW )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_F1) PORT_NAME("Statistics")
- PORT_START_TAG("5082")
+ PORT_START("5082")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -678,10 +678,10 @@ static INPUT_PORTS_START( cpoker )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_W) PORT_NAME("Key Down")
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("5091") /* Custom IO */
+ PORT_START("5091") /* Custom IO */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("50A0")
+ PORT_START("50A0")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Hold1/High/Low")
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Hold5/Bet")
diff --git a/src/mame/drivers/cubocd32.c b/src/mame/drivers/cubocd32.c
index f6c4270f708..a82f35e806f 100644
--- a/src/mame/drivers/cubocd32.c
+++ b/src/mame/drivers/cubocd32.c
@@ -126,15 +126,10 @@ static void cd32_cia_0_portb_w(UINT8 data)
logerror("%06x:CIA0_portb_w(%02x)\n", activecpu_get_pc(), data);
}
-static READ32_HANDLER( dipswitch_r )
-{
- return input_port_read(machine, "DIPSW1");
-}
-
static ADDRESS_MAP_START( cd32_map, ADDRESS_SPACE_PROGRAM, 32 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x1fffff) AM_RAMBANK(1) AM_BASE(&amiga_chip_ram32) AM_SIZE(&amiga_chip_ram_size)
- AM_RANGE(0x800000, 0x800003) AM_READ( dipswitch_r )
+ AM_RANGE(0x800000, 0x800003) AM_READ_PORT("DIPSW1")
AM_RANGE(0xb80000, 0xb8003f) AM_READWRITE(amiga_akiko32_r, amiga_akiko32_w)
AM_RANGE(0xbfa000, 0xbfa003) AM_WRITE(aga_overlay_w)
AM_RANGE(0xbfd000, 0xbfefff) AM_READWRITE16(amiga_cia_r, amiga_cia_w, 0xffffffff)
@@ -147,47 +142,47 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( cd32 )
- PORT_START_TAG("CIA0PORTA")
+ PORT_START("CIA0PORTA")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_SPECIAL )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("CIA0PORTB")
+ PORT_START("CIA0PORTB")
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("JOY0DAT")
+ PORT_START("JOY0DAT")
PORT_BIT( 0x0303, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(amiga_joystick_convert, "P1JOY")
PORT_BIT( 0xfcfc, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("JOY1DAT")
+ PORT_START("JOY1DAT")
PORT_BIT( 0x0303, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(amiga_joystick_convert, "P2JOY")
PORT_BIT( 0xfcfc, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("POTGO")
+ PORT_START("POTGO")
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0xaaff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("P1JOY")
+ PORT_START("P1JOY")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
- PORT_START_TAG("P2JOY")
+ PORT_START("P2JOY")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_START_TAG("COINS")
+ PORT_START("COINS")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
- PORT_START_TAG("DIPSW1")
+ PORT_START("DIPSW1")
PORT_DIPNAME( 0x01, 0x01, "DSW1 1" )
PORT_DIPSETTING( 0x01, "Reset" )
PORT_DIPSETTING( 0x00, "Set" )
diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c
index 5513ec9313a..7c9326c2828 100644
--- a/src/mame/drivers/cultures.c
+++ b/src/mame/drivers/cultures.c
@@ -165,26 +165,26 @@ static ADDRESS_MAP_START( cultures_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x90, 0x90) AM_WRITE(misc_w)
AM_RANGE(0xa0, 0xa0) AM_WRITE(bg_bank_w)
AM_RANGE(0xc0, 0xc0) AM_READWRITE(OKIM6295_status_0_r, OKIM6295_data_0_w)
- AM_RANGE(0xd0, 0xd0) AM_READ(input_port_0_r)
- AM_RANGE(0xd1, 0xd1) AM_READ(input_port_1_r)
- AM_RANGE(0xd2, 0xd2) AM_READ(input_port_2_r)
- AM_RANGE(0xd3, 0xd3) AM_READ(input_port_3_r)
- AM_RANGE(0xe0, 0xe0) AM_READ(input_port_4_r)
- AM_RANGE(0xe1, 0xe1) AM_READ(input_port_5_r)
- AM_RANGE(0xe2, 0xe2) AM_READ(input_port_6_r)
- AM_RANGE(0xe3, 0xe3) AM_READ(input_port_7_r)
- AM_RANGE(0xe4, 0xe4) AM_READ(input_port_8_r)
- AM_RANGE(0xe5, 0xe5) AM_READ(input_port_9_r)
- AM_RANGE(0xf0, 0xf0) AM_READ(input_port_10_r)
- AM_RANGE(0xf1, 0xf1) AM_READ(input_port_11_r)
- AM_RANGE(0xf2, 0xf2) AM_READ(input_port_12_r)
- AM_RANGE(0xf3, 0xf3) AM_READ(input_port_13_r)
- AM_RANGE(0xf7, 0xf7) AM_READ(input_port_14_r)
+ AM_RANGE(0xd0, 0xd0) AM_READ_PORT("SW1_A")
+ AM_RANGE(0xd1, 0xd1) AM_READ_PORT("SW1_B")
+ AM_RANGE(0xd2, 0xd2) AM_READ_PORT("SW2_A")
+ AM_RANGE(0xd3, 0xd3) AM_READ_PORT("SW2_B")
+ AM_RANGE(0xe0, 0xe0) AM_READ_PORT("KEY0")
+ AM_RANGE(0xe1, 0xe1) AM_READ_PORT("KEY1")
+ AM_RANGE(0xe2, 0xe2) AM_READ_PORT("KEY2")
+ AM_RANGE(0xe3, 0xe3) AM_READ_PORT("KEY3")
+ AM_RANGE(0xe4, 0xe4) AM_READ_PORT("KEY4")
+ AM_RANGE(0xe5, 0xe5) AM_READ_PORT("START")
+ AM_RANGE(0xf0, 0xf0) AM_READ_PORT("UNUSED1")
+ AM_RANGE(0xf1, 0xf1) AM_READ_PORT("UNUSED2")
+ AM_RANGE(0xf2, 0xf2) AM_READ_PORT("UNUSED3")
+ AM_RANGE(0xf3, 0xf3) AM_READ_PORT("UNUSED4")
+ AM_RANGE(0xf7, 0xf7) AM_READ_PORT("COINS")
ADDRESS_MAP_END
static INPUT_PORTS_START( cultures )
- PORT_START
+ PORT_START("SW1_A")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x00, "10 Coins / 1 Credit" )
PORT_DIPSETTING( 0x01, DEF_STR( 5C_1C ) )
@@ -199,7 +199,7 @@ static INPUT_PORTS_START( cultures )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("SW1_B")
PORT_DIPNAME( 0x01, 0x01, "Auto Mode After Reach" ) PORT_DIPLOCATION("SW1:5")
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x01, DEF_STR( Yes ) )
@@ -214,7 +214,7 @@ static INPUT_PORTS_START( cultures )
PORT_DIPSETTING( 0x00, "Cleared" )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("SW2_A")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
PORT_DIPSETTING( 0x01, DEF_STR( Hard ) )
@@ -228,70 +228,68 @@ static INPUT_PORTS_START( cultures )
PORT_DIPSETTING( 0x08, DEF_STR( Yes ) )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("SW2_B")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW2:5")
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x01, DEF_STR( Yes ) )
PORT_DIPNAME( 0x02, 0x02, "Machihai Display" ) PORT_DIPLOCATION("SW2:6")
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x02, DEF_STR( Yes ) )
- PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:7") // "always off"
- PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPUNKNOWN_DIPLOC( 0x04, 0x04, "SW2:7" ) // "always off"
PORT_SERVICE_DIPLOC( 0x08, IP_ACTIVE_LOW, "SW2:8" )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START //5
+ PORT_START("KEY0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_C )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_D )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("KEY1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("KEY2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_I )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_J )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_L )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("KEY3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_M )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_N )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("KEY4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("START")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("UNUSED1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("UNUSED2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("UNUSED3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("UNUSED4")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("COINS")
PORT_BIT( 0x1f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 ) // "Test"
diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c
index f680c52ae17..b9b64848f53 100644
--- a/src/mame/drivers/cvs.c
+++ b/src/mame/drivers/cvs.c
@@ -594,7 +594,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( cvs )
- PORT_START_TAG("IN0") /* Matrix 0 */
+ PORT_START("IN0") /* Matrix 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -604,7 +604,7 @@ static INPUT_PORTS_START( cvs )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* Dunno */
+ PORT_START("IN1") /* Dunno */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL /* "Green button" */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* "Green button" */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
@@ -614,11 +614,11 @@ static INPUT_PORTS_START( cvs )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* Dunno */
+ PORT_START("IN2") /* Dunno */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) /* not sure it's SERVICE1 : it uses "Coin B" coinage and doesn't say "CREDIT" */
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* Dunno */
+ PORT_START("IN3") /* Dunno */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_COCKTAIL
@@ -628,7 +628,7 @@ static INPUT_PORTS_START( cvs )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW3") /* SW BANK 3 */
+ PORT_START("DSW3") /* SW BANK 3 */
PORT_DIPUNUSED( 0x01, IP_ACTIVE_HIGH ) /* can't tell if it's ACTIVE_HIGH or ACTIVE_LOW */
PORT_DIPUNUSED( 0x02, IP_ACTIVE_HIGH ) /* can't tell if it's ACTIVE_HIGH or ACTIVE_LOW */
PORT_DIPUNUSED( 0x04, IP_ACTIVE_HIGH ) /* can't tell if it's ACTIVE_HIGH or ACTIVE_LOW */
@@ -638,7 +638,7 @@ static INPUT_PORTS_START( cvs )
PORT_DIPSETTING( 0x10, DEF_STR( Cocktail ) )
PORT_DIPUNUSED( 0x20, IP_ACTIVE_HIGH ) /* can't tell if it's ACTIVE_HIGH or ACTIVE_LOW */
- PORT_START_TAG("DSW2") /* SW BANK 2 */
+ PORT_START("DSW2") /* SW BANK 2 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
@@ -654,7 +654,7 @@ static INPUT_PORTS_START( cvs )
PORT_DIPSETTING( 0x10, "5" )
PORT_DIPUNUSED( 0x20, IP_ACTIVE_HIGH ) /* can't tell if it's ACTIVE_HIGH or ACTIVE_LOW */
- PORT_START_TAG("SENSE") /* SENSE */
+ PORT_START("SENSE") /* SENSE */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
INPUT_PORTS_END
diff --git a/src/mame/drivers/cyberbal.c b/src/mame/drivers/cyberbal.c
index cce5592b26b..96b83edb07e 100644
--- a/src/mame/drivers/cyberbal.c
+++ b/src/mame/drivers/cyberbal.c
@@ -157,7 +157,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfd6000, 0xfd7fff) AM_WRITE(p2_reset_w)
AM_RANGE(0xfd8000, 0xfd9fff) AM_WRITE(atarigen_sound_upper_w)
AM_RANGE(0xfe0000, 0xfe0fff) AM_READ(special_port0_r)
- AM_RANGE(0xfe1000, 0xfe1fff) AM_READ(input_port_1_word_r)
+ AM_RANGE(0xfe1000, 0xfe1fff) AM_READ_PORT("IN1")
AM_RANGE(0xfe8000, 0xfe8fff) AM_RAM_WRITE(cyberbal_paletteram_1_w) AM_SHARE(1) AM_BASE(&cyberbal_paletteram_1)
AM_RANGE(0xfec000, 0xfecfff) AM_RAM_WRITE(cyberbal_paletteram_0_w) AM_SHARE(2) AM_BASE(&cyberbal_paletteram_0)
AM_RANGE(0xff0000, 0xff1fff) AM_RAM_WRITE(atarigen_playfield2_w) AM_SHARE(3) AM_BASE(&atarigen_playfield2)
@@ -184,7 +184,7 @@ static ADDRESS_MAP_START( extra_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0xfc0000, 0xfdffff) AM_WRITE(atarigen_video_int_ack_w)
AM_RANGE(0xfe0000, 0xfe0fff) AM_READ(special_port0_r)
- AM_RANGE(0xfe1000, 0xfe1fff) AM_READ(input_port_1_word_r)
+ AM_RANGE(0xfe1000, 0xfe1fff) AM_READ_PORT("IN1")
AM_RANGE(0xfe8000, 0xfe8fff) AM_RAM_WRITE(cyberbal_paletteram_1_w) AM_SHARE(1)
AM_RANGE(0xfec000, 0xfecfff) AM_RAM_WRITE(cyberbal_paletteram_0_w) AM_SHARE(2)
AM_RANGE(0xff0000, 0xff1fff) AM_RAM_WRITE(atarigen_playfield2_w) AM_SHARE(3)
@@ -250,8 +250,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( cyberb2p_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0xfc0000, 0xfc0003) AM_READ(input_port_0_word_r)
- AM_RANGE(0xfc2000, 0xfc2003) AM_READ(input_port_1_word_r)
+ AM_RANGE(0xfc0000, 0xfc0003) AM_READ_PORT("IN0")
+ AM_RANGE(0xfc2000, 0xfc2003) AM_READ_PORT("IN1")
AM_RANGE(0xfc4000, 0xfc4003) AM_READ(special_port2_r)
AM_RANGE(0xfc6000, 0xfc6003) AM_READ(atarigen_sound_upper_r)
AM_RANGE(0xfc8000, 0xfc8fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_BASE(&atarigen_eeprom) AM_SIZE(&atarigen_eeprom_size)
@@ -277,7 +277,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( cyberbal )
- PORT_START_TAG("IN0") /* fe0000 */
+ PORT_START("IN0") /* fe0000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(4)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(4)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(4)
@@ -294,7 +294,7 @@ static INPUT_PORTS_START( cyberbal )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE( 0x8000, IP_ACTIVE_LOW )
- PORT_START_TAG("IN1") /* fe1000 */
+ PORT_START("IN1") /* fe1000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
@@ -311,11 +311,11 @@ static INPUT_PORTS_START( cyberbal )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("IN2") /* fake port for screen switching */
+ PORT_START("IN2") /* fake port for screen switching */
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
/* 2008-06 FP: I tag this as JSAII (even if it's not) to simplify cyberbal_special_port3_r */
- PORT_START_TAG("JSAII") /* audio board port */
+ PORT_START("JSAII") /* audio board port */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN4 )
@@ -328,7 +328,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( cyberb2p )
- PORT_START_TAG("IN0") /* fc0000 */
+ PORT_START("IN0") /* fc0000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
@@ -337,7 +337,7 @@ static INPUT_PORTS_START( cyberb2p )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* fc2000 */
+ PORT_START("IN1") /* fc2000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
@@ -346,7 +346,7 @@ static INPUT_PORTS_START( cyberb2p )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* fc4000 */
+ PORT_START("IN2") /* fc4000 */
PORT_BIT( 0x1fff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_VBLANK )
diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c
index 63659c077aa..c2460396d36 100644
--- a/src/mame/drivers/cybertnk.c
+++ b/src/mame/drivers/cybertnk.c
@@ -236,7 +236,7 @@ static READ16_HANDLER( io_r )
switch( offset )
{
case 2/2:
- return ( (input_port_read(machine, "DSW1") << 8) | input_port_read(machine, "DSW2") );
+ return input_port_read(machine, "DSW1");
// 0x00110007 is controller device select
// 0x001100D5 is controller data
@@ -280,7 +280,7 @@ static READ16_HANDLER( io_r )
return input_port_read(machine, "IN0"); // low half
case 0xb/2:
- return input_port_read(machine, "DSW3");
+ return input_port_read(machine, "DSW2");
case 0xd5/2:
return io_ram[offset]; // controller data
@@ -397,7 +397,7 @@ static ADDRESS_MAP_START( sound_mem, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( cybertnk )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -415,20 +415,20 @@ static INPUT_PORTS_START( cybertnk )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("TRAVERSE")
+ PORT_START("TRAVERSE")
PORT_BIT( 0xff, 0x00, IPT_MOUSE_X ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_PLAYER(2)
- PORT_START_TAG("ELEVATE")
+ PORT_START("ELEVATE")
PORT_BIT( 0xff, 0x00, IPT_MOUSE_Y ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_PLAYER(2)
- PORT_START_TAG("ACCEL")
+ PORT_START("ACCEL")
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_PLAYER(1)
- PORT_START_TAG("HANDLE")
+ PORT_START("HANDLE")
PORT_BIT( 0xff, 0x7f, IPT_PADDLE ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(4) PORT_PLAYER(1)
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -447,40 +447,39 @@ static INPUT_PORTS_START( cybertnk )
PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0020, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) )
+ PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Test ) )
PORT_DIPSETTING( 0x0040, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
- PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
+ PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0100, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x0002, DEF_STR( Off ) )
+ PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0200, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x0004, DEF_STR( Off ) )
+ PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0400, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x0008, DEF_STR( Off ) )
+ PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0800, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x0010, DEF_STR( Off ) )
+ PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x1000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x0020, DEF_STR( Off ) )
+ PORT_DIPNAME( 0x2000, 0x2000, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x2000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Test ) )
- PORT_DIPSETTING( 0x0040, DEF_STR( Off ) )
+ PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x4000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
+ PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c
index dfa78d608eb..1760002b582 100644
--- a/src/mame/drivers/dacholer.c
+++ b/src/mame/drivers/dacholer.c
@@ -75,7 +75,7 @@ static WRITE8_HANDLER(snd_w)
static READ8_HANDLER(dswa_r)
{
- return (input_port_read(machine, "DSWA")&0x0f)|(snd_ack<<4); //guess ...
+ return (input_port_read(machine, "DSWA") & 0x0f) | (snd_ack<<4); //guess ...
}
static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
@@ -88,11 +88,11 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( main_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READ(input_port_0_r)
- AM_RANGE(0x01, 0x01) AM_READ(input_port_1_r)
- AM_RANGE(0x02, 0x02) AM_READ(input_port_2_r)
+ AM_RANGE(0x00, 0x00) AM_READ_PORT("P1")
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("P2")
+ AM_RANGE(0x02, 0x02) AM_READ_PORT("SYSTEM")
AM_RANGE(0x03, 0x03) AM_READ(dswa_r)
- AM_RANGE(0x04, 0x04) AM_READ(input_port_4_r)
+ AM_RANGE(0x04, 0x04) AM_READ_PORT("DSWB")
AM_RANGE(0x20, 0x20) AM_WRITE(coins_w)
AM_RANGE(0x21, 0x21) AM_WRITE(bg_bank_w)
AM_RANGE(0x22, 0x22) AM_WRITENOP
@@ -145,7 +145,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( dacholer )
- PORT_START_TAG("IN0")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
@@ -155,17 +155,17 @@ static INPUT_PORTS_START( dacholer )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_COCKTAIL
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_COCKTAIL
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
+ PORT_START("P2")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_COCKTAIL
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_COCKTAIL
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -175,7 +175,7 @@ static INPUT_PORTS_START( dacholer )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) /* table at 0x0a8c */
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -187,7 +187,7 @@ static INPUT_PORTS_START( dacholer )
PORT_DIPSETTING( 0x08, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0c, DEF_STR( 1C_1C ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) /* table at 0x0a9c */
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
diff --git a/src/mame/drivers/dambustr.c b/src/mame/drivers/dambustr.c
index ce1df9d2bfb..41b23887569 100644
--- a/src/mame/drivers/dambustr.c
+++ b/src/mame/drivers/dambustr.c
@@ -33,9 +33,9 @@ static ADDRESS_MAP_START( dambustr_readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xd000, 0xd3ff) AM_READ(SMH_RAM)
AM_RANGE(0xd400, 0xd7ff) AM_READ(galaxold_videoram_r)
AM_RANGE(0xd800, 0xd8ff) AM_READ(SMH_RAM)
- AM_RANGE(0xe000, 0xe000) AM_READ(input_port_0_r)
- AM_RANGE(0xe800, 0xefff) AM_READ(input_port_1_r)
- AM_RANGE(0xf000, 0xf7ff) AM_READ(input_port_2_r)
+ AM_RANGE(0xe000, 0xe000) AM_READ_PORT("IN0")
+ AM_RANGE(0xe800, 0xefff) AM_READ_PORT("IN1")
+ AM_RANGE(0xf000, 0xf7ff) AM_READ_PORT("DSW")
AM_RANGE(0xf800, 0xffff) AM_READ(watchdog_reset_r)
ADDRESS_MAP_END
@@ -66,7 +66,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( dambustr )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START2 )
@@ -77,7 +77,7 @@ static INPUT_PORTS_START( dambustr )
PORT_SERVICE( 0x40, IP_ACTIVE_HIGH )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON3 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -91,7 +91,7 @@ static INPUT_PORTS_START( dambustr )
PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c
index 643b054ec5a..144562b2294 100644
--- a/src/mame/drivers/darius.c
+++ b/src/mame/drivers/darius.c
@@ -613,7 +613,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( darius_common )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) PORT_8WAY
@@ -623,7 +623,7 @@ static INPUT_PORTS_START( darius_common )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) PORT_8WAY
@@ -633,7 +633,7 @@ static INPUT_PORTS_START( darius_common )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -647,7 +647,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( darius )
PORT_INCLUDE( darius_common )
- PORT_START_TAG("DSW") /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -681,7 +681,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( dariuse )
PORT_INCLUDE( darius_common )
- PORT_START_TAG("DSW") /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -715,7 +715,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( dariusj )
PORT_INCLUDE( darius_common )
- PORT_START_TAG("DSW") /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c
index 25991ba62a2..a36872f450c 100644
--- a/src/mame/drivers/darkhors.c
+++ b/src/mame/drivers/darkhors.c
@@ -310,14 +310,14 @@ static WRITE32_HANDLER( darkhors_unk1_w )
static ADDRESS_MAP_START( darkhors_readmem, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x000000, 0x0fffff) AM_READ( SMH_ROM )
AM_RANGE(0x400000, 0x41ffff) AM_READ( SMH_RAM )
- AM_RANGE(0x4e0080, 0x4e0083) AM_READ( input_port_4_dword_r )
- AM_RANGE(0x580000, 0x580003) AM_READ( input_port_0_dword_r )
- AM_RANGE(0x580004, 0x580007) AM_READ( input_port_1_dword_r )
+ AM_RANGE(0x4e0080, 0x4e0083) AM_READ_PORT("4e0080")
+ AM_RANGE(0x580000, 0x580003) AM_READ_PORT("580000")
+ AM_RANGE(0x580004, 0x580007) AM_READ_PORT("580004")
AM_RANGE(0x580008, 0x58000b) AM_READ( darkhors_input_sel_r )
AM_RANGE(0x580084, 0x580087) AM_READ( OKIM6295_status_0_msb32_r )
AM_RANGE(0x580200, 0x580203) AM_READ( SMH_NOP )
- AM_RANGE(0x580400, 0x580403) AM_READ( input_port_2_dword_r )
- AM_RANGE(0x580420, 0x580423) AM_READ( input_port_3_dword_r )
+ AM_RANGE(0x580400, 0x580403) AM_READ_PORT("580400")
+ AM_RANGE(0x580420, 0x580423) AM_READ_PORT("580420")
AM_RANGE(0x800000, 0x87ffff) AM_READ( SMH_RAM )
ADDRESS_MAP_END
@@ -349,11 +349,11 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( darkhors )
- PORT_START_TAG("580000") /* IN0 - 580000 */
+ PORT_START("580000")
PORT_BIT( 0xff7fffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00800000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("?") PORT_CODE(KEYCODE_RCONTROL)
- PORT_START_TAG("580004") /* IN1 - 580004 */
+ PORT_START("580004")
PORT_BIT( 0x0000ffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_BILL1 ) // bill in
PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_COIN1 ) // coin in s1
@@ -366,17 +366,17 @@ static INPUT_PORTS_START( darkhors )
PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_COIN2 ) // coin drop p2
PORT_BIT( 0x10000000, IP_ACTIVE_LOW, IPT_SPECIAL) // hopper full p2
- PORT_START_TAG("580400") /* IN2 - 580400 */
+ PORT_START("580400")
PORT_BIT( 0xfffcffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("0") PORT_CODE(KEYCODE_0_PAD)
PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("9") PORT_CODE(KEYCODE_9_PAD)
- PORT_START_TAG("580420") /* IN3 - 580420 */
+ PORT_START("580420")
PORT_BIT( 0xfffcffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("0*") PORT_CODE(KEYCODE_0_PAD)
PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("9*") PORT_CODE(KEYCODE_9_PAD)
- PORT_START_TAG("4e0080") /* IN4 - 4e0080 */
+ PORT_START("4e0080")
PORT_BIT( 0x0000ffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_SERVICE1 ) // config
PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_SERVICE2 ) // reset
@@ -395,7 +395,7 @@ static INPUT_PORTS_START( darkhors )
PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0") /* IN5 - 580008(0) */
+ PORT_START("IN0") /* 580008(0) */
PORT_BIT( 0x0000ffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 1") PORT_CODE(KEYCODE_1_PAD)
PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 2") PORT_CODE(KEYCODE_2_PAD)
@@ -414,7 +414,7 @@ static INPUT_PORTS_START( darkhors )
PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 7") //PORT_CODE(KEYCODE_)
PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 8") //PORT_CODE(KEYCODE_)
- PORT_START_TAG("IN1") /* IN6 - 580008(1) */
+ PORT_START("IN1") /* 580008(1) */
PORT_BIT( 0x0000ffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 1-2") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 1-3") PORT_CODE(KEYCODE_A)
@@ -433,7 +433,7 @@ static INPUT_PORTS_START( darkhors )
PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Bet 1-8") //PORT_CODE(KEYCODE_)
PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN7 - 580008(2) */
+ PORT_START("IN2") /* 580008(2) */
PORT_BIT( 0x0000ffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 2-3") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 2-4") PORT_CODE(KEYCODE_S)
@@ -452,7 +452,7 @@ static INPUT_PORTS_START( darkhors )
PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* IN - 580008(3) */
+ PORT_START("IN3") /* 580008(3) */
PORT_BIT( 0x0000ffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 3-4") PORT_CODE(KEYCODE_C)
PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 3-5") PORT_CODE(KEYCODE_D)
@@ -471,7 +471,7 @@ static INPUT_PORTS_START( darkhors )
PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN4") /* IN8 - 580008(4) */
+ PORT_START("IN4") /* 580008(4) */
PORT_BIT( 0x0000ffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 4-5") PORT_CODE(KEYCODE_V)
PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 4-6") PORT_CODE(KEYCODE_F)
@@ -490,7 +490,7 @@ static INPUT_PORTS_START( darkhors )
PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN5") /* IN9 - 580008(5) */
+ PORT_START("IN5") /* 580008(5) */
PORT_BIT( 0x0000ffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 5-6") PORT_CODE(KEYCODE_B)
PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 5-7") PORT_CODE(KEYCODE_G)
@@ -509,7 +509,7 @@ static INPUT_PORTS_START( darkhors )
PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN6") /* IN10 - 580008(6) */
+ PORT_START("IN6") /* 580008(6) */
PORT_BIT( 0x0000ffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 6-7") PORT_CODE(KEYCODE_N)
PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 6-8") PORT_CODE(KEYCODE_H)
@@ -528,7 +528,7 @@ static INPUT_PORTS_START( darkhors )
PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN7") /* IN11 - 580008(7) */
+ PORT_START("IN7") /* 580008(7) */
PORT_BIT( 0x0000ffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 7-8") PORT_CODE(KEYCODE_M)
PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/darkmist.c b/src/mame/drivers/darkmist.c
index bf4a7f552f2..e8c5a512755 100644
--- a/src/mame/drivers/darkmist.c
+++ b/src/mame/drivers/darkmist.c
@@ -60,14 +60,14 @@ static WRITE8_HANDLER(t5182shared_w)
static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1)
- AM_RANGE(0xc801, 0xc801) AM_READ(input_port_0_r)
- AM_RANGE(0xc802, 0xc802) AM_READ(input_port_1_r)
- AM_RANGE(0xc803, 0xc803) AM_READ(input_port_2_r)
+ AM_RANGE(0xc801, 0xc801) AM_READ_PORT("P1")
+ AM_RANGE(0xc802, 0xc802) AM_READ_PORT("P2")
+ AM_RANGE(0xc803, 0xc803) AM_READ_PORT("START")
AM_RANGE(0xc804, 0xc804) AM_WRITE(darkmist_hw_w)
AM_RANGE(0xc805, 0xc805) AM_WRITE(SMH_RAM) AM_BASE(&darkmist_spritebank)
- AM_RANGE(0xc806, 0xc806) AM_READ(input_port_3_r)
- AM_RANGE(0xc807, 0xc807) AM_READ(input_port_4_r)
- AM_RANGE(0xc808, 0xc808) AM_READ(input_port_5_r)
+ AM_RANGE(0xc806, 0xc806) AM_READ_PORT("DSW1")
+ AM_RANGE(0xc807, 0xc807) AM_READ_PORT("DSW2")
+ AM_RANGE(0xc808, 0xc808) AM_READ_PORT("UNK")
AM_RANGE(0xd000, 0xd3ff) AM_RAM AM_BASE(&paletteram)
AM_RANGE(0xd400, 0xd41f) AM_RAM AM_BASE(&darkmist_scroll)
AM_RANGE(0xd600, 0xd67f) AM_READWRITE(t5182shared_r, t5182shared_w)
@@ -82,7 +82,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( darkmist )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -91,7 +91,7 @@ static INPUT_PORTS_START( darkmist )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -100,7 +100,7 @@ static INPUT_PORTS_START( darkmist )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("START")
PORT_DIPNAME( 0x01, 0x01, "2-0" )
PORT_DIPSETTING( 0x01, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
@@ -122,7 +122,7 @@ static INPUT_PORTS_START( darkmist )
PORT_DIPSETTING( 0x80, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
@@ -145,7 +145,7 @@ static INPUT_PORTS_START( darkmist )
PORT_DIPSETTING( 0x80, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -169,7 +169,7 @@ static INPUT_PORTS_START( darkmist )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("UNK")
PORT_DIPNAME( 0x01, 0x01, "5-0" )
PORT_DIPSETTING( 0x01, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
@@ -195,7 +195,7 @@ static INPUT_PORTS_START( darkmist )
PORT_DIPSETTING( 0x80, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
- PORT_START_TAG(T5182COINPORT)
+ PORT_START(T5182COINPORT)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(2)
diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c
index b3a56659623..c7e9c7df047 100644
--- a/src/mame/drivers/darkseal.c
+++ b/src/mame/drivers/darkseal.c
@@ -52,14 +52,14 @@ static READ16_HANDLER( darkseal_control_r )
{
switch (offset<<1)
{
- case 0: /* Dip Switches */
- return (input_port_read(machine, "DSW1") + (input_port_read(machine, "DSW2") << 8));
+ case 0:
+ return input_port_read(machine, "DSW");
- case 2: /* Player 1 & Player 2 joysticks & fire buttons */
- return (input_port_read(machine, "P1") + (input_port_read(machine, "P2") << 8));
+ case 2:
+ return input_port_read(machine, "P1_P2");
- case 4: /* Credits */
- return input_port_read(machine, "IN0");
+ case 4:
+ return input_port_read(machine, "SYSTEM");
}
return ~0;
@@ -145,27 +145,26 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( darkseal )
- PORT_START_TAG("P1") /* Player 1 controls */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* button 3 - unused */
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
-
- PORT_START_TAG("P2") /* Player 2 controls */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* button 3 - unused */
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
-
- PORT_START_TAG("IN0") /* Credits */
+ PORT_START("P1_P2")
+ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
+ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
+ PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
+ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 )
+ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 )
+ PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED ) /* button 3 - unused */
+ PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
+
+ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
+ PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
+ PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
+ PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
+ PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
+ PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
+ PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED ) /* button 3 - unused */
+ PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
+
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -175,54 +174,53 @@ static INPUT_PORTS_START( darkseal )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* Dip switch bank 1 */
- PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
- PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
- PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
- PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) )
- PORT_DIPSETTING( 0x06, DEF_STR( 1C_2C ) )
- PORT_DIPSETTING( 0x05, DEF_STR( 1C_3C ) )
- PORT_DIPSETTING( 0x04, DEF_STR( 1C_4C ) )
- PORT_DIPSETTING( 0x03, DEF_STR( 1C_5C ) )
- PORT_DIPSETTING( 0x02, DEF_STR( 1C_6C ) )
- PORT_DIPNAME( 0x38, 0x38, DEF_STR( Coin_B ) )
- PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
- PORT_DIPSETTING( 0x08, DEF_STR( 2C_1C ) )
- PORT_DIPSETTING( 0x38, DEF_STR( 1C_1C ) )
- PORT_DIPSETTING( 0x30, DEF_STR( 1C_2C ) )
- PORT_DIPSETTING( 0x28, DEF_STR( 1C_3C ) )
- PORT_DIPSETTING( 0x20, DEF_STR( 1C_4C ) )
- PORT_DIPSETTING( 0x18, DEF_STR( 1C_5C ) )
- PORT_DIPSETTING( 0x10, DEF_STR( 1C_6C ) )
- PORT_DIPNAME( 0x40, 0x40, DEF_STR( Flip_Screen ) )
- PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-
- PORT_START_TAG("DSW2") /* Dip switch bank 2 */
- PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
- PORT_DIPSETTING( 0x00, "1" )
- PORT_DIPSETTING( 0x01, "2" )
- PORT_DIPSETTING( 0x03, "3" )
- PORT_DIPSETTING( 0x02, "4" )
- PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Difficulty ) )
- PORT_DIPSETTING( 0x08, DEF_STR( Easy ) )
- PORT_DIPSETTING( 0x0c, DEF_STR( Normal ) )
- PORT_DIPSETTING( 0x04, DEF_STR( Hard ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_DIPNAME( 0x30, 0x30, "Energy" )
- PORT_DIPSETTING( 0x00, "2" )
- PORT_DIPSETTING( 0x10, "2.5" )
- PORT_DIPSETTING( 0x30, "3" )
- PORT_DIPSETTING( 0x20, "4" )
- PORT_DIPNAME( 0x40, 0x40, DEF_STR( Allow_Continue ) )
- PORT_DIPSETTING( 0x00, DEF_STR( No ) )
- PORT_DIPSETTING( 0x40, DEF_STR( Yes ) )
- PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) )
- PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_START("DSW")
+ PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
+ PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) )
+ PORT_DIPSETTING( 0x0007, DEF_STR( 1C_1C ) )
+ PORT_DIPSETTING( 0x0006, DEF_STR( 1C_2C ) )
+ PORT_DIPSETTING( 0x0005, DEF_STR( 1C_3C ) )
+ PORT_DIPSETTING( 0x0004, DEF_STR( 1C_4C ) )
+ PORT_DIPSETTING( 0x0003, DEF_STR( 1C_5C ) )
+ PORT_DIPSETTING( 0x0002, DEF_STR( 1C_6C ) )
+ PORT_DIPNAME( 0x0038, 0x0038, DEF_STR( Coin_B ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
+ PORT_DIPSETTING( 0x0008, DEF_STR( 2C_1C ) )
+ PORT_DIPSETTING( 0x0038, DEF_STR( 1C_1C ) )
+ PORT_DIPSETTING( 0x0030, DEF_STR( 1C_2C ) )
+ PORT_DIPSETTING( 0x0028, DEF_STR( 1C_3C ) )
+ PORT_DIPSETTING( 0x0020, DEF_STR( 1C_4C ) )
+ PORT_DIPSETTING( 0x0018, DEF_STR( 1C_5C ) )
+ PORT_DIPSETTING( 0x0010, DEF_STR( 1C_6C ) )
+ PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Flip_Screen ) )
+ PORT_DIPSETTING( 0x0040, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unused ) )
+ PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+
+ PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Lives ) )
+ PORT_DIPSETTING( 0x0000, "1" )
+ PORT_DIPSETTING( 0x0100, "2" )
+ PORT_DIPSETTING( 0x0300, "3" )
+ PORT_DIPSETTING( 0x0200, "4" )
+ PORT_DIPNAME( 0x0c00, 0x0c00, DEF_STR( Difficulty ) )
+ PORT_DIPSETTING( 0x0800, DEF_STR( Easy ) )
+ PORT_DIPSETTING( 0x0c00, DEF_STR( Normal ) )
+ PORT_DIPSETTING( 0x0400, DEF_STR( Hard ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( Hardest ) )
+ PORT_DIPNAME( 0x3000, 0x3000, "Energy" )
+ PORT_DIPSETTING( 0x0000, "2" )
+ PORT_DIPSETTING( 0x1000, "2.5" )
+ PORT_DIPSETTING( 0x3000, "3" )
+ PORT_DIPSETTING( 0x2000, "4" )
+ PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Allow_Continue ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( No ) )
+ PORT_DIPSETTING( 0x4000, DEF_STR( Yes ) )
+ PORT_DIPNAME( 0x8000, 0x0000, DEF_STR( Demo_Sounds ) )
+ PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
INPUT_PORTS_END
/******************************************************************************/
diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c
index 601473327b1..9bb28fbdb90 100644
--- a/src/mame/drivers/dassault.c
+++ b/src/mame/drivers/dassault.c
@@ -137,10 +137,10 @@ static READ16_HANDLER( dassault_control_r )
switch (offset<<1)
{
case 0: /* Player 1 & Player 2 joysticks & fire buttons */
- return (input_port_read(machine, "P1") + (input_port_read(machine, "P2") << 8));
+ return input_port_read(machine, "P1_P2");
case 2: /* Player 3 & Player 4 joysticks & fire buttons */
- return (input_port_read(machine, "P3") + (input_port_read(machine, "P4") << 8));
+ return input_port_read(machine, "P3_P4");
case 4: /* Dip 1 (stored at 0x3f8035) */
return input_port_read(machine, "DSW1");
@@ -149,7 +149,7 @@ static READ16_HANDLER( dassault_control_r )
return input_port_read(machine, "DSW2");
case 8: /* VBL, Credits */
- return input_port_read(machine, "IN0");
+ return input_port_read(machine, "SYSTEM");
}
return 0xffff;
@@ -288,25 +288,53 @@ ADDRESS_MAP_END
/**********************************************************************************/
-#define DASSAULT_PLAYER_INPUT( player, start ) \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(player) PORT_8WAY \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(player) PORT_8WAY \
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(player) PORT_8WAY \
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(player) PORT_8WAY \
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(player) \
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(player) \
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, start )
-
+static INPUT_PORTS_START( common )
+ PORT_START("P1_P2")
+ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_8WAY
+ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_8WAY
+ PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_8WAY
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) PORT_8WAY
+ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
+ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
+ PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
+
+ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_8WAY
+ PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) PORT_8WAY
+ PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) PORT_8WAY
+ PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) PORT_8WAY
+ PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
+ PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
+ PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
+
+ PORT_START("P3_P4")
+ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3) PORT_8WAY
+ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3) PORT_8WAY
+ PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(3) PORT_8WAY
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(3) PORT_8WAY
+ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
+ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
+ PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN3 )
+
+ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(4) PORT_8WAY
+ PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(4) PORT_8WAY
+ PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(4) PORT_8WAY
+ PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(4) PORT_8WAY
+ PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
+ PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
+ PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN4 )
+
+ PORT_START("VBLANK1") /* Cpu 1 vblank */
+ PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_VBLANK )
+INPUT_PORTS_END
static INPUT_PORTS_START( thndzone )
- PORT_START_TAG("P1")
- DASSAULT_PLAYER_INPUT( 1, IPT_START1 )
+ PORT_INCLUDE( common )
- PORT_START_TAG("P2")
- DASSAULT_PLAYER_INPUT( 2, IPT_START2 )
-
- PORT_START_TAG("IN0")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) // Adds 4 credits/coins !
@@ -316,7 +344,7 @@ static INPUT_PORTS_START( thndzone )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1") /* Dip switch bank 1 */
+ PORT_START("DSW1") /* Dip switch bank 1 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -342,7 +370,7 @@ static INPUT_PORTS_START( thndzone )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* Dip switch bank 2 */
+ PORT_START("DSW2") /* Dip switch bank 2 */
PORT_DIPUNUSED( 0x01, IP_ACTIVE_LOW )
PORT_DIPUNUSED( 0x02, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Difficulty ) )
@@ -358,31 +386,18 @@ static INPUT_PORTS_START( thndzone )
PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) // Check code at 0x001490
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-
- PORT_START_TAG("VBLANK1") /* Cpu 1 vblank */
- PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_VBLANK )
-
- PORT_START_TAG("P3")
- DASSAULT_PLAYER_INPUT( 3, IPT_COIN3 )
-
- PORT_START_TAG("P4")
- DASSAULT_PLAYER_INPUT( 4, IPT_COIN4 )
INPUT_PORTS_END
static INPUT_PORTS_START( dassault )
- PORT_START_TAG("P1")
- DASSAULT_PLAYER_INPUT( 1, IPT_START1 )
-
- PORT_START_TAG("P2")
- DASSAULT_PLAYER_INPUT( 2, IPT_START2 )
+ PORT_INCLUDE( common )
- PORT_START_TAG("IN0")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW1") /* Dip switch bank 1 */
+ PORT_START("DSW1") /* Dip switch bank 1 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -408,7 +423,7 @@ static INPUT_PORTS_START( dassault )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* Dip switch bank 2 */
+ PORT_START("DSW2") /* Dip switch bank 2 */
PORT_DIPUNUSED( 0x01, IP_ACTIVE_LOW )
PORT_DIPUNUSED( 0x02, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Difficulty ) )
@@ -425,31 +440,22 @@ static INPUT_PORTS_START( dassault )
PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) // Check code at 0x0014bc
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-
- PORT_START_TAG("VBLANK1") /* Cpu 1 vblank */
- PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_VBLANK )
-
- PORT_START_TAG("P3")
- DASSAULT_PLAYER_INPUT( 3, IPT_COIN3 )
-
- PORT_START_TAG("P4")
- DASSAULT_PLAYER_INPUT( 4, IPT_COIN4 )
INPUT_PORTS_END
static INPUT_PORTS_START( dassaul4 )
- PORT_START_TAG("P1")
- DASSAULT_PLAYER_INPUT( 1, IPT_UNUSED )
+ PORT_INCLUDE( common )
- PORT_START_TAG("P2")
- DASSAULT_PLAYER_INPUT( 2, IPT_UNUSED )
+ PORT_MODIFY("P1_P2")
+ PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW1") /* Dip switch bank 1 */
+ PORT_START("DSW1") /* Dip switch bank 1 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -469,7 +475,7 @@ static INPUT_PORTS_START( dassaul4 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* Dip switch bank 2 */
+ PORT_START("DSW2") /* Dip switch bank 2 */
PORT_DIPUNUSED( 0x01, IP_ACTIVE_LOW )
PORT_DIPUNUSED( 0x02, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Difficulty ) )
@@ -483,15 +489,6 @@ static INPUT_PORTS_START( dassaul4 )
PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) // Check code at 0x0014a4
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-
- PORT_START_TAG("VBLANK1") /* Cpu 1 vblank */
- PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_VBLANK )
-
- PORT_START_TAG("P3")
- DASSAULT_PLAYER_INPUT( 3, IPT_COIN3 )
-
- PORT_START_TAG("P4")
- DASSAULT_PLAYER_INPUT( 4, IPT_COIN4 )
INPUT_PORTS_END
/**********************************************************************************/
diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c
index ebdfa5a3082..37697a5eef1 100644
--- a/src/mame/drivers/dblewing.c
+++ b/src/mame/drivers/dblewing.c
@@ -305,13 +305,13 @@ static ADDRESS_MAP_START( dblewing_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x106000, 0x106fff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf2_rowscroll)
/* protection */
-// AM_RANGE(0x280104, 0x280105) AM_WRITE(SMH_NOP) // ??
- AM_RANGE(0x2800ac, 0x2800ad) AM_READ(input_port_2_word_r) // dips
- AM_RANGE(0x280298, 0x280299) AM_READ(input_port_1_word_r) // vbl
- AM_RANGE(0x280506, 0x280507) AM_READ(input_port_3_word_r)
- AM_RANGE(0x2802B4, 0x2802B5) AM_READ(input_port_0_word_r) // inverted?
-// AM_RANGE(0x280330, 0x280331) AM_READ(SMH_NOP) // sound?
-// AM_RANGE(0x280380, 0x280381) AM_WRITE(SMH_NOP) // sound
+// AM_RANGE(0x280104, 0x280105) AM_WRITE(SMH_NOP) // ??
+ AM_RANGE(0x2800ac, 0x2800ad) AM_READ_PORT("DSW") // dips
+ AM_RANGE(0x280298, 0x280299) AM_READ_PORT("SYSTEM") // vbl
+ AM_RANGE(0x280506, 0x280507) AM_READ_PORT("UNK")
+ AM_RANGE(0x2802B4, 0x2802B5) AM_READ_PORT("P1_P2") // inverted?
+// AM_RANGE(0x280330, 0x280331) AM_READ(SMH_NOP) // sound?
+// AM_RANGE(0x280380, 0x280381) AM_WRITE(SMH_NOP) // sound
AM_RANGE(0x280000, 0x2807ff) AM_READWRITE(dlbewing_prot_r,dblewing_prot_w)
@@ -392,7 +392,7 @@ static GFXDECODE_START( dblewing )
GFXDECODE_END
static INPUT_PORTS_START( dblewing )
- PORT_START /* 16bit */
+ PORT_START("P1_P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -410,7 +410,7 @@ static INPUT_PORTS_START( dblewing )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START /* 16bit */
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -424,7 +424,7 @@ static INPUT_PORTS_START( dblewing )
Also the Original PCB showed the title screen in English, and the current implementation shows it
in Korean(?), so it is likely there is a Language dip/jumper setting */
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) /* 16bit - These values are for Dip Switch #1 */
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) )
@@ -471,7 +471,7 @@ static INPUT_PORTS_START( dblewing )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START /* 16bit */
+ PORT_START("UNK")
PORT_DIPNAME( 0x0001, 0x0001, "2" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -520,8 +520,6 @@ static INPUT_PORTS_START( dblewing )
PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
-
-
INPUT_PORTS_END
static void sound_irq(running_machine *machine, int irq)
diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c
index b26a918577a..2baf61477c0 100644
--- a/src/mame/drivers/dbz.c
+++ b/src/mame/drivers/dbz.c
@@ -113,16 +113,6 @@ static WRITE16_HANDLER( dbzcontrol_w )
coin_counter_w(1, data & 2);
}
-static READ16_HANDLER( dbz_inp0_r )
-{
- return input_port_read(machine, "IN0") | (input_port_read(machine, "IN1")<<8);
-}
-
-static READ16_HANDLER( dbz_inp1_r )
-{
- return input_port_read(machine, "IN3") | (input_port_read(machine, "DSW1")<<8);
-}
-
static READ16_HANDLER( dbz_inp2_r )
{
return input_port_read(machine, "DSW2") | (input_port_read(machine, "DSW2")<<8);
@@ -156,9 +146,9 @@ static ADDRESS_MAP_START( dbz_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x4a1000, 0x4a3fff) AM_READ(SMH_RAM)
AM_RANGE(0x4a8000, 0x4abfff) AM_READ(SMH_RAM) // palette
AM_RANGE(0x4c0000, 0x4c0001) AM_READ(K053246_word_r)
- AM_RANGE(0x4e0000, 0x4e0001) AM_READ(dbz_inp0_r)
- AM_RANGE(0x4e0002, 0x4e0003) AM_READ(dbz_inp1_r)
- AM_RANGE(0x4e4000, 0x4e4001) AM_READ(dbz_inp2_r)
+ AM_RANGE(0x4e0000, 0x4e0001) AM_READ_PORT("P1_P2")
+ AM_RANGE(0x4e0002, 0x4e0003) AM_READ_PORT("SYSTEM_DSW1")
+ AM_RANGE(0x4e4000, 0x4e4001) AM_READ(dbz_inp2_r) // DSW2
AM_RANGE(0x500000, 0x501fff) AM_READ(SMH_RAM)
AM_RANGE(0x508000, 0x509fff) AM_READ(SMH_RAM)
AM_RANGE(0x510000, 0x513fff) AM_READ(SMH_RAM)
@@ -220,62 +210,54 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( dbz )
- PORT_START_TAG("IN0")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("IN1")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("DSW1")
- PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) // I think this is right, but can't stomach the game long enough to check
- PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
- PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
- PORT_DIPSETTING( 0x02, DEF_STR( Hard ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) // seems unused
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x04, DEF_STR( On ) )
- PORT_DIPNAME( 0x08, 0x08, DEF_STR( Flip_Screen ) ) // Definitely correct
- PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x20, 0x20, DEF_STR(Service_Mode) )
- PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x40, 0x00, DEF_STR( Language ) )
- PORT_DIPSETTING( 0x00, DEF_STR( English ) )
- PORT_DIPSETTING( 0x40, DEF_STR( Japanese ) )
- PORT_DIPNAME( 0x80, 0x00, "Mask ROM Test" ) //NOP'd
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x80, DEF_STR( On ) )
-
- PORT_START_TAG("IN3")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_SERVICE_NO_TOGGLE( 0x08, IP_ACTIVE_LOW )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
-
- PORT_START_TAG("DSW2")
+ PORT_START("P1_P2")
+ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
+ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
+ PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
+ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
+ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
+ PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
+ PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
+ PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
+ PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
+ PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
+ PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
+ PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
+ PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
+ PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START("SYSTEM_DSW1")
+ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START2 )
+ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
+ PORT_SERVICE_NO_TOGGLE( 0x0008, IP_ACTIVE_LOW )
+ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_COIN2 )
+ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_COIN1 )
+ PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
+ PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
+
+ PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Difficulty ) ) // I think this is right, but can't stomach the game long enough to check
+ PORT_DIPSETTING( 0x0100, DEF_STR( Easy ) )
+ PORT_DIPSETTING( 0x0300, DEF_STR( Normal ) )
+ PORT_DIPSETTING( 0x0200, DEF_STR( Hard ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( Hardest ) )
+ PORT_DIPUNKNOWN( 0x0400, 0x0400 ) // seems unused
+ PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Flip_Screen ) ) // Definitely correct
+ PORT_DIPSETTING( 0x0800, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPUNKNOWN( 0x1000, 0x1000 )
+ PORT_SERVICE( 0x2000, 0x2000 )
+ PORT_DIPNAME( 0x4000, 0x0000, DEF_STR( Language ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( English ) )
+ PORT_DIPSETTING( 0x4000, DEF_STR( Japanese ) )
+ PORT_DIPNAME( 0x8000, 0x0000, "Mask ROM Test" ) //NOP'd
+ PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x8000, DEF_STR( On ) )
+
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -313,96 +295,18 @@ static INPUT_PORTS_START( dbz )
INPUT_PORTS_END
static INPUT_PORTS_START( dbz2 )
- PORT_START_TAG("IN0")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("IN1")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("DSW1")
- PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
- PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
- PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
- PORT_DIPSETTING( 0x02, DEF_STR( Hard ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_DIPNAME( 0x04, 0x04, DEF_STR( Flip_Screen ) )
- PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x08, DEF_STR( On ) )
- PORT_DIPNAME( 0x10, 0x10, DEF_STR( Level_Select ) )
- PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x20, 0x20, DEF_STR(Service_Mode ) )
- PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x40, 0x00, DEF_STR( Language ) )
- PORT_DIPSETTING( 0x00, DEF_STR( English ) )
- PORT_DIPSETTING( 0x40, DEF_STR( Japanese ) )
- PORT_DIPNAME( 0x80, 0x00, "Mask ROM Test" )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x80, DEF_STR( On ) )
-
- PORT_START_TAG("IN3")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_SERVICE_NO_TOGGLE( 0x08, IP_ACTIVE_LOW )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
-
- PORT_START_TAG("DSW2")
- PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
- PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
- PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
- PORT_DIPSETTING( 0x08, DEF_STR( 2C_1C ) )
- PORT_DIPSETTING( 0x04, DEF_STR( 3C_2C ) )
- PORT_DIPSETTING( 0x01, DEF_STR( 4C_3C ) )
- PORT_DIPSETTING( 0x0f, DEF_STR( 1C_1C ) )
- PORT_DIPSETTING( 0x03, DEF_STR( 3C_4C ) )
- PORT_DIPSETTING( 0x07, DEF_STR( 2C_3C ) )
- PORT_DIPSETTING( 0x0e, DEF_STR( 1C_2C ) )
- PORT_DIPSETTING( 0x06, DEF_STR( 2C_5C ) )
- PORT_DIPSETTING( 0x0d, DEF_STR( 1C_3C ) )
- PORT_DIPSETTING( 0x0c, DEF_STR( 1C_4C ) )
- PORT_DIPSETTING( 0x0b, DEF_STR( 1C_5C ) )
- PORT_DIPSETTING( 0x0a, DEF_STR( 1C_6C ) )
- PORT_DIPSETTING( 0x09, DEF_STR( 1C_7C ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
- PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_B ) )
- PORT_DIPSETTING( 0x20, DEF_STR( 4C_1C ) )
- PORT_DIPSETTING( 0x50, DEF_STR( 3C_1C ) )
- PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ) )
- PORT_DIPSETTING( 0x40, DEF_STR( 3C_2C ) )
- PORT_DIPSETTING( 0x10, DEF_STR( 4C_3C ) )
- PORT_DIPSETTING( 0xf0, DEF_STR( 1C_1C ) )
- PORT_DIPSETTING( 0x30, DEF_STR( 3C_4C ) )
- PORT_DIPSETTING( 0x70, DEF_STR( 2C_3C ) )
- PORT_DIPSETTING( 0xe0, DEF_STR( 1C_2C ) )
- PORT_DIPSETTING( 0x60, DEF_STR( 2C_5C ) )
- PORT_DIPSETTING( 0xd0, DEF_STR( 1C_3C ) )
- PORT_DIPSETTING( 0xc0, DEF_STR( 1C_4C ) )
- PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ) )
- PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
- PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
-// PORT_DIPSETTING( 0x00, "Disabled" )
+ PORT_INCLUDE( dbz )
+
+ PORT_MODIFY("SYSTEM_DSW1")
+ PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Flip_Screen ) )
+ PORT_DIPSETTING( 0x0400, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Demo_Sounds ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0800, DEF_STR( On ) )
+ PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Level_Select ) )
+ PORT_DIPSETTING( 0x1000, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
INPUT_PORTS_END
/**********************************************************************************/
diff --git a/src/mame/drivers/dcheese.c b/src/mame/drivers/dcheese.c
index d9177ee9099..ff7b22350a3 100644
--- a/src/mame/drivers/dcheese.c
+++ b/src/mame/drivers/dcheese.c
@@ -216,9 +216,9 @@ static ADDRESS_MAP_START( main_cpu_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
- AM_RANGE(0x200000, 0x200001) AM_READWRITE(input_port_0_word_r, watchdog_reset16_w)
- AM_RANGE(0x220000, 0x220001) AM_READWRITE(input_port_1_word_r, madmax_blitter_color_w)
- AM_RANGE(0x240000, 0x240001) AM_READWRITE(input_port_2_word_r, eeprom_control_w)
+ AM_RANGE(0x200000, 0x200001) AM_READ_PORT("200000") AM_WRITE(watchdog_reset16_w)
+ AM_RANGE(0x220000, 0x220001) AM_READ_PORT("220000") AM_WRITE(madmax_blitter_color_w)
+ AM_RANGE(0x240000, 0x240001) AM_READ_PORT("240000") AM_WRITE(eeprom_control_w)
AM_RANGE(0x260000, 0x26001f) AM_WRITE(madmax_blitter_xparam_w)
AM_RANGE(0x280000, 0x28001f) AM_WRITE(madmax_blitter_yparam_w)
AM_RANGE(0x2a0000, 0x2a003f) AM_READWRITE(madmax_blitter_vidparam_r, madmax_blitter_vidparam_w)
@@ -252,7 +252,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( dcheese )
- PORT_START_TAG("200000") /* 200000 */
+ PORT_START("200000")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x000c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -268,10 +268,10 @@ static INPUT_PORTS_START( dcheese )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 ) /* brake left */
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("220000") /* 220000 */
+ PORT_START("220000")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("240000") /* 240000 */
+ PORT_START("240000")
PORT_BIT( 0x001f, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* low 5 bits read as a unit */
PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(ticket_dispenser_0_port_r, NULL)
PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* sound->main buffer status (0=empty) */
@@ -282,7 +282,7 @@ static INPUT_PORTS_START( dcheese )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_VOLUME_UP )
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("2a0002") /* 2a0002 */
+ PORT_START("2a0002")
PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNKNOWN ) // read as a unit
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON7 )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON8 )
@@ -292,14 +292,14 @@ static INPUT_PORTS_START( dcheese )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_SPECIAL )
PORT_BIT( 0xfc00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("2a000e") /* 2a000e */
+ PORT_START("2a000e")
PORT_BIT( 0x00ff, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_REVERSE
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( lottof2 )
- PORT_START_TAG("200000") /* 200000 */
+ PORT_START("200000")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x000c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -312,10 +312,10 @@ static INPUT_PORTS_START( lottof2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* ticket */
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("220000") /* 220000 */
+ PORT_START("220000")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("240000") /* 240000 */
+ PORT_START("240000")
PORT_BIT( 0x001f, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* low 5 bits read as a unit */
PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(ticket_dispenser_0_port_r, NULL)
PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* sound->main buffer status (0=empty) */
@@ -326,7 +326,7 @@ static INPUT_PORTS_START( lottof2 )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_VOLUME_UP )
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("2a0002") /* 2a0002 */
+ PORT_START("2a0002")
PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
@@ -336,13 +336,13 @@ static INPUT_PORTS_START( lottof2 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_SPECIAL )
PORT_BIT( 0xfc00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("2a000e") /* 2a000e */
+ PORT_START("2a000e")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( fredmem )
- PORT_START_TAG("200000") /* 200000 */
+ PORT_START("200000")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x000c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -354,10 +354,10 @@ static INPUT_PORTS_START( fredmem )
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_CODE(KEYCODE_5_PAD)
PORT_BIT( 0xc000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("220000") /* 220000 */
+ PORT_START("220000")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("240000") /* 240000 */
+ PORT_START("240000")
PORT_BIT( 0x001f, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* low 5 bits read as a unit */
PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(ticket_dispenser_0_port_r, NULL)
PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* sound->main buffer status (0=empty) */
@@ -368,7 +368,7 @@ static INPUT_PORTS_START( fredmem )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_VOLUME_UP )
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("2a0002") /* 2a0002 */
+ PORT_START("2a0002")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_CODE(KEYCODE_6_PAD)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_CODE(KEYCODE_1_PAD)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_CODE(KEYCODE_2_PAD)
@@ -381,7 +381,7 @@ static INPUT_PORTS_START( fredmem )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_SPECIAL )
PORT_BIT( 0xfc00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("2a000e") /* 2a000e */
+ PORT_START("2a000e")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
diff --git a/src/mame/drivers/dcon.c b/src/mame/drivers/dcon.c
index 8413b6ef432..53d99173c44 100644
--- a/src/mame/drivers/dcon.c
+++ b/src/mame/drivers/dcon.c
@@ -43,9 +43,9 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x8f800, 0x8ffff) AM_READ(SMH_RAM)
AM_RANGE(0xa0000, 0xa000d) AM_READ(seibu_main_word_r)
AM_RANGE(0xc001c, 0xc001d) AM_READ(dcon_control_r)
- AM_RANGE(0xe0000, 0xe0001) AM_READ(input_port_1_word_r)
- AM_RANGE(0xe0002, 0xe0003) AM_READ(input_port_2_word_r)
- AM_RANGE(0xe0004, 0xe0005) AM_READ(input_port_3_word_r)
+ AM_RANGE(0xe0000, 0xe0001) AM_READ_PORT("DSW")
+ AM_RANGE(0xe0002, 0xe0003) AM_READ_PORT("P1_P2")
+ AM_RANGE(0xe0004, 0xe0005) AM_READ_PORT("SYSTEM")
ADDRESS_MAP_END
static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 )
@@ -67,48 +67,50 @@ ADDRESS_MAP_END
/******************************************************************************/
-#define DCON_PLAYERS_CONTROLS \
- PORT_START \
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) \
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) \
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) \
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) \
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) \
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) \
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED ) \
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED ) \
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) \
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) \
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) \
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) \
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) \
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) \
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED ) \
+static INPUT_PORTS_START( common )
+ SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */
+
+ PORT_START("P1_P2")
+ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
+ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
+ PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
+ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
+ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
+ PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
+ PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
+ PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
+ PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
+ PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
+ PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
+ PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
-#define DCON_SYSTEM \
- PORT_START \
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 ) \
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_START2 ) \
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNKNOWN) \
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_SERVICE1 ) \
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
+ PORT_START("SYSTEM")
+ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_START2 )
+ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNKNOWN)
+ PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_SERVICE1 )
+ PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
+INPUT_PORTS_END
static INPUT_PORTS_START( dcon )
- SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */
+ PORT_INCLUDE( common )
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) )
@@ -157,16 +159,12 @@ static INPUT_PORTS_START( dcon )
PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
-
- DCON_PLAYERS_CONTROLS
-
- DCON_SYSTEM
INPUT_PORTS_END
static INPUT_PORTS_START( sdgndmps )
- SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */
+ PORT_INCLUDE( common )
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x0004, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x000a, DEF_STR( 3C_1C ) )
@@ -224,10 +222,6 @@ static INPUT_PORTS_START( sdgndmps )
PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
-
- DCON_PLAYERS_CONTROLS
-
- DCON_SYSTEM
INPUT_PORTS_END
diff --git a/src/mame/drivers/dday.c b/src/mame/drivers/dday.c
index 53d73689dca..de3241e7383 100644
--- a/src/mame/drivers/dday.c
+++ b/src/mame/drivers/dday.c
@@ -75,11 +75,11 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x5000, 0x5bff) AM_READ(SMH_RAM)
AM_RANGE(0x5c00, 0x5fff) AM_READ(dday_colorram_r)
AM_RANGE(0x6000, 0x63ff) AM_READ(SMH_RAM)
- AM_RANGE(0x6c00, 0x6c00) AM_READ(input_port_0_r)
- AM_RANGE(0x7000, 0x7000) AM_READ(input_port_1_r)
- AM_RANGE(0x7400, 0x7400) AM_READ(input_port_2_r)
+ AM_RANGE(0x6c00, 0x6c00) AM_READ_PORT("BUTTONS")
+ AM_RANGE(0x7000, 0x7000) AM_READ_PORT("DSW0")
+ AM_RANGE(0x7400, 0x7400) AM_READ_PORT("DSW1")
AM_RANGE(0x7800, 0x7800) AM_READ(dday_countdown_timer_r)
- AM_RANGE(0x7c00, 0x7c00) AM_READ(input_port_3_r)
+ AM_RANGE(0x7c00, 0x7c00) AM_READ_PORT("PADDLE")
ADDRESS_MAP_END
static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 )
@@ -112,7 +112,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( dday )
- PORT_START_TAG("IN0")
+ PORT_START("BUTTONS")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) /* fire button */
@@ -121,24 +121,24 @@ static INPUT_PORTS_START( dday )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* doesn't seem to be */
/* accessed */
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
- PORT_DIPSETTING( 0x00, "2" )PORT_CONDITION("DSW0", 0x80,PORTCOND_EQUALS, 0x80)
- PORT_DIPSETTING( 0x01, "3" )PORT_CONDITION("DSW0", 0x80,PORTCOND_EQUALS, 0x80)
- PORT_DIPSETTING( 0x02, "4" )PORT_CONDITION("DSW0", 0x80,PORTCOND_EQUALS, 0x80)
- PORT_DIPSETTING( 0x03, "5" )PORT_CONDITION("DSW0", 0x80,PORTCOND_EQUALS, 0x80)
- PORT_DIPSETTING( 0x00, "5" )PORT_CONDITION("DSW0", 0x80,PORTCOND_EQUALS, 0x00)
- PORT_DIPSETTING( 0x01, "6" )PORT_CONDITION("DSW0", 0x80,PORTCOND_EQUALS, 0x00)
- PORT_DIPSETTING( 0x02, "7" )PORT_CONDITION("DSW0", 0x80,PORTCOND_EQUALS, 0x00)
- PORT_DIPSETTING( 0x03, "8" )PORT_CONDITION("DSW0", 0x80,PORTCOND_EQUALS, 0x00)
+ PORT_DIPSETTING( 0x00, "2" ) PORT_CONDITION("DSW0", 0x80, PORTCOND_EQUALS, 0x80)
+ PORT_DIPSETTING( 0x01, "3" ) PORT_CONDITION("DSW0", 0x80, PORTCOND_EQUALS, 0x80)
+ PORT_DIPSETTING( 0x02, "4" ) PORT_CONDITION("DSW0", 0x80, PORTCOND_EQUALS, 0x80)
+ PORT_DIPSETTING( 0x03, "5" ) PORT_CONDITION("DSW0", 0x80, PORTCOND_EQUALS, 0x80)
+ PORT_DIPSETTING( 0x00, "5" ) PORT_CONDITION("DSW0", 0x80, PORTCOND_EQUALS, 0x00)
+ PORT_DIPSETTING( 0x01, "6" ) PORT_CONDITION("DSW0", 0x80, PORTCOND_EQUALS, 0x00)
+ PORT_DIPSETTING( 0x02, "7" ) PORT_CONDITION("DSW0", 0x80, PORTCOND_EQUALS, 0x00)
+ PORT_DIPSETTING( 0x03, "8" ) PORT_CONDITION("DSW0", 0x80, PORTCOND_EQUALS, 0x00)
PORT_DIPNAME( 0x0c, 0x00, "Extended Play At" )
PORT_DIPSETTING( 0x00, "10000" )
PORT_DIPSETTING( 0x04, "15000" )
PORT_DIPSETTING( 0x08, "20000" )
PORT_DIPSETTING( 0x0c, "25000" )
- PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) )//No Difficulty setting?
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )// Clearly old code revision, ddayc works much better
+ PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) ) // No Difficulty setting?
+ PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) // Clearly old code revision, ddayc works much better
PORT_DIPSETTING( 0x10, DEF_STR( On ) )
PORT_DIPNAME( 0x20, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -146,11 +146,11 @@ static INPUT_PORTS_START( dday )
PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, "Start with 20000 Pts" )//Works the same as Centuri License, but not as well
- PORT_DIPSETTING( 0x80, DEF_STR( No ) )// Doesn't mention extended play, just gives lives
- PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )// Also alters table for Extended Play
+ PORT_DIPNAME( 0x80, 0x80, "Start with 20000 Pts" ) // Works the same as Centuri License, but not as well
+ PORT_DIPSETTING( 0x80, DEF_STR( No ) ) // Doesn't mention extended play, just gives lives
+ PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) // Also alters table for Extended Play
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0e, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x0c, DEF_STR( 2C_2C ) )
@@ -186,29 +186,27 @@ static INPUT_PORTS_START( dday )
PORT_DIPSETTING( 0x30, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x10, DEF_STR( 1C_8C ) )
- PORT_START_TAG("IN1")
+ PORT_START("PADDLE")
PORT_BIT(0xff, 96, IPT_PADDLE ) PORT_MINMAX(0,191) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_CENTERDELTA(0)
INPUT_PORTS_END
static INPUT_PORTS_START( ddayc )
-PORT_INCLUDE(dday)
+ PORT_INCLUDE(dday)
PORT_MODIFY("DSW0")
-
PORT_DIPNAME( 0x0c, 0x00, "Extended Play At" )
PORT_DIPSETTING( 0x00, "4000" )
PORT_DIPSETTING( 0x04, "6000" )
PORT_DIPSETTING( 0x08, "8000" )
PORT_DIPSETTING( 0x0c, "10000" )
PORT_DIPNAME( 0x30, 0x10, DEF_STR( Difficulty ) )
- PORT_DIPSETTING( 0x30, DEF_STR( Easy ) ) // Easy - No Bombs, No Troop Carriers
- PORT_DIPSETTING( 0x20, DEF_STR( Normal ) ) // Normal - No Bombs, Troop Carriers
- PORT_DIPSETTING( 0x10, DEF_STR( Hard ) ) // Hard - Bombs, Troop Carriers
- //PORT_DIPSETTING( 0x00, DEF_STR( Hard ) ) // Same as 0x10
- PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) ) // Doesn't seem to be used
+ PORT_DIPSETTING( 0x30, DEF_STR( Easy ) ) // Easy - No Bombs, No Troop Carriers
+ PORT_DIPSETTING( 0x20, DEF_STR( Normal ) ) // Normal - No Bombs, Troop Carriers
+ PORT_DIPSETTING( 0x10, DEF_STR( Hard ) ) // Hard - Bombs, Troop Carriers
+// PORT_DIPSETTING( 0x00, DEF_STR( Hard ) ) // Same as 0x10
+ PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) ) // Doesn't seem to be used
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
-
INPUT_PORTS_END
diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c
index ae96bba3c44..361d988e866 100644
--- a/src/mame/drivers/ddayjlc.c
+++ b/src/mame/drivers/ddayjlc.c
@@ -242,7 +242,7 @@ static ADDRESS_MAP_START( sound_cpu, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( ddayjlc )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -252,7 +252,7 @@ static INPUT_PORTS_START( ddayjlc )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -262,7 +262,7 @@ static INPUT_PORTS_START( ddayjlc )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DIPSW-1 */
+ PORT_START("DSW1") /* DIPSW-1 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -287,7 +287,7 @@ static INPUT_PORTS_START( ddayjlc )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2") /* DIPSW-2 */
+ PORT_START("DSW2") /* DIPSW-2 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c
index 406b0b89f9b..eb4c9217fbc 100644
--- a/src/mame/drivers/ddenlovr.c
+++ b/src/mame/drivers/ddenlovr.c
@@ -1647,8 +1647,8 @@ static ADDRESS_MAP_START( ddenlvrj_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x300070, 0x300071) AM_READ(unk16_r ) // ? must be 78 on startup (not necessary in ddlover)
AM_RANGE(0x300086, 0x300087) AM_READ(ddenlovr_gfxrom_r ) // Video Chip
AM_RANGE(0x300100, 0x30011f) AM_DEVREAD8(MSM6242, "rtc", msm6242_r, 0x00ff) // 6242RTC
- AM_RANGE(0x300180, 0x300181) AM_READ(input_port_0_word_r ) // P1
- AM_RANGE(0x300182, 0x300183) AM_READ(input_port_1_word_r ) // P2
+ AM_RANGE(0x300180, 0x300181) AM_READ_PORT("IN0") // P1
+ AM_RANGE(0x300182, 0x300183) AM_READ_PORT("IN1") // P2
AM_RANGE(0x300184, 0x300185) AM_READ(ddenlvrj_blitter_r ) // Coins + ?
AM_RANGE(0x300186, 0x300187) AM_READ(ddenlvrj_dsw_r ) // DSW
AM_RANGE(0x300240, 0x300241) AM_READ(OKIM6295_status_0_lsb_r ) // Sound
@@ -1685,10 +1685,10 @@ static ADDRESS_MAP_START( ddenlovr_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM
AM_RANGE(0xe00086, 0xe00087) AM_READ(ddenlovr_gfxrom_r ) // Video Chip
AM_RANGE(0xe00070, 0xe00071) AM_READ(unk16_r ) // ? must be 78 on startup (not necessary in ddlover)
- AM_RANGE(0xe00100, 0xe00101) AM_READ(input_port_0_word_r ) // P1?
- AM_RANGE(0xe00102, 0xe00103) AM_READ(input_port_1_word_r ) // P2?
+ AM_RANGE(0xe00100, 0xe00101) AM_READ_PORT("IN0") // P1?
+ AM_RANGE(0xe00102, 0xe00103) AM_READ_PORT("IN1") // P2?
AM_RANGE(0xe00104, 0xe00105) AM_READ(ddenlovr_special_r ) // Coins + ?
- AM_RANGE(0xe00200, 0xe00201) AM_READ(input_port_3_word_r ) // DSW
+ AM_RANGE(0xe00200, 0xe00201) AM_READ_PORT("DSW") // DSW
AM_RANGE(0xe00500, 0xe0051f) AM_DEVREAD8(MSM6242, "rtc", msm6242_r, 0x00ff) // 6242RTC
AM_RANGE(0xe00604, 0xe00605) AM_READ(AY8910_read_port_0_lsb_r )
AM_RANGE(0xe00700, 0xe00701) AM_READ(OKIM6295_status_0_lsb_r ) // Sound
@@ -1775,8 +1775,8 @@ static ADDRESS_MAP_START( nettoqc_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x300070, 0x300071) AM_READ(unk16_r ) // ? must be 78 on startup (not necessary in ddlover)
AM_RANGE(0x300086, 0x300087) AM_READ(ddenlovr_gfxrom_r ) // Video Chip
AM_RANGE(0x300100, 0x30011f) AM_DEVREAD8(MSM6242, "rtc", msm6242_r, 0x00ff) // 6242RTC
- AM_RANGE(0x300180, 0x300181) AM_READ(input_port_0_word_r ) //
- AM_RANGE(0x300182, 0x300183) AM_READ(input_port_1_word_r ) //
+ AM_RANGE(0x300180, 0x300181) AM_READ_PORT("IN0") //
+ AM_RANGE(0x300182, 0x300183) AM_READ_PORT("IN1") //
AM_RANGE(0x300184, 0x300185) AM_READ(nettoqc_special_r ) // Coins + ?
AM_RANGE(0x300186, 0x300187) AM_READ(nettoqc_input_r ) // DSW's
AM_RANGE(0x300240, 0x300241) AM_READ(OKIM6295_status_0_lsb_r ) // Sound
@@ -3228,9 +3228,9 @@ static ADDRESS_MAP_START( akamaru_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x624680, 0x624681) AM_READ(akamaru_protection1_r )
AM_RANGE(0xe00086, 0xe00087) AM_READ(ddenlovr_gfxrom_r ) // Video Chip
AM_RANGE(0xe00070, 0xe00071) AM_READ(unk16_r ) // ? must be 78 on startup (not necessary in ddlover)
- AM_RANGE(0xe00100, 0xe00101) AM_READ(input_port_0_word_r ) // P1?
- AM_RANGE(0xe00102, 0xe00103) AM_READ(input_port_1_word_r ) // P2?
- AM_RANGE(0xe00104, 0xe00105) AM_READ(input_port_2_word_r ) // Coins
+ AM_RANGE(0xe00100, 0xe00101) AM_READ_PORT("IN0") // P1?
+ AM_RANGE(0xe00102, 0xe00103) AM_READ_PORT("IN1") // P2?
+ AM_RANGE(0xe00104, 0xe00105) AM_READ_PORT("IN2") // Coins
AM_RANGE(0xe00106, 0xe00107) AM_READ(akamaru_protection2_r )
AM_RANGE(0xe0010c, 0xe0010d) AM_READ(akamaru_e0010d_r )
AM_RANGE(0xe00200, 0xe00201) AM_READ(akamaru_dsw_r ) // DSW
@@ -3368,7 +3368,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( ddenlvrj )
- PORT_START_TAG("IN0") /* IN0 - Player 1 */
+ PORT_START("IN0") /* IN0 - Player 1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -3378,7 +3378,7 @@ static INPUT_PORTS_START( ddenlvrj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 - Player 2 */
+ PORT_START("IN1") /* IN1 - Player 2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
@@ -3388,7 +3388,7 @@ static INPUT_PORTS_START( ddenlvrj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2 - Coins + ? */
+ PORT_START("IN2") /* IN2 - Coins + ? */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -3398,7 +3398,7 @@ static INPUT_PORTS_START( ddenlvrj )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) // RTC
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL )
- PORT_START_TAG("DSW1") /* IN3 - DSW1 */
+ PORT_START("DSW1") /* IN3 - DSW1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -3422,7 +3422,7 @@ static INPUT_PORTS_START( ddenlvrj )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* IN4 - DSW2 */
+ PORT_START("DSW2") /* IN4 - DSW2 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x06, "1 (Easy)" )
PORT_DIPSETTING( 0x05, "2" )
@@ -3447,7 +3447,7 @@ static INPUT_PORTS_START( ddenlvrj )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* IN5 - DSW1 & 2 top bits */
+ PORT_START("DSW3") /* IN5 - DSW1 & 2 top bits */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3474,7 +3474,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( ddenlovr )
- PORT_START_TAG("IN0") /* IN0 - Player 1 */
+ PORT_START("IN0") /* IN0 - Player 1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -3484,7 +3484,7 @@ static INPUT_PORTS_START( ddenlovr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 - Player 2 */
+ PORT_START("IN1") /* IN1 - Player 2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
@@ -3494,7 +3494,7 @@ static INPUT_PORTS_START( ddenlovr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2 - Coins + ? */
+ PORT_START("IN2") /* IN2 - Coins + ? */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -3504,7 +3504,7 @@ static INPUT_PORTS_START( ddenlovr )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) // blitter irq flag
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) // blitter busy flag
- PORT_START_TAG("DSW") /* IN3 - DSW */
+ PORT_START("DSW") /* IN3 - DSW */
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x02, "Unknown 1-1" )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -3530,7 +3530,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( nettoqc )
- PORT_START_TAG("IN0") /* IN0 - Player 1 */
+ PORT_START("IN0") /* IN0 - Player 1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -3540,7 +3540,7 @@ static INPUT_PORTS_START( nettoqc )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 - Player 2 */
+ PORT_START("IN1") /* IN1 - Player 2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
@@ -3550,7 +3550,7 @@ static INPUT_PORTS_START( nettoqc )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2 - Coins + ? */
+ PORT_START("IN2") /* IN2 - Coins + ? */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -3560,7 +3560,7 @@ static INPUT_PORTS_START( nettoqc )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) // blitter irq flag
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL )
- PORT_START_TAG("DSW1") /* IN3 - DSW */
+ PORT_START("DSW1") /* IN3 - DSW */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -3584,7 +3584,7 @@ static INPUT_PORTS_START( nettoqc )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* IN4 - DSW */
+ PORT_START("DSW2") /* IN4 - DSW */
PORT_DIPNAME( 0x03, 0x03, "Unknown 2-0&1*" )
PORT_DIPSETTING( 0x02, "0" )
PORT_DIPSETTING( 0x03, "1" )
@@ -3609,7 +3609,7 @@ static INPUT_PORTS_START( nettoqc )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* IN5 - DSW */
+ PORT_START("DSW3") /* IN5 - DSW */
PORT_DIPNAME( 0x01, 0x01, "Unknown 1-8*" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3628,7 +3628,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( quiz365 )
- PORT_START_TAG("IN0") /* IN0 - Player 1 */
+ PORT_START("IN0") /* IN0 - Player 1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -3638,7 +3638,7 @@ static INPUT_PORTS_START( quiz365 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 - Player 2 */
+ PORT_START("IN1") /* IN1 - Player 2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
@@ -3648,7 +3648,7 @@ static INPUT_PORTS_START( quiz365 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2 - Coins + ? */
+ PORT_START("IN2") /* IN2 - Coins + ? */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -3658,7 +3658,7 @@ static INPUT_PORTS_START( quiz365 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) // blitter irq flag
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) // blitter busy flag
- PORT_START_TAG("DSW1") /* IN3 - DSW */
+ PORT_START("DSW1") /* IN3 - DSW */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -3681,7 +3681,7 @@ static INPUT_PORTS_START( quiz365 )
PORT_DIPSETTING( 0xc0, "2" )
// PORT_DIPSETTING( 0x00, "2" )
- PORT_START_TAG("DSW2") /* IN4 - DSW */
+ PORT_START("DSW2") /* IN4 - DSW */
PORT_DIPNAME( 0x03, 0x03, "Unknown 2-0&1" )
PORT_DIPSETTING( 0x02, "0" )
PORT_DIPSETTING( 0x03, "1" )
@@ -3705,7 +3705,7 @@ static INPUT_PORTS_START( quiz365 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* IN5 - DSW */
+ PORT_START("DSW3") /* IN5 - DSW */
PORT_DIPNAME( 0x01, 0x01, "Unknown 3-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3721,7 +3721,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( rongrong )
- PORT_START_TAG("IN0") /* IN0 - Player 1 */
+ PORT_START("IN0") /* IN0 - Player 1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -3731,7 +3731,7 @@ static INPUT_PORTS_START( rongrong )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1") /* IN1 - Player 2 */
+ PORT_START("IN1") /* IN1 - Player 2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
@@ -3741,7 +3741,7 @@ static INPUT_PORTS_START( rongrong )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_START_TAG("IN2") /* IN2 - Coins + ? */
+ PORT_START("IN2") /* IN2 - Coins + ? */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -3751,7 +3751,7 @@ static INPUT_PORTS_START( rongrong )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SPECIAL ) // ? blitter irq flag ?
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) // ? blitter busy flag ?
- PORT_START_TAG("DSW1") /* IN3 - DSW */
+ PORT_START("DSW1") /* IN3 - DSW */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -3775,7 +3775,7 @@ static INPUT_PORTS_START( rongrong )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* IN4 - DSW */
+ PORT_START("DSW2") /* IN4 - DSW */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -3798,7 +3798,7 @@ static INPUT_PORTS_START( rongrong )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* IN5 - DSW */
+ PORT_START("DSW3") /* IN5 - DSW */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3813,7 +3813,7 @@ static INPUT_PORTS_START( rongrong )
INPUT_PORTS_END
static INPUT_PORTS_START( quizchq )
- PORT_START_TAG("IN0") /* IN0 - Player 1 */
+ PORT_START("IN0") /* IN0 - Player 1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -3823,7 +3823,7 @@ static INPUT_PORTS_START( quizchq )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 - Player 2 */
+ PORT_START("IN1") /* IN1 - Player 2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
@@ -3833,7 +3833,7 @@ static INPUT_PORTS_START( quizchq )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2 - Coins + ? */
+ PORT_START("IN2") /* IN2 - Coins + ? */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -3843,7 +3843,7 @@ static INPUT_PORTS_START( quizchq )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SPECIAL ) // ? blitter irq flag ?
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) // ? blitter busy flag ?
- PORT_START_TAG("DSW1") /* IN3 - DSW */
+ PORT_START("DSW1") /* IN3 - DSW */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -3867,7 +3867,7 @@ static INPUT_PORTS_START( quizchq )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* IN4 - DSW */
+ PORT_START("DSW2") /* IN4 - DSW */
PORT_DIPNAME( 0x01, 0x01, "Unknown 2-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3891,7 +3891,7 @@ static INPUT_PORTS_START( quizchq )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW3") /* IN5 - DSW */
+ PORT_START("DSW3") /* IN5 - DSW */
PORT_DIPNAME( 0x01, 0x01, "Unknown 1-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3908,7 +3908,7 @@ static INPUT_PORTS_START( quizchq )
INPUT_PORTS_END
static INPUT_PORTS_START( mmpanic )
- PORT_START_TAG("IN0") /* IN0 6a (68 = 1:used? 2:normal 3:goes to 69) */
+ PORT_START("IN0") /* IN0 6a (68 = 1:used? 2:normal 3:goes to 69) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // tested?
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -3918,7 +3918,7 @@ static INPUT_PORTS_START( mmpanic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("9") PORT_CODE(KEYCODE_9_PAD)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) // busy?
- PORT_START_TAG("IN1") /* IN1 6b (68 = 0 & 1) */
+ PORT_START("IN1") /* IN1 6b (68 = 0 & 1) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("1") PORT_CODE(KEYCODE_1_PAD)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("2") PORT_CODE(KEYCODE_2_PAD)
@@ -3928,7 +3928,7 @@ static INPUT_PORTS_START( mmpanic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("6") PORT_CODE(KEYCODE_6_PAD)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("7") PORT_CODE(KEYCODE_7_PAD)
- PORT_START_TAG("DSW1") /* IN2 - DSW */
+ PORT_START("DSW1") /* IN2 - DSW */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -3953,7 +3953,7 @@ static INPUT_PORTS_START( mmpanic )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* IN3 - DSW */
+ PORT_START("DSW2") /* IN3 - DSW */
PORT_DIPNAME( 0x01, 0x01, "Unknown 2-0*" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3978,7 +3978,7 @@ static INPUT_PORTS_START( mmpanic )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* IN4 - DSW */
+ PORT_START("DSW3") /* IN4 - DSW */
PORT_DIPNAME( 0x01, 0x01, "Set Date" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -4005,7 +4005,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( animaljr )
- PORT_START_TAG("IN0") /* IN0 6a (68 = 1:used? 2:normal 3:goes to 69) */
+ PORT_START("IN0") /* IN0 6a (68 = 1:used? 2:normal 3:goes to 69) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -4015,7 +4015,7 @@ static INPUT_PORTS_START( animaljr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) // busy?
- PORT_START_TAG("IN1") /* IN1 6b (68 = 0 & 1) */
+ PORT_START("IN1") /* IN1 6b (68 = 0 & 1) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) // tested ?
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("1") PORT_CODE(KEYCODE_1_PAD)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("2") PORT_CODE(KEYCODE_2_PAD)
@@ -4025,7 +4025,7 @@ static INPUT_PORTS_START( animaljr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("6") PORT_CODE(KEYCODE_6_PAD)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* IN2 - DSW */
+ PORT_START("DSW1") /* IN2 - DSW */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
@@ -4050,7 +4050,7 @@ static INPUT_PORTS_START( animaljr )
PORT_DIPSETTING( 0x20, "6" )
PORT_DIPSETTING( 0x00, "7" )
- PORT_START_TAG("DSW2") /* IN3 - DSW */
+ PORT_START("DSW2") /* IN3 - DSW */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -4075,7 +4075,7 @@ static INPUT_PORTS_START( animaljr )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* IN4 - DSW */
+ PORT_START("DSW3") /* IN4 - DSW */
PORT_DIPNAME( 0x01, 0x01, "Unknown 3-0*" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -4103,7 +4103,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( hanakanz )
- PORT_START_TAG("IN0") /* IN0 - Coins + Service Keys */
+ PORT_START("IN0") /* IN0 - Coins + Service Keys */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE3 ) // medal out
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) // Test
@@ -4115,7 +4115,7 @@ static INPUT_PORTS_START( hanakanz )
/* keyb 2 */
- PORT_START_TAG("KEY0")
+ PORT_START("KEY0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) // A
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) // E
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // I
@@ -4123,7 +4123,7 @@ static INPUT_PORTS_START( hanakanz )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Kan
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) // B
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) // F
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // J
@@ -4131,7 +4131,7 @@ static INPUT_PORTS_START( hanakanz )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Reach
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) PORT_PLAYER(2) // BET
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) // C
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) // G
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // K
@@ -4139,7 +4139,7 @@ static INPUT_PORTS_START( hanakanz )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Ron
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) // D
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) // H
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // L
@@ -4147,7 +4147,7 @@ static INPUT_PORTS_START( hanakanz )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY4")
+ PORT_START("KEY4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) PORT_PLAYER(2) // "t"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) PORT_PLAYER(2) // "w"
@@ -4157,7 +4157,7 @@ static INPUT_PORTS_START( hanakanz )
/* keyb 1 */
- PORT_START_TAG("KEY5")
+ PORT_START("KEY5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("1") PORT_CODE(KEYCODE_1_PAD) // A
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("5") PORT_CODE(KEYCODE_5_PAD) // E
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // I
@@ -4165,7 +4165,7 @@ static INPUT_PORTS_START( hanakanz )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Kan
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("KEY6")
+ PORT_START("KEY6")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("2") PORT_CODE(KEYCODE_2_PAD) // B
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("6") PORT_CODE(KEYCODE_6_PAD) // F
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // J
@@ -4173,7 +4173,7 @@ static INPUT_PORTS_START( hanakanz )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Reach
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) // BET
- PORT_START_TAG("KEY7")
+ PORT_START("KEY7")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("3") PORT_CODE(KEYCODE_3_PAD) // C
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("7") PORT_CODE(KEYCODE_7_PAD) // G
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // K
@@ -4181,7 +4181,7 @@ static INPUT_PORTS_START( hanakanz )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Ron
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY8")
+ PORT_START("KEY8")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("4") PORT_CODE(KEYCODE_4_PAD) // D
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("8") PORT_CODE(KEYCODE_8_PAD) // H
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // L
@@ -4189,7 +4189,7 @@ static INPUT_PORTS_START( hanakanz )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY9")
+ PORT_START("KEY9")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) // "t"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) // "w"
@@ -4197,7 +4197,7 @@ static INPUT_PORTS_START( hanakanz )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG ) // "b"
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) // "s"
- PORT_START_TAG("DSW1") /* IN11 - DSW1 */
+ PORT_START("DSW1") /* IN11 - DSW1 */
PORT_DIPNAME( 0x07, 0x07, "Unknown 1-0&1&2" )
PORT_DIPSETTING( 0x07, "0" )
PORT_DIPSETTING( 0x06, "1" )
@@ -4222,7 +4222,7 @@ static INPUT_PORTS_START( hanakanz )
PORT_DIPSETTING( 0x00, "5" )
PORT_DIPSETTING( 0x80, "10" )
- PORT_START_TAG("DSW2") /* IN12 - DSW2 */
+ PORT_START("DSW2") /* IN12 - DSW2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -4244,7 +4244,7 @@ static INPUT_PORTS_START( hanakanz )
PORT_DIPSETTING( 0x40, "70" )
PORT_DIPSETTING( 0x00, "80" )
- PORT_START_TAG("DSW3") /* IN13 - DSW3 */
+ PORT_START("DSW3") /* IN13 - DSW3 */
PORT_DIPNAME( 0x03, 0x03, "Game Type" )
PORT_DIPSETTING( 0x03, "8 Cards" )
PORT_DIPSETTING( 0x02, "6 Cards (Bets)" )
@@ -4267,7 +4267,7 @@ static INPUT_PORTS_START( hanakanz )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW4") /* IN14 - DSW4 */
+ PORT_START("DSW4") /* IN14 - DSW4 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -4293,7 +4293,7 @@ static INPUT_PORTS_START( hanakanz )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW5") /* IN15 - DSWs top bits */
+ PORT_START("DSW5") /* IN15 - DSWs top bits */
PORT_DIPNAME( 0x01, 0x01, "Unknown 1-8" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -4316,12 +4316,12 @@ static INPUT_PORTS_START( hanakanz )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("BET") /* IN16 - Fake DSW */
+ PORT_START("BET") /* IN16 - Fake DSW */
PORT_DIPNAME( 0x40, 0x40, "Allow Bets" )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("HOPPER") /* IN17 - Fake DSW */
+ PORT_START("HOPPER") /* IN17 - Fake DSW */
PORT_DIPNAME( 0x40, 0x40, "? Hopper M." )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -4331,7 +4331,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( hkagerou )
- PORT_START_TAG("IN0") /* IN0 - Coins + Service Keys */
+ PORT_START("IN0") /* IN0 - Coins + Service Keys */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE3 ) // medal out
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) // Test
@@ -4343,7 +4343,7 @@ static INPUT_PORTS_START( hkagerou )
/* keyb 2 */
- PORT_START_TAG("KEY0")
+ PORT_START("KEY0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) // A
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) // E
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // I
@@ -4351,7 +4351,7 @@ static INPUT_PORTS_START( hkagerou )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Kan
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) // B
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) // F
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // J
@@ -4359,7 +4359,7 @@ static INPUT_PORTS_START( hkagerou )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Reach
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) PORT_PLAYER(2) // BET
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) // C
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) // G
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // K
@@ -4367,7 +4367,7 @@ static INPUT_PORTS_START( hkagerou )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Ron
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) // D
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) // H
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // L
@@ -4375,7 +4375,7 @@ static INPUT_PORTS_START( hkagerou )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY4")
+ PORT_START("KEY4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) PORT_PLAYER(2) // "t"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) PORT_PLAYER(2) // "w"
@@ -4385,7 +4385,7 @@ static INPUT_PORTS_START( hkagerou )
/* keyb 1 */
- PORT_START_TAG("KEY5")
+ PORT_START("KEY5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("1") PORT_CODE(KEYCODE_1_PAD) // A
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("5") PORT_CODE(KEYCODE_5_PAD) // E
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // I
@@ -4393,7 +4393,7 @@ static INPUT_PORTS_START( hkagerou )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) // "t"
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("KEY6")
+ PORT_START("KEY6")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("2") PORT_CODE(KEYCODE_2_PAD) // B
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("6") PORT_CODE(KEYCODE_6_PAD) // F
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // J
@@ -4401,7 +4401,7 @@ static INPUT_PORTS_START( hkagerou )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) // "s"
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) // BET
- PORT_START_TAG("KEY7")
+ PORT_START("KEY7")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("3") PORT_CODE(KEYCODE_3_PAD) // C
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("7") PORT_CODE(KEYCODE_7_PAD) // G
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // K
@@ -4409,7 +4409,7 @@ static INPUT_PORTS_START( hkagerou )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Ron
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY8")
+ PORT_START("KEY8")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("4") PORT_CODE(KEYCODE_4_PAD) // D
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("8") PORT_CODE(KEYCODE_8_PAD) // H
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // L
@@ -4417,7 +4417,7 @@ static INPUT_PORTS_START( hkagerou )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY9")
+ PORT_START("KEY9")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) // "t"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) // "w"
@@ -4425,7 +4425,7 @@ static INPUT_PORTS_START( hkagerou )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG ) // "b"
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) // "s"
- PORT_START_TAG("DSW1") /* IN11 - DSW1 */
+ PORT_START("DSW1") /* IN11 - DSW1 */
PORT_DIPNAME( 0x07, 0x07, "Unknown 1-0&1&2" )
PORT_DIPSETTING( 0x07, "0" )
PORT_DIPSETTING( 0x06, "1" )
@@ -4450,7 +4450,7 @@ static INPUT_PORTS_START( hkagerou )
PORT_DIPSETTING( 0x00, "25" )
PORT_DIPSETTING( 0x80, "50" )
- PORT_START_TAG("DSW2") /* IN12 - DSW2 */
+ PORT_START("DSW2") /* IN12 - DSW2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
@@ -4472,7 +4472,7 @@ static INPUT_PORTS_START( hkagerou )
PORT_DIPSETTING( 0x40, "70" )
PORT_DIPSETTING( 0x00, "80" )
- PORT_START_TAG("DSW3") /* IN13 - DSW3 */
+ PORT_START("DSW3") /* IN13 - DSW3 */
PORT_DIPNAME( 0x01, 0x01, "Game Type?" )
PORT_DIPSETTING( 0x01, "0" )
PORT_DIPSETTING( 0x00, "1" )
@@ -4496,7 +4496,7 @@ static INPUT_PORTS_START( hkagerou )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW4") /* IN14 - DSW4 */
+ PORT_START("DSW4") /* IN14 - DSW4 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -4522,7 +4522,7 @@ static INPUT_PORTS_START( hkagerou )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW5") /* IN15 - DSWs top bits */
+ PORT_START("DSW5") /* IN15 - DSWs top bits */
PORT_DIPNAME( 0x01, 0x01, "Unknown 1-8" )
PORT_DIPSETTING( 0x00, "5" )
PORT_DIPSETTING( 0x01, "10" )
@@ -4545,12 +4545,12 @@ static INPUT_PORTS_START( hkagerou )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("BET") /* IN16 - Fake DSW */
+ PORT_START("BET") /* IN16 - Fake DSW */
PORT_DIPNAME( 0x40, 0x40, "Disable Bets" )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("HOPPER") /* IN17 - Fake DSW */
+ PORT_START("HOPPER") /* IN17 - Fake DSW */
PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -4560,7 +4560,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mjreach1 )
- PORT_START_TAG("IN0") /* IN0 - Coins + Service Keys */
+ PORT_START("IN0") /* IN0 - Coins + Service Keys */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE3 ) // medal out
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE(0x04, IP_ACTIVE_LOW)
@@ -4572,7 +4572,7 @@ static INPUT_PORTS_START( mjreach1 )
/* keyb 2 */
- PORT_START_TAG("KEY0")
+ PORT_START("KEY0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_PLAYER(2) // A
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_PLAYER(2) // E
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_PLAYER(2) // I
@@ -4580,7 +4580,7 @@ static INPUT_PORTS_START( mjreach1 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2) // Kan
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) // Start 2
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_PLAYER(2) // B
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_PLAYER(2) // F
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_PLAYER(2) // J
@@ -4588,7 +4588,7 @@ static INPUT_PORTS_START( mjreach1 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_PLAYER(2) // Reach
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) PORT_PLAYER(2) // BET
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_PLAYER(2) // C
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_PLAYER(2) // G
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) PORT_PLAYER(2) // K
@@ -4596,7 +4596,7 @@ static INPUT_PORTS_START( mjreach1 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2) // Ron
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_PLAYER(2) // D
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_PLAYER(2) // H
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_PLAYER(2) // L
@@ -4604,7 +4604,7 @@ static INPUT_PORTS_START( mjreach1 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
- PORT_START_TAG("KEY4")
+ PORT_START("KEY4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) PORT_PLAYER(2) // "l"
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) PORT_PLAYER(2) // "t"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) PORT_PLAYER(2) // "w"
@@ -4614,7 +4614,7 @@ static INPUT_PORTS_START( mjreach1 )
/* keyb 1 */
- PORT_START_TAG("KEY5")
+ PORT_START("KEY5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) // A
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) // E
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) // I
@@ -4622,7 +4622,7 @@ static INPUT_PORTS_START( mjreach1 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) // Kan
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 ) // Start 1
- PORT_START_TAG("KEY6")
+ PORT_START("KEY6")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) // B
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) // F
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) // J
@@ -4630,7 +4630,7 @@ static INPUT_PORTS_START( mjreach1 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) // Reach
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) // BET
- PORT_START_TAG("KEY7")
+ PORT_START("KEY7")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) // C
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) // G
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) // K
@@ -4638,7 +4638,7 @@ static INPUT_PORTS_START( mjreach1 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) // Ron
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
- PORT_START_TAG("KEY8")
+ PORT_START("KEY8")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) // D
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) // H
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) // L
@@ -4646,7 +4646,7 @@ static INPUT_PORTS_START( mjreach1 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
- PORT_START_TAG("KEY9")
+ PORT_START("KEY9")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) // "l"
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) // "t"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) // "w"
@@ -4654,7 +4654,7 @@ static INPUT_PORTS_START( mjreach1 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG ) // "b"
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) // "s"
- PORT_START_TAG("DSW1") /* IN11 - DSW1 */
+ PORT_START("DSW1") /* IN11 - DSW1 */
PORT_DIPNAME( 0x0f, 0x07, "Pay Out Rate (%)" )
PORT_DIPSETTING( 0x00, "50" )
PORT_DIPSETTING( 0x01, "53" )
@@ -4683,7 +4683,7 @@ static INPUT_PORTS_START( mjreach1 )
PORT_DIPSETTING( 0x40, "10" )
PORT_DIPSETTING( 0x00, "20" )
- PORT_START_TAG("DSW2") /* IN12 - DSW2 */
+ PORT_START("DSW2") /* IN12 - DSW2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
@@ -4706,7 +4706,7 @@ static INPUT_PORTS_START( mjreach1 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* IN13 - DSW3 */
+ PORT_START("DSW3") /* IN13 - DSW3 */
PORT_DIPNAME( 0x07, 0x07, "YAKUMAN Bonus" )
PORT_DIPSETTING( 0x07, "Cut" )
PORT_DIPSETTING( 0x06, "1 T" )
@@ -4731,7 +4731,7 @@ static INPUT_PORTS_START( mjreach1 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW4") /* IN14 - DSW4 */
+ PORT_START("DSW4") /* IN14 - DSW4 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -4757,7 +4757,7 @@ static INPUT_PORTS_START( mjreach1 )
PORT_DIPSETTING( 0x80, "Start" )
PORT_DIPSETTING( 0x00, "Flip/Flop" )
- PORT_START_TAG("DSW5") /* IN15 - DSWs top bits */
+ PORT_START("DSW5") /* IN15 - DSWs top bits */
PORT_DIPNAME( 0x01, 0x01, "Credits Per Note" )
PORT_DIPSETTING( 0x01, "5" )
PORT_DIPSETTING( 0x00, "10" )
@@ -4782,12 +4782,12 @@ static INPUT_PORTS_START( mjreach1 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("BET") /* IN16 - Fake DSW */
+ PORT_START("BET") /* IN16 - Fake DSW */
PORT_DIPNAME( 0x40, 0x40, "Bets?" )
PORT_DIPSETTING( 0x40, "0" )
PORT_DIPSETTING( 0x00, "1" )
- PORT_START_TAG("HOPPER") /* IN17 - Fake DSW */
+ PORT_START("HOPPER") /* IN17 - Fake DSW */
PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -4797,7 +4797,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mjchuuka )
- PORT_START_TAG("IN0") /* IN0 - Coins + Service Keys */
+ PORT_START("IN0") /* IN0 - Coins + Service Keys */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE3 ) // medal out
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE(0x04, IP_ACTIVE_LOW)
@@ -4809,7 +4809,7 @@ static INPUT_PORTS_START( mjchuuka )
/* keyb 2 */
- PORT_START_TAG("KEY0")
+ PORT_START("KEY0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_PLAYER(2) // A
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_PLAYER(2) // E
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_PLAYER(2) // I
@@ -4817,7 +4817,7 @@ static INPUT_PORTS_START( mjchuuka )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2) // Kan
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) // Start 2
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_PLAYER(2) // B
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_PLAYER(2) // F
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_PLAYER(2) // J
@@ -4825,7 +4825,7 @@ static INPUT_PORTS_START( mjchuuka )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_PLAYER(2) // Reach
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) PORT_PLAYER(2) // BET
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_PLAYER(2) // C
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_PLAYER(2) // G
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) PORT_PLAYER(2) // K
@@ -4833,7 +4833,7 @@ static INPUT_PORTS_START( mjchuuka )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2) // Ron
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_PLAYER(2) // D
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_PLAYER(2) // H
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_PLAYER(2) // L
@@ -4841,7 +4841,7 @@ static INPUT_PORTS_START( mjchuuka )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
- PORT_START_TAG("KEY4")
+ PORT_START("KEY4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) PORT_PLAYER(2) // "l"
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) PORT_PLAYER(2) // "t"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) PORT_PLAYER(2) // "w"
@@ -4851,7 +4851,7 @@ static INPUT_PORTS_START( mjchuuka )
/* keyb 1 */
- PORT_START_TAG("KEY5")
+ PORT_START("KEY5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) // A
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) // E
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) // I
@@ -4859,7 +4859,7 @@ static INPUT_PORTS_START( mjchuuka )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) // Kan
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 ) // Start 1
- PORT_START_TAG("KEY6")
+ PORT_START("KEY6")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) // B
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) // F
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) // J
@@ -4867,7 +4867,7 @@ static INPUT_PORTS_START( mjchuuka )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) // Reach
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) // BET
- PORT_START_TAG("KEY7")
+ PORT_START("KEY7")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) // C
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) // G
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) // K
@@ -4875,7 +4875,7 @@ static INPUT_PORTS_START( mjchuuka )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) // Ron
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
- PORT_START_TAG("KEY8")
+ PORT_START("KEY8")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) // D
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) // H
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) // L
@@ -4883,7 +4883,7 @@ static INPUT_PORTS_START( mjchuuka )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
- PORT_START_TAG("KEY9")
+ PORT_START("KEY9")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) // "l"
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) // "t"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) // "w"
@@ -4891,7 +4891,7 @@ static INPUT_PORTS_START( mjchuuka )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG ) // "b"
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) // "s"
- PORT_START_TAG("DSW1") /* IN11 - DSW1 */
+ PORT_START("DSW1") /* IN11 - DSW1 */
PORT_DIPNAME( 0x0f, 0x07, "Pay Out Rate (%)" )
PORT_DIPSETTING( 0x00, "50" )
PORT_DIPSETTING( 0x01, "53" )
@@ -4920,7 +4920,7 @@ static INPUT_PORTS_START( mjchuuka )
PORT_DIPSETTING( 0x40, "10" )
PORT_DIPSETTING( 0x00, "20" )
- PORT_START_TAG("DSW2") /* IN12 - DSW2 */
+ PORT_START("DSW2") /* IN12 - DSW2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
@@ -4944,7 +4944,7 @@ static INPUT_PORTS_START( mjchuuka )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* IN13 - DSW3 */
+ PORT_START("DSW3") /* IN13 - DSW3 */
PORT_DIPNAME( 0x07, 0x07, "YAKUMAN Bonus" )
PORT_DIPSETTING( 0x07, "Cut" )
PORT_DIPSETTING( 0x06, "1 T" )
@@ -4969,7 +4969,7 @@ static INPUT_PORTS_START( mjchuuka )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW4") /* IN14 - DSW4 */
+ PORT_START("DSW4") /* IN14 - DSW4 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -4994,7 +4994,7 @@ static INPUT_PORTS_START( mjchuuka )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW5") /* IN15 - DSWs top bits */
+ PORT_START("DSW5") /* IN15 - DSWs top bits */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -5019,12 +5019,12 @@ static INPUT_PORTS_START( mjchuuka )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("BET") /* IN16 - Fake DSW */
+ PORT_START("BET") /* IN16 - Fake DSW */
PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("HOPPER") /* IN17 - Fake DSW */
+ PORT_START("HOPPER") /* IN17 - Fake DSW */
PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -5033,7 +5033,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( funkyfig )
- PORT_START_TAG("IN0") /* IN0 - Keys (port 83 with port 80 = 20) */
+ PORT_START("IN0") /* IN0 - Keys (port 83 with port 80 = 20) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("1") PORT_CODE(KEYCODE_1_PAD)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("2") PORT_CODE(KEYCODE_2_PAD)
@@ -5043,11 +5043,11 @@ static INPUT_PORTS_START( funkyfig )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("6") PORT_CODE(KEYCODE_6_PAD)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("7") PORT_CODE(KEYCODE_7_PAD)
- PORT_START_TAG("IN1") /* IN1 - ? (port 83 with port 80 = 21) */
+ PORT_START("IN1") /* IN1 - ? (port 83 with port 80 = 21) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 ) // ?
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2 - Coins (port 82 with port 80 = 22) */
+ PORT_START("IN2") /* IN2 - Coins (port 82 with port 80 = 22) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -5057,7 +5057,7 @@ static INPUT_PORTS_START( funkyfig )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("9") PORT_CODE(KEYCODE_9_PAD)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* IN3 - DSW1 (low bits, port 1c with rombank = 1e) */
+ PORT_START("DSW1") /* IN3 - DSW1 (low bits, port 1c with rombank = 1e) */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -5082,7 +5082,7 @@ static INPUT_PORTS_START( funkyfig )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START_TAG("DSW2") /* IN4 - DSW2 (low bits, port 1c with rombank = 1d) */
+ PORT_START("DSW2") /* IN4 - DSW2 (low bits, port 1c with rombank = 1d) */
PORT_DIPNAME( 0x01, 0x01, "2 Player Game" )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x01, DEF_STR( Yes ) )
@@ -5106,7 +5106,7 @@ static INPUT_PORTS_START( funkyfig )
PORT_DIPSETTING( 0x40, "2" )
PORT_DIPSETTING( 0x00, "3" )
- PORT_START_TAG("DSW3") /* IN5 - DSW1 & 2 (high bits, port 1c with rombank = 1b) */
+ PORT_START("DSW3") /* IN5 - DSW1 & 2 (high bits, port 1c with rombank = 1b) */
PORT_DIPNAME( 0x01, 0x01, "Continue?" ) // related to continue
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -5134,7 +5134,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mjmyster )
- PORT_START_TAG("IN0") /* IN0 - Coins + Service Keys */
+ PORT_START("IN0") /* IN0 - Coins + Service Keys */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE3 ) // medal out
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW)
@@ -5146,7 +5146,7 @@ static INPUT_PORTS_START( mjmyster )
/* keyb 1 */
- PORT_START_TAG("KEY0")
+ PORT_START("KEY0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) // A
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) // E
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) // I
@@ -5154,7 +5154,7 @@ static INPUT_PORTS_START( mjmyster )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) // Kan
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 ) // Start 1
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) // B
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) // F
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) // J
@@ -5162,7 +5162,7 @@ static INPUT_PORTS_START( mjmyster )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) // Reach
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) // BET
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) // C
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) // G
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) // K
@@ -5170,7 +5170,7 @@ static INPUT_PORTS_START( mjmyster )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) // Ron
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) // D
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) // H
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) // L
@@ -5178,7 +5178,7 @@ static INPUT_PORTS_START( mjmyster )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
- PORT_START_TAG("KEY4")
+ PORT_START("KEY4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) // "l"
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) // "t"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) // "w"
@@ -5186,7 +5186,7 @@ static INPUT_PORTS_START( mjmyster )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG ) // "b"
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) // "s"
- PORT_START_TAG("DSW1") /* IN6 - DSW1 */
+ PORT_START("DSW1") /* IN6 - DSW1 */
PORT_DIPNAME( 0x0f, 0x07, "Pay Out Rate (%)" )
PORT_DIPSETTING( 0x00, "50" )
PORT_DIPSETTING( 0x01, "53" )
@@ -5215,7 +5215,7 @@ static INPUT_PORTS_START( mjmyster )
PORT_DIPSETTING( 0x40, "10" )
PORT_DIPSETTING( 0x00, "20" )
- PORT_START_TAG("DSW2") /* IN7 - DSW2 */
+ PORT_START("DSW2") /* IN7 - DSW2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
@@ -5239,7 +5239,7 @@ static INPUT_PORTS_START( mjmyster )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* IN8 - DSW3 */
+ PORT_START("DSW3") /* IN8 - DSW3 */
PORT_DIPNAME( 0x03, 0x03, "YAKUMAN Times" )
// PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x03, "1" )
@@ -5263,7 +5263,7 @@ static INPUT_PORTS_START( mjmyster )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW4") /* IN9 - DSW4 */
+ PORT_START("DSW4") /* IN9 - DSW4 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -5289,7 +5289,7 @@ static INPUT_PORTS_START( mjmyster )
PORT_DIPSETTING( 0x80, DEF_STR( Japan ) )
PORT_DIPSETTING( 0x00, "Hong Kong" )
- PORT_START_TAG("DSW5") /* IN10 - DSWs top bits */
+ PORT_START("DSW5") /* IN10 - DSWs top bits */
PORT_DIPNAME( 0x03, 0x03, "Computer Strength?" )
PORT_DIPSETTING( 0x03, "Weak" )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ))
@@ -5317,7 +5317,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( hginga )
- PORT_START_TAG("IN0") /* IN0 - Coins + Service Keys */
+ PORT_START("IN0") /* IN0 - Coins + Service Keys */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE3 ) // medal out
// PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) // Test
@@ -5329,7 +5329,7 @@ static INPUT_PORTS_START( hginga )
/* keyb 2 */
- PORT_START_TAG("KEY0")
+ PORT_START("KEY0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_PLAYER(2) // A
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_PLAYER(2) // E
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // I
@@ -5337,7 +5337,7 @@ static INPUT_PORTS_START( hginga )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Kan
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_PLAYER(2) // B
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_PLAYER(2) // F
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // J
@@ -5345,7 +5345,7 @@ static INPUT_PORTS_START( hginga )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Reach
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) PORT_PLAYER(2) // BET
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_PLAYER(2) // C
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // G
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // K
@@ -5353,7 +5353,7 @@ static INPUT_PORTS_START( hginga )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Ron
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_PLAYER(2) // D
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // H
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // L
@@ -5361,7 +5361,7 @@ static INPUT_PORTS_START( hginga )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY4")
+ PORT_START("KEY4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) PORT_PLAYER(2) // "t"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) PORT_PLAYER(2) // "w"
@@ -5371,7 +5371,7 @@ static INPUT_PORTS_START( hginga )
/* keyb 1 */
- PORT_START_TAG("KEY5")
+ PORT_START("KEY5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) // A
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) // E
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // I
@@ -5379,7 +5379,7 @@ static INPUT_PORTS_START( hginga )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Kan
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("KEY6")
+ PORT_START("KEY6")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) // B
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) // F
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // J
@@ -5387,7 +5387,7 @@ static INPUT_PORTS_START( hginga )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Reach
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) // BET
- PORT_START_TAG("KEY7")
+ PORT_START("KEY7")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) // C
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // G
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // K
@@ -5395,7 +5395,7 @@ static INPUT_PORTS_START( hginga )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Ron
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY8")
+ PORT_START("KEY8")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) // D
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // H
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // L
@@ -5403,7 +5403,7 @@ static INPUT_PORTS_START( hginga )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY9")
+ PORT_START("KEY9")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) // "t"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) // "w"
@@ -5411,7 +5411,7 @@ static INPUT_PORTS_START( hginga )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG ) // "b"
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) // "s"
- PORT_START_TAG("DSW4") /* IN11 - DSW4 */
+ PORT_START("DSW4") /* IN11 - DSW4 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -5438,7 +5438,7 @@ static INPUT_PORTS_START( hginga )
PORT_DIPSETTING( 0x80, "Numbers" )
PORT_DIPSETTING( 0x00, "Letters" )
- PORT_START_TAG("DSW3") /* IN12 - DSW3 */
+ PORT_START("DSW3") /* IN12 - DSW3 */
PORT_DIPNAME( 0x03, 0x03, "Unknown 3-0&1" )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -5461,7 +5461,7 @@ static INPUT_PORTS_START( hginga )
PORT_DIPSETTING( 0x40, "2" )
PORT_DIPSETTING( 0x00, "3" )
- PORT_START_TAG("DSW2") /* IN13 - DSW2 */
+ PORT_START("DSW2") /* IN13 - DSW2 */
PORT_DIPNAME( 0x03, 0x03, "Unknown 2-0&1" )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -5484,7 +5484,7 @@ static INPUT_PORTS_START( hginga )
PORT_DIPSETTING( 0x40, "70" )
PORT_DIPSETTING( 0x00, "80" )
- PORT_START_TAG("DSW1") /* IN14 - DSW1 */
+ PORT_START("DSW1") /* IN14 - DSW1 */
PORT_DIPNAME( 0x07, 0x07, "Unknown 1-0&1&2" )
PORT_DIPSETTING( 0x07, "0" )
PORT_DIPSETTING( 0x06, "1" )
@@ -5509,7 +5509,7 @@ static INPUT_PORTS_START( hginga )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW5") /* IN15 - DSWs top bits */
+ PORT_START("DSW5") /* IN15 - DSWs top bits */
PORT_DIPNAME( 0x01, 0x01, "Keyboard" )
PORT_DIPSETTING( 0x00, "Hanafuda" ) // Requires different inputs
PORT_DIPSETTING( 0x01, "Mahjong" )
@@ -5533,7 +5533,7 @@ static INPUT_PORTS_START( hginga )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("BET") /* IN16 - Fake DSW */
+ PORT_START("BET") /* IN16 - Fake DSW */
PORT_DIPNAME( 0x40, 0x40, "Allow Bets" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
@@ -5541,7 +5541,7 @@ static INPUT_PORTS_START( hginga )
INPUT_PORTS_END
static INPUT_PORTS_START( hgokou )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE3 ) // medal out
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) PORT_TOGGLE
@@ -5553,7 +5553,7 @@ static INPUT_PORTS_START( hgokou )
/* keyb 1 */
- PORT_START_TAG("KEY0") /* IN1 */
+ PORT_START("KEY0") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("1") PORT_CODE(KEYCODE_1_PAD) // A
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("5") PORT_CODE(KEYCODE_5_PAD) // E
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // I
@@ -5561,7 +5561,7 @@ static INPUT_PORTS_START( hgokou )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) // Kan
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("KEY1") /* IN2 */
+ PORT_START("KEY1") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("2") PORT_CODE(KEYCODE_2_PAD) // B
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("6") PORT_CODE(KEYCODE_6_PAD) // F
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // J
@@ -5569,7 +5569,7 @@ static INPUT_PORTS_START( hgokou )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) // Reach
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // BET
- PORT_START_TAG("KEY2") /* IN3 */
+ PORT_START("KEY2") /* IN3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("3") PORT_CODE(KEYCODE_3_PAD) // C
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // G
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // K
@@ -5577,7 +5577,7 @@ static INPUT_PORTS_START( hgokou )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Ron
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3") /* IN4 */
+ PORT_START("KEY3") /* IN4 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("4") PORT_CODE(KEYCODE_4_PAD) // D
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // H
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // L
@@ -5585,7 +5585,7 @@ static INPUT_PORTS_START( hgokou )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY4") /* IN5 */
+ PORT_START("KEY4") /* IN5 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // "t"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // "w"
@@ -5595,7 +5595,7 @@ static INPUT_PORTS_START( hgokou )
/* keyb 2 */
- PORT_START_TAG("KEY5") /* IN6 */
+ PORT_START("KEY5") /* IN6 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_PLAYER(2) // A
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_PLAYER(2) // E
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // I
@@ -5603,7 +5603,7 @@ static INPUT_PORTS_START( hgokou )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) PORT_PLAYER(2) // Kan
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("KEY6") /* IN7 */
+ PORT_START("KEY6") /* IN7 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_PLAYER(2) // B
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_PLAYER(2) // F
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // J
@@ -5611,7 +5611,7 @@ static INPUT_PORTS_START( hgokou )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) PORT_PLAYER(2) // Reach
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // BET
- PORT_START_TAG("KEY7") /* IN8 */
+ PORT_START("KEY7") /* IN8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_PLAYER(2) // C
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_PLAYER(2) // G
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // K
@@ -5619,7 +5619,7 @@ static INPUT_PORTS_START( hgokou )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Ron
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY8") /* IN9 */
+ PORT_START("KEY8") /* IN9 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_PLAYER(2) // D
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_PLAYER(2) // H
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // L
@@ -5627,7 +5627,7 @@ static INPUT_PORTS_START( hgokou )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY9") /* IN10 */
+ PORT_START("KEY9") /* IN10 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // "t"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // "w"
@@ -5635,7 +5635,7 @@ static INPUT_PORTS_START( hgokou )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // "b"
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // "s"
- PORT_START_TAG("DSW4") /* IN11 - DSW4 */
+ PORT_START("DSW4") /* IN11 - DSW4 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -5662,7 +5662,7 @@ static INPUT_PORTS_START( hgokou )
PORT_DIPSETTING( 0x80, "Numbers" )
PORT_DIPSETTING( 0x00, "Letters" )
- PORT_START_TAG("DSW3") /* IN12 - DSW3 */
+ PORT_START("DSW3") /* IN12 - DSW3 */
PORT_DIPNAME( 0x03, 0x03, "Unknown 3-0&1" )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -5685,7 +5685,7 @@ static INPUT_PORTS_START( hgokou )
PORT_DIPSETTING( 0x40, "2" )
PORT_DIPSETTING( 0x00, "3" )
- PORT_START_TAG("DSW2") /* IN13 - DSW2 */
+ PORT_START("DSW2") /* IN13 - DSW2 */
PORT_DIPNAME( 0x03, 0x03, "Unknown 2-0&1" )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -5708,7 +5708,7 @@ static INPUT_PORTS_START( hgokou )
PORT_DIPSETTING( 0x40, "70" )
PORT_DIPSETTING( 0x00, "80" )
- PORT_START_TAG("DSW1") /* IN14 - DSW1 */
+ PORT_START("DSW1") /* IN14 - DSW1 */
PORT_DIPNAME( 0x07, 0x07, "Unknown 1-0&1&2" )
PORT_DIPSETTING( 0x07, "0" )
PORT_DIPSETTING( 0x06, "1" )
@@ -5733,7 +5733,7 @@ static INPUT_PORTS_START( hgokou )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW5") /* IN15 - DSWs top bits */
+ PORT_START("DSW5") /* IN15 - DSWs top bits */
PORT_DIPNAME( 0x01, 0x00, "Control Panel" )
PORT_DIPSETTING( 0x00, "Hanafuda" )
PORT_DIPSETTING( 0x01, "Mahjong" ) // Requires different inputs
@@ -5759,7 +5759,7 @@ static INPUT_PORTS_START( hgokou )
INPUT_PORTS_END
static INPUT_PORTS_START( mjmyornt )
- PORT_START_TAG("IN0") /* IN0 - Coins + Service Keys */
+ PORT_START("IN0") /* IN0 - Coins + Service Keys */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE3 ) // medal out
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW)
@@ -5771,7 +5771,7 @@ static INPUT_PORTS_START( mjmyornt )
/* keyb 1 */
- PORT_START_TAG("KEY0")
+ PORT_START("KEY0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) // A
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) // E
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) // I
@@ -5779,7 +5779,7 @@ static INPUT_PORTS_START( mjmyornt )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) // Kan
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 ) // Start 1
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) // B
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) // F
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) // J
@@ -5787,7 +5787,7 @@ static INPUT_PORTS_START( mjmyornt )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) // Reach
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) // BET
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) // C
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) // G
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) // K
@@ -5795,7 +5795,7 @@ static INPUT_PORTS_START( mjmyornt )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) // Ron
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) // D
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) // H
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) // L
@@ -5803,7 +5803,7 @@ static INPUT_PORTS_START( mjmyornt )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
- PORT_START_TAG("KEY4")
+ PORT_START("KEY4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) // "l"
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) // "t"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) // "w"
@@ -5811,7 +5811,7 @@ static INPUT_PORTS_START( mjmyornt )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG ) // "b"
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) // "s"
- PORT_START_TAG("DSW1") /* IN6 - DSW1 */
+ PORT_START("DSW1") /* IN6 - DSW1 */
PORT_DIPNAME( 0x0f, 0x07, "Pay Out Rate (%)" )
PORT_DIPSETTING( 0x00, "50" )
PORT_DIPSETTING( 0x01, "53" )
@@ -5840,7 +5840,7 @@ static INPUT_PORTS_START( mjmyornt )
PORT_DIPSETTING( 0x40, "10" )
PORT_DIPSETTING( 0x00, "20" )
- PORT_START_TAG("DSW2") /* IN7 - DSW2 */
+ PORT_START("DSW2") /* IN7 - DSW2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
@@ -5864,7 +5864,7 @@ static INPUT_PORTS_START( mjmyornt )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* IN8 - DSW3 */
+ PORT_START("DSW3") /* IN8 - DSW3 */
PORT_DIPNAME( 0x03, 0x03, "YAKUMAN Times" )
// PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x03, "1" )
@@ -5888,7 +5888,7 @@ static INPUT_PORTS_START( mjmyornt )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW4") /* IN9 - DSW4 */
+ PORT_START("DSW4") /* IN9 - DSW4 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -5914,7 +5914,7 @@ static INPUT_PORTS_START( mjmyornt )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW5") /* IN10 - DSWs top bits */
+ PORT_START("DSW5") /* IN10 - DSWs top bits */
PORT_DIPNAME( 0x03, 0x03, "Computer Strength?" )
PORT_DIPSETTING( 0x03, "Weak" )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ))
@@ -5942,7 +5942,7 @@ INPUT_PORTS_END
#ifdef UNUSED_DEFINITION
static INPUT_PORTS_START( mjmyuniv )
- PORT_START_TAG("IN0") /* IN0 - Coins + Service Keys */
+ PORT_START("IN0") /* IN0 - Coins + Service Keys */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE3 ) // medal out
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW)
@@ -5954,7 +5954,7 @@ static INPUT_PORTS_START( mjmyuniv )
/* keyb 1 */
- PORT_START_TAG("KEY0")
+ PORT_START("KEY0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) // A
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) // E
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) // I
@@ -5962,7 +5962,7 @@ static INPUT_PORTS_START( mjmyuniv )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) // Kan
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 ) // Start 1
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) // B
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) // F
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) // J
@@ -5970,7 +5970,7 @@ static INPUT_PORTS_START( mjmyuniv )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) // Reach
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) // BET
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) // C
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) // G
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) // K
@@ -5978,7 +5978,7 @@ static INPUT_PORTS_START( mjmyuniv )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) // Ron
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) // D
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) // H
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) // L
@@ -5986,7 +5986,7 @@ static INPUT_PORTS_START( mjmyuniv )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
- PORT_START_TAG("KEY4")
+ PORT_START("KEY4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) // "l"
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) // "t"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) // "w"
@@ -5994,7 +5994,7 @@ static INPUT_PORTS_START( mjmyuniv )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG ) // "b"
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) // "s"
- PORT_START_TAG("DSW1") /* IN6 - DSW1 */
+ PORT_START("DSW1") /* IN6 - DSW1 */
PORT_DIPNAME( 0x0f, 0x07, "Pay Out Rate (%)" )
PORT_DIPSETTING( 0x00, "50" )
PORT_DIPSETTING( 0x01, "53" )
@@ -6023,7 +6023,7 @@ static INPUT_PORTS_START( mjmyuniv )
PORT_DIPSETTING( 0x40, "10" )
PORT_DIPSETTING( 0x00, "20" )
- PORT_START_TAG("DSW2") /* IN7 - DSW2 */
+ PORT_START("DSW2") /* IN7 - DSW2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
@@ -6047,7 +6047,7 @@ static INPUT_PORTS_START( mjmyuniv )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* IN8 - DSW3 */
+ PORT_START("DSW3") /* IN8 - DSW3 */
PORT_DIPNAME( 0x03, 0x03, "YAKUMAN Times" )
// PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x03, "1" )
@@ -6071,7 +6071,7 @@ static INPUT_PORTS_START( mjmyuniv )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW4") /* IN9 - DSW4 */
+ PORT_START("DSW4") /* IN9 - DSW4 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -6097,7 +6097,7 @@ static INPUT_PORTS_START( mjmyuniv )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW5") /* IN10 - DSWs top bits */
+ PORT_START("DSW5") /* IN10 - DSWs top bits */
PORT_DIPNAME( 0x03, 0x03, "Computer Strength?" )
PORT_DIPSETTING( 0x03, "Weak" )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ))
@@ -6125,7 +6125,7 @@ INPUT_PORTS_END
#endif
static INPUT_PORTS_START( akamaru )
- PORT_START_TAG("IN0") /* IN0 - Player 1 */
+ PORT_START("IN0") /* IN0 - Player 1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -6135,7 +6135,7 @@ static INPUT_PORTS_START( akamaru )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 - Player 2 */
+ PORT_START("IN1") /* IN1 - Player 2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
@@ -6145,7 +6145,7 @@ static INPUT_PORTS_START( akamaru )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2 - Coins + ? */
+ PORT_START("IN2") /* IN2 - Coins + ? */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -6155,7 +6155,7 @@ static INPUT_PORTS_START( akamaru )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) // blitter irq flag
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) // blitter busy flag
- PORT_START_TAG("DSW1") /* IN3 - DSW1 */
+ PORT_START("DSW1") /* IN3 - DSW1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -6177,7 +6177,7 @@ static INPUT_PORTS_START( akamaru )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW2") /* IN4 - DSW2 */
+ PORT_START("DSW2") /* IN4 - DSW2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -6204,7 +6204,7 @@ static INPUT_PORTS_START( akamaru )
INPUT_PORTS_END
static INPUT_PORTS_START( mjflove )
- PORT_START_TAG("IN0") /* IN0 - Coins + Service Keys */
+ PORT_START("IN0") /* IN0 - Coins + Service Keys */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -6216,7 +6216,7 @@ static INPUT_PORTS_START( mjflove )
/* keyb 1 */
- PORT_START_TAG("KEY0")
+ PORT_START("KEY0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) // A
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) // E
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) // I
@@ -6224,7 +6224,7 @@ static INPUT_PORTS_START( mjflove )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) // Kan
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 ) // Start 1
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) // B
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) // F
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) // J
@@ -6232,7 +6232,7 @@ static INPUT_PORTS_START( mjflove )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) // Reach
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) // BET
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) // C
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) // G
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) // K
@@ -6240,7 +6240,7 @@ static INPUT_PORTS_START( mjflove )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) // Ron
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) // D
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) // H
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) // L
@@ -6248,7 +6248,7 @@ static INPUT_PORTS_START( mjflove )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
- PORT_START_TAG("KEY4")
+ PORT_START("KEY4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) // "l"
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) // "t"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) // "w"
@@ -6258,7 +6258,7 @@ static INPUT_PORTS_START( mjflove )
/* keyb 2 */
- PORT_START_TAG("KEY5")
+ PORT_START("KEY5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_PLAYER(2) // A
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_PLAYER(2) // E
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_PLAYER(2) // I
@@ -6266,7 +6266,7 @@ static INPUT_PORTS_START( mjflove )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2) // Kan
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) // Start 2
- PORT_START_TAG("KEY6")
+ PORT_START("KEY6")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_PLAYER(2) // B
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_PLAYER(2) // F
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_PLAYER(2) // J
@@ -6274,7 +6274,7 @@ static INPUT_PORTS_START( mjflove )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_PLAYER(2) // Reach
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) PORT_PLAYER(2) // BET
- PORT_START_TAG("KEY7")
+ PORT_START("KEY7")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_PLAYER(2) // C
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_PLAYER(2) // G
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) PORT_PLAYER(2) // K
@@ -6282,7 +6282,7 @@ static INPUT_PORTS_START( mjflove )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2) // Ron
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
- PORT_START_TAG("KEY8")
+ PORT_START("KEY8")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_PLAYER(2) // D
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_PLAYER(2) // H
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_PLAYER(2) // L
@@ -6290,7 +6290,7 @@ static INPUT_PORTS_START( mjflove )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // nothing
- PORT_START_TAG("KEY9")
+ PORT_START("KEY9")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) PORT_PLAYER(2) // "l"
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) PORT_PLAYER(2) // "t"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) PORT_PLAYER(2) // "w"
@@ -6298,7 +6298,7 @@ static INPUT_PORTS_START( mjflove )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG ) PORT_PLAYER(2) // "b"
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) PORT_PLAYER(2) // "s"
- PORT_START_TAG("DSW1") /* IN11 - DSW1 */
+ PORT_START("DSW1") /* IN11 - DSW1 */
PORT_DIPNAME( 0x01, 0x01, "Unknown 2-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -6324,7 +6324,7 @@ static INPUT_PORTS_START( mjflove )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* IN12 - DSW2 */
+ PORT_START("DSW2") /* IN12 - DSW2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -6349,7 +6349,7 @@ static INPUT_PORTS_START( mjflove )
INPUT_PORTS_END
static INPUT_PORTS_START( hparadis )
- PORT_START_TAG("IN0") /* IN0 - Player 1 */
+ PORT_START("IN0") /* IN0 - Player 1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
@@ -6359,10 +6359,10 @@ static INPUT_PORTS_START( hparadis )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 - Player 2 */
+ PORT_START("IN1") /* IN1 - Player 2 */
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -6374,7 +6374,7 @@ static INPUT_PORTS_START( hparadis )
/* keyb 1 */
- PORT_START_TAG("KEY0") /* IN3 */
+ PORT_START("KEY0") /* IN3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("1") PORT_CODE(KEYCODE_1_PAD) // A
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("5") PORT_CODE(KEYCODE_5_PAD) // E
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // I
@@ -6382,7 +6382,7 @@ static INPUT_PORTS_START( hparadis )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Kan
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("KEY1") /* IN4 */
+ PORT_START("KEY1") /* IN4 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("2") PORT_CODE(KEYCODE_2_PAD) // B
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("6") PORT_CODE(KEYCODE_6_PAD) // F
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // J
@@ -6390,7 +6390,7 @@ static INPUT_PORTS_START( hparadis )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Reach
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // BET
- PORT_START_TAG("KEY2") /* IN5 */
+ PORT_START("KEY2") /* IN5 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("3") PORT_CODE(KEYCODE_3_PAD) // C
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("7") PORT_CODE(KEYCODE_7_PAD) // G
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // K
@@ -6398,7 +6398,7 @@ static INPUT_PORTS_START( hparadis )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Ron
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3") /* IN6 */
+ PORT_START("KEY3") /* IN6 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("4") PORT_CODE(KEYCODE_4_PAD) // D
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("8") PORT_CODE(KEYCODE_8_PAD) // H
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // L
@@ -6406,7 +6406,7 @@ static INPUT_PORTS_START( hparadis )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY4") /* IN7 */
+ PORT_START("KEY4") /* IN7 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // "t"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // "w"
@@ -6416,7 +6416,7 @@ static INPUT_PORTS_START( hparadis )
/* keyb 2 */
- PORT_START_TAG("KEY5") /* IN8 */
+ PORT_START("KEY5") /* IN8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_PLAYER(2) // A
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_PLAYER(2) // E
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // I
@@ -6424,7 +6424,7 @@ static INPUT_PORTS_START( hparadis )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Kan
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("KEY6") /* IN9 */
+ PORT_START("KEY6") /* IN9 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_PLAYER(2) // B
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_PLAYER(2) // F
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // J
@@ -6432,7 +6432,7 @@ static INPUT_PORTS_START( hparadis )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Reach
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // BET
- PORT_START_TAG("KEY7") /* IN10 */
+ PORT_START("KEY7") /* IN10 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_PLAYER(2) // C
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_PLAYER(2) // G
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // K
@@ -6440,7 +6440,7 @@ static INPUT_PORTS_START( hparadis )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Ron
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY8") /* IN11 */
+ PORT_START("KEY8") /* IN11 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_PLAYER(2) // D
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_PLAYER(2) // H
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // L
@@ -6448,7 +6448,7 @@ static INPUT_PORTS_START( hparadis )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY9") /* IN12 */
+ PORT_START("KEY9") /* IN12 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // "t"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // "w"
@@ -6456,7 +6456,7 @@ static INPUT_PORTS_START( hparadis )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // "b"
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // "s"
- PORT_START_TAG("DSW1") /* IN13 - DSW1 */
+ PORT_START("DSW1") /* IN13 - DSW1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -6479,7 +6479,7 @@ static INPUT_PORTS_START( hparadis )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START_TAG("DSW2") /* IN14 - DSW2 */
+ PORT_START("DSW2") /* IN14 - DSW2 */
PORT_DIPNAME( 0x03, 0x03, "Unknown 2-0&1" )
PORT_DIPSETTING( 0x03, "0" )
PORT_DIPSETTING( 0x02, "1" )
@@ -6504,7 +6504,7 @@ static INPUT_PORTS_START( hparadis )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* IN15 - DSWs top bits */
+ PORT_START("DSW3") /* IN15 - DSWs top bits */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c
index 67ae1bfbe09..15472bd2906 100644
--- a/src/mame/drivers/ddragon.c
+++ b/src/mame/drivers/ddragon.c
@@ -502,11 +502,11 @@ static ADDRESS_MAP_START( ddragon_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(ddragon_fgvideoram_w) AM_BASE(&ddragon_fgvideoram)
AM_RANGE(0x2000, 0x2fff) AM_READWRITE(ddragon_spriteram_r, ddragon_spriteram_w) AM_BASE(&ddragon_spriteram)
AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE(ddragon_bgvideoram_w) AM_BASE(&ddragon_bgvideoram)
- AM_RANGE(0x3800, 0x3800) AM_READ(input_port_0_r)
- AM_RANGE(0x3801, 0x3801) AM_READ(input_port_1_r)
- AM_RANGE(0x3802, 0x3802) AM_READ(input_port_4_r)
- AM_RANGE(0x3803, 0x3803) AM_READ(input_port_2_r)
- AM_RANGE(0x3804, 0x3804) AM_READ(input_port_3_r)
+ AM_RANGE(0x3800, 0x3800) AM_READ_PORT("P1")
+ AM_RANGE(0x3801, 0x3801) AM_READ_PORT("P2")
+ AM_RANGE(0x3802, 0x3802) AM_READ_PORT("EXTRA")
+ AM_RANGE(0x3803, 0x3803) AM_READ_PORT("DSW0")
+ AM_RANGE(0x3804, 0x3804) AM_READ_PORT("DSW1")
AM_RANGE(0x3808, 0x3808) AM_WRITE(ddragon_bankswitch_w)
AM_RANGE(0x3809, 0x3809) AM_WRITE(SMH_RAM) AM_BASE(&ddragon_scrollx_lo)
AM_RANGE(0x380a, 0x380a) AM_WRITE(SMH_RAM) AM_BASE(&ddragon_scrolly_lo)
@@ -521,11 +521,11 @@ static ADDRESS_MAP_START( dd2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(ddragon_fgvideoram_w) AM_BASE(&ddragon_fgvideoram)
AM_RANGE(0x2000, 0x2fff) AM_READWRITE(ddragon_spriteram_r, ddragon_spriteram_w) AM_BASE(&ddragon_spriteram)
AM_RANGE(0x3000, 0x37ff) AM_RAM_WRITE(ddragon_bgvideoram_w) AM_BASE(&ddragon_bgvideoram)
- AM_RANGE(0x3800, 0x3800) AM_READ(input_port_0_r)
- AM_RANGE(0x3801, 0x3801) AM_READ(input_port_1_r)
- AM_RANGE(0x3802, 0x3802) AM_READ(input_port_4_r)
- AM_RANGE(0x3803, 0x3803) AM_READ(input_port_2_r)
- AM_RANGE(0x3804, 0x3804) AM_READ(input_port_3_r)
+ AM_RANGE(0x3800, 0x3800) AM_READ_PORT("P1")
+ AM_RANGE(0x3801, 0x3801) AM_READ_PORT("P2")
+ AM_RANGE(0x3802, 0x3802) AM_READ_PORT("EXTRA")
+ AM_RANGE(0x3803, 0x3803) AM_READ_PORT("DSW0")
+ AM_RANGE(0x3804, 0x3804) AM_READ_PORT("DSW1")
AM_RANGE(0x3808, 0x3808) AM_WRITE(ddragon_bankswitch_w)
AM_RANGE(0x3809, 0x3809) AM_WRITE(SMH_RAM) AM_BASE(&ddragon_scrollx_lo)
AM_RANGE(0x380a, 0x380a) AM_WRITE(SMH_RAM) AM_BASE(&ddragon_scrolly_lo)
@@ -629,7 +629,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( ddragon )
- PORT_START_TAG("IN0")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -639,7 +639,7 @@ static INPUT_PORTS_START( ddragon )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -649,7 +649,7 @@ static INPUT_PORTS_START( ddragon )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
@@ -675,7 +675,7 @@ static INPUT_PORTS_START( ddragon )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Medium ) )
@@ -696,7 +696,7 @@ static INPUT_PORTS_START( ddragon )
PORT_DIPSETTING( 0x40, "4" )
PORT_DIPSETTING( 0x00, "Infinite (Cheat)")
- PORT_START_TAG("IN4")
+ PORT_START("EXTRA")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
diff --git a/src/mame/drivers/ddragon3.c b/src/mame/drivers/ddragon3.c
index 52012bdf0e1..1e33eff4e15 100644
--- a/src/mame/drivers/ddragon3.c
+++ b/src/mame/drivers/ddragon3.c
@@ -103,10 +103,10 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM)
AM_RANGE(0x080000, 0x080fff) AM_READ(SMH_RAM) /* Foreground (32x32 Tiles - 4 by per tile) */
AM_RANGE(0x082000, 0x0827ff) AM_READ(SMH_RAM) /* Background (32x32 Tiles - 2 by per tile) */
- AM_RANGE(0x100000, 0x100001) AM_READ(input_port_0_word_r)
- AM_RANGE(0x100002, 0x100003) AM_READ(input_port_1_word_r)
- AM_RANGE(0x100004, 0x100005) AM_READ(input_port_2_word_r)
- AM_RANGE(0x100006, 0x100007) AM_READ(input_port_3_word_r)
+ AM_RANGE(0x100000, 0x100001) AM_READ_PORT("P1_P2")
+ AM_RANGE(0x100002, 0x100003) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0x100004, 0x100005) AM_READ_PORT("DSW")
+ AM_RANGE(0x100006, 0x100007) AM_READ_PORT("P3")
AM_RANGE(0x140000, 0x1405ff) AM_READ(SMH_RAM) /* Palette RAM */
AM_RANGE(0x180000, 0x180fff) AM_READ(SMH_RAM)
AM_RANGE(0x1c0000, 0x1c3fff) AM_READ(SMH_RAM) /* working RAM */
@@ -129,10 +129,10 @@ static ADDRESS_MAP_START( dd3b_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x081000, 0x081fff) AM_READ(SMH_RAM)
AM_RANGE(0x082000, 0x0827ff) AM_READ(SMH_RAM) /* Background (32x32 Tiles - 2 by per tile) */
AM_RANGE(0x100000, 0x1005ff) AM_READ(SMH_RAM) /* Palette RAM */
- AM_RANGE(0x180000, 0x180001) AM_READ(input_port_0_word_r)
- AM_RANGE(0x180002, 0x180003) AM_READ(input_port_1_word_r)
- AM_RANGE(0x180004, 0x180005) AM_READ(input_port_2_word_r)
- AM_RANGE(0x180006, 0x180007) AM_READ(input_port_3_word_r)
+ AM_RANGE(0x180000, 0x180001) AM_READ_PORT("IN0")
+ AM_RANGE(0x180002, 0x180003) AM_READ_PORT("IN1")
+ AM_RANGE(0x180004, 0x180005) AM_READ_PORT("IN2")
+ AM_RANGE(0x180006, 0x180007) AM_READ_PORT("IN3")
AM_RANGE(0x1c0000, 0x1c3fff) AM_READ(SMH_RAM) /* working RAM */
ADDRESS_MAP_END
@@ -155,10 +155,10 @@ static ADDRESS_MAP_START( ctribe_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x082800, 0x082fff) AM_READ(SMH_RAM)
AM_RANGE(0x0c0000, 0x0c000f) AM_READ(ddragon3_scroll16_r)
AM_RANGE(0x100000, 0x1005ff) AM_READ(SMH_RAM) /* Palette RAM */
- AM_RANGE(0x180000, 0x180001) AM_READ(input_port_0_word_r)
- AM_RANGE(0x180002, 0x180003) AM_READ(input_port_1_word_r)
- AM_RANGE(0x180004, 0x180005) AM_READ(input_port_2_word_r)
- AM_RANGE(0x180006, 0x180007) AM_READ(input_port_3_word_r)
+ AM_RANGE(0x180000, 0x180001) AM_READ_PORT("IN0")
+ AM_RANGE(0x180002, 0x180003) AM_READ_PORT("IN1")
+ AM_RANGE(0x180004, 0x180005) AM_READ_PORT("IN2")
+ AM_RANGE(0x180006, 0x180007) AM_READ_PORT("IN3")
AM_RANGE(0x1c0000, 0x1c3fff) AM_READ(SMH_RAM) /* working RAM */
ADDRESS_MAP_END
@@ -214,7 +214,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( ddragon3 )
- PORT_START_TAG("IN0")
+ PORT_START("P1_P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -232,32 +232,32 @@ static INPUT_PORTS_START( ddragon3 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x00f8, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
- PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2")
+ PORT_START("DSW")
+ PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x0003, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 1C_2C ) )
PORT_DIPUNUSED_DIPLOC( 0x0004, 0x0004, "SW1:3" )
PORT_DIPUNUSED_DIPLOC( 0x0008, 0x0008, "SW1:4" )
- PORT_DIPNAME( 0x0010, 0x0010, "Continue Discount" ) PORT_DIPLOCATION("SW1:5")
+ PORT_DIPNAME( 0x0010, 0x0010, "Continue Discount" ) PORT_DIPLOCATION("SW1:5")
PORT_DIPSETTING( 0x0010, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- 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_DIPUNUSED_DIPLOC( 0x0080, 0x0080, "SW1:8" )
- PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
+ PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x0200, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0300, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x0100, DEF_STR( Hard ) )
@@ -267,17 +267,17 @@ static INPUT_PORTS_START( ddragon3 )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_DIPUNUSED_DIPLOC( 0x0800, 0x0800, "SW2:4" )
PORT_SERVICE_DIPLOC( 0x1000, IP_ACTIVE_LOW, "SW2:5" )
- PORT_DIPNAME( 0x2000, 0x2000, "Stage Clear Energy" ) PORT_DIPLOCATION("SW2:6")
+ PORT_DIPNAME( 0x2000, 0x2000, "Stage Clear Energy" ) PORT_DIPLOCATION("SW2:6")
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x2000, "50" )
- PORT_DIPNAME( 0x4000, 0x4000, "Starting Energy" ) PORT_DIPLOCATION("SW2:7")
+ PORT_DIPNAME( 0x4000, 0x4000, "Starting Energy" ) PORT_DIPLOCATION("SW2:7")
PORT_DIPSETTING( 0x0000, "200" )
PORT_DIPSETTING( 0x4000, "230" )
- PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Players ) ) PORT_DIPLOCATION("SW2:8")
+ PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Players ) ) PORT_DIPLOCATION("SW2:8")
PORT_DIPSETTING( 0x8000, "2" )
PORT_DIPSETTING( 0x0000, "3" )
- PORT_START_TAG("IN3")
+ PORT_START("P3")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
@@ -290,7 +290,7 @@ static INPUT_PORTS_START( ddragon3 )
INPUT_PORTS_END
static INPUT_PORTS_START( ctribe )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -310,7 +310,7 @@ static INPUT_PORTS_START( ctribe )
PORT_DIPUNUSED_DIPLOC( 0x2000, 0x2000, "SW1:8" )
PORT_BIT( 0xc000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -335,7 +335,7 @@ static INPUT_PORTS_START( ctribe )
PORT_DIPSETTING( 0x2000, DEF_STR( On ) )
PORT_BIT( 0xc000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
@@ -345,31 +345,31 @@ static INPUT_PORTS_START( ctribe )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START3 )
- PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
+ PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x0200, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0300, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x0100, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Hardest ) )
- PORT_DIPNAME( 0x0400, 0x0400, "Timer Speed" ) PORT_DIPLOCATION("SW2:3")
+ PORT_DIPNAME( 0x0400, 0x0400, "Timer Speed" ) PORT_DIPLOCATION("SW2:3")
PORT_DIPSETTING( 0x0400, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x0000, "Fast" )
- PORT_DIPNAME( 0x0800, 0x0800, "FBI Logo" ) PORT_DIPLOCATION("SW2:4")
+ PORT_DIPNAME( 0x0800, 0x0800, "FBI Logo" ) PORT_DIPLOCATION("SW2:4")
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0800, DEF_STR( On ) )
PORT_SERVICE_DIPLOC( 0x1000, IP_ACTIVE_LOW, "SW2:5" )
- PORT_DIPNAME( 0x2000, 0x2000, "Stage Clear Energy" ) PORT_DIPLOCATION("SW2:6")
- PORT_DIPSETTING( 0x2000, "0" ) PORT_CONDITION("IN3",0x0100,PORTCOND_EQUALS,0x0100)
- PORT_DIPSETTING( 0x0000, "50" ) PORT_CONDITION("IN3",0x0100,PORTCOND_EQUALS,0x0100)
- PORT_DIPSETTING( 0x2000, "100" ) PORT_CONDITION("IN3",0x0100,PORTCOND_EQUALS,0x0000)
- PORT_DIPSETTING( 0x0000, "150" ) PORT_CONDITION("IN3",0x0100,PORTCOND_EQUALS,0x0000)
+ PORT_DIPNAME( 0x2000, 0x2000, "Stage Clear Energy" ) PORT_DIPLOCATION("SW2:6")
+ PORT_DIPSETTING( 0x2000, "0" ) PORT_CONDITION("IN3", 0x0100, PORTCOND_EQUALS, 0x0100)
+ PORT_DIPSETTING( 0x0000, "50" ) PORT_CONDITION("IN3", 0x0100, PORTCOND_EQUALS, 0x0100)
+ PORT_DIPSETTING( 0x2000, "100" ) PORT_CONDITION("IN3", 0x0100, PORTCOND_EQUALS, 0x0000)
+ PORT_DIPSETTING( 0x0000, "150" ) PORT_CONDITION("IN3", 0x0100, PORTCOND_EQUALS, 0x0000)
PORT_BIT( 0xc000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_DIPNAME( 0x0100, 0x0100, "More Stage Clear Energy" ) PORT_DIPLOCATION("SW2:7")
+ PORT_DIPNAME( 0x0100, 0x0100, "More Stage Clear Energy" ) PORT_DIPLOCATION("SW2:7")
PORT_DIPSETTING( 0x0100, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Players ) ) PORT_DIPLOCATION("SW2:8")
+ PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Players ) ) PORT_DIPLOCATION("SW2:8")
PORT_DIPSETTING( 0x0200, "2" )
PORT_DIPSETTING( 0x0000, "3" )
PORT_BIT( 0xfc00, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -382,16 +382,16 @@ static INPUT_PORTS_START( ddrago3b )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_MODIFY("IN2")
- PORT_DIPNAME( 0x0400, 0x0400, "Player Vs. Player Damage" ) PORT_DIPLOCATION("SW2:3")
+ PORT_DIPNAME( 0x0400, 0x0400, "Player Vs. Player Damage" ) PORT_DIPLOCATION("SW2:3")
PORT_DIPSETTING( 0x0400, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x2000, 0x2000, "Stage Clear Energy" ) PORT_DIPLOCATION("SW2:6")
+ PORT_DIPNAME( 0x2000, 0x2000, "Stage Clear Energy" ) PORT_DIPLOCATION("SW2:6")
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x2000, "50" )
PORT_DIPUNUSED_DIPLOC( 0x0800, 0x0800, "SW2:4" )
PORT_MODIFY("IN3")
- PORT_DIPNAME( 0x0100, 0x0100, "Starting Energy" ) PORT_DIPLOCATION("SW2:7")
+ PORT_DIPNAME( 0x0100, 0x0100, "Starting Energy" ) PORT_DIPLOCATION("SW2:7")
PORT_DIPSETTING( 0x0000, "200" )
PORT_DIPSETTING( 0x0100, "230" )
INPUT_PORTS_END
diff --git a/src/mame/drivers/ddrible.c b/src/mame/drivers/ddrible.c
index 60f96a852df..cdb55d41a28 100644
--- a/src/mame/drivers/ddrible.c
+++ b/src/mame/drivers/ddrible.c
@@ -151,12 +151,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( readmem_cpu1, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_READ(ddrible_sharedram_r) /* shared RAM with CPU #0 */
AM_RANGE(0x2000, 0x27ff) AM_READ(ddrible_snd_sharedram_r) /* shared RAM with CPU #2 */
- AM_RANGE(0x2800, 0x2800) AM_READ(input_port_3_r) /* DSW #1 */
- AM_RANGE(0x2801, 0x2801) AM_READ(input_port_0_r) /* player 1 inputs */
- AM_RANGE(0x2802, 0x2802) AM_READ(input_port_1_r) /* player 2 inputs */
- AM_RANGE(0x2803, 0x2803) AM_READ(input_port_2_r) /* coinsw & start */
- AM_RANGE(0x2c00, 0x2c00) AM_READ(input_port_4_r) /* DSW #2 */
- AM_RANGE(0x3000, 0x3000) AM_READ(input_port_5_r) /* DSW #3 */
+ AM_RANGE(0x2800, 0x2800) AM_READ_PORT("DSW1")
+ AM_RANGE(0x2801, 0x2801) AM_READ_PORT("P1")
+ AM_RANGE(0x2802, 0x2802) AM_READ_PORT("P2")
+ AM_RANGE(0x2803, 0x2803) AM_READ_PORT("SYSTEM") /* coinsw & start */
+ AM_RANGE(0x2c00, 0x2c00) AM_READ_PORT("DSW2")
+ AM_RANGE(0x3000, 0x3000) AM_READ_PORT("DSW3")
AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) /* ROM */
ADDRESS_MAP_END
@@ -184,7 +184,7 @@ static ADDRESS_MAP_START( writemem_cpu2, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( ddribble )
- PORT_START /* PLAYER 1 INPUTS */
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -194,7 +194,7 @@ static INPUT_PORTS_START( ddribble )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* PLAYER 2 INPUTS */
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -204,7 +204,7 @@ static INPUT_PORTS_START( ddribble )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* COINSW & START */
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -214,7 +214,7 @@ static INPUT_PORTS_START( ddribble )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* DSW #1 */
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -250,7 +250,7 @@ static INPUT_PORTS_START( ddribble )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
- PORT_START /* DSW #2 */
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -275,7 +275,7 @@ static INPUT_PORTS_START( ddribble )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW #3 */
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/deadang.c b/src/mame/drivers/deadang.c
index 352ceb6232f..7274c7c4259 100644
--- a/src/mame/drivers/deadang.c
+++ b/src/mame/drivers/deadang.c
@@ -71,8 +71,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x06010, 0x07fff) AM_WRITE(SMH_RAM)
AM_RANGE(0x08000, 0x087ff) AM_WRITE(deadang_text_w) AM_BASE(&videoram16)
AM_RANGE(0x08800, 0x0bfff) AM_WRITE(SMH_RAM)
- AM_RANGE(0x0a000, 0x0a001) AM_READ(input_port_1_word_r)
- AM_RANGE(0x0a002, 0x0a003) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x0a000, 0x0a001) AM_READ_PORT("P1_P2")
+ AM_RANGE(0x0a002, 0x0a003) AM_READ_PORT("DSW")
AM_RANGE(0x0c000, 0x0cfff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE(&paletteram16)
AM_RANGE(0x0d000, 0x0dfff) AM_WRITE(SMH_RAM)
AM_RANGE(0x0e000, 0x0e0ff) AM_WRITE(SMH_RAM) AM_BASE(&deadang_scroll_ram)
@@ -94,7 +94,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( deadang )
SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("P1_P2") /* IN0 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -111,7 +111,7 @@ static INPUT_PORTS_START( deadang )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("DSW") /* Dip switch A */
+ PORT_START("DSW") /* Dip switch A */
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0004, DEF_STR( 4C_1C ) )
@@ -160,7 +160,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( ghunter )
SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("P1_P2") /* IN0 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -177,7 +177,7 @@ static INPUT_PORTS_START( ghunter )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("DSW") /* Dip switch A */
+ PORT_START("DSW") /* Dip switch A */
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0004, DEF_STR( 4C_1C ) )
@@ -223,10 +223,10 @@ static INPUT_PORTS_START( ghunter )
PORT_DIPSETTING( 0x0000, DEF_STR( Japan ) )
PORT_DIPSETTING( 0x8000, "Overseas" )
- PORT_START_TAG("TRACKX")
+ PORT_START("TRACKX")
PORT_BIT( 0x0fff, 0x0000, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_PLAYER(1)
- PORT_START_TAG("TRACKY")
+ PORT_START("TRACKY")
PORT_BIT( 0x0fff, 0x0000, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_PLAYER(1)
INPUT_PORTS_END
diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c
index 8b224248a44..cfb2d1e0d93 100644
--- a/src/mame/drivers/dec0.c
+++ b/src/mame/drivers/dec0.c
@@ -185,7 +185,7 @@ static ADDRESS_MAP_START( hippodrm_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1a1000, 0x1a17ff) AM_READ(dec0_pf3_data_8bit_r)
AM_RANGE(0x1d0000, 0x1d00ff) AM_READ(hippodrm_prot_r)
AM_RANGE(0x1f0000, 0x1f1fff) AM_READ(SMH_BANK8) /* Main ram */
- AM_RANGE(0x1ff402, 0x1ff403) AM_READ(input_port_5_r) /* VBL */
+ AM_RANGE(0x1ff402, 0x1ff403) AM_READ_PORT("VBLANK")
ADDRESS_MAP_END
static ADDRESS_MAP_START( hippodrm_sub_writemem, ADDRESS_SPACE_PROGRAM, 8 )
@@ -366,7 +366,7 @@ ADDRESS_MAP_END
/******************************************************************************/
#define DEC0_PLAYER1_CONTROL \
- PORT_START_TAG("IN0") /* Player 1 controls */ \
+ PORT_START("IN0") /* Player 1 controls */ \
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY \
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY \
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY \
@@ -377,7 +377,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* Button 4 - unused */
#define DEC0_PLAYER2_CONTROL \
- PORT_START_TAG("IN1") /* Player 2 controls */ \
+ PORT_START("IN1") /* Player 2 controls */ \
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL \
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL \
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL \
@@ -388,7 +388,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* Button 4 - unused */
#define DEC0_MACHINE_CONTROL \
- PORT_START_TAG("IN2") /* Credits, start buttons */ \
+ PORT_START("IN2") /* Credits, start buttons */ \
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) /* PL1 Button 5 - unused */ \
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) /* PL2 Button 5 - unused */ \
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 ) \
@@ -415,7 +415,7 @@ static INPUT_PORTS_START( hbarrel )
DEC0_PLAYER2_CONTROL
DEC0_MACHINE_CONTROL
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) \
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) ) \
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) ) \
@@ -437,7 +437,7 @@ static INPUT_PORTS_START( hbarrel )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x03, "3" )
@@ -460,10 +460,10 @@ static INPUT_PORTS_START( hbarrel )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("AN0") /* player 1 12-way rotary control - converted in controls_r() */
+ PORT_START("AN0") /* player 1 12-way rotary control - converted in controls_r() */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X) PORT_REVERSE
- PORT_START_TAG("AN1") /* player 2 12-way rotary control - converted in controls_r() */
+ PORT_START("AN1") /* player 2 12-way rotary control - converted in controls_r() */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M) PORT_REVERSE PORT_PLAYER(2)
INPUT_PORTS_END
@@ -472,7 +472,7 @@ static INPUT_PORTS_START( birdtry )
DEC0_PLAYER2_CONTROL
DEC0_MACHINE_CONTROL
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
DEC0_COIN_SETTING
PORT_SERVICE( 0x10, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x20, 0x20, DEF_STR( Demo_Sounds ) )
@@ -485,7 +485,7 @@ static INPUT_PORTS_START( birdtry )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -511,10 +511,10 @@ static INPUT_PORTS_START( birdtry )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("AN0") /* player 1 12-way rotary control - converted in controls_r() */
+ PORT_START("AN0") /* player 1 12-way rotary control - converted in controls_r() */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X) PORT_REVERSE
- PORT_START_TAG("AN1") /* player 2 12-way rotary control - converted in controls_r() */
+ PORT_START("AN1") /* player 2 12-way rotary control - converted in controls_r() */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M) PORT_REVERSE PORT_PLAYER(2)
INPUT_PORTS_END
@@ -523,7 +523,7 @@ static INPUT_PORTS_START( baddudes )
DEC0_PLAYER2_CONTROL
DEC0_MACHINE_CONTROL
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
DEC0_COIN_SETTING
PORT_SERVICE( 0x10, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x20, 0x20, DEF_STR( Demo_Sounds ) )
@@ -536,7 +536,7 @@ static INPUT_PORTS_START( baddudes )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x03, "2" )
@@ -560,10 +560,10 @@ static INPUT_PORTS_START( baddudes )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("AN0") /* player 1 12-way rotary control - converted in controls_r() */
+ PORT_START("AN0") /* player 1 12-way rotary control - converted in controls_r() */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused */
- PORT_START_TAG("AN1") /* player 2 12-way rotary control - converted in controls_r() */
+ PORT_START("AN1") /* player 2 12-way rotary control - converted in controls_r() */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused */
INPUT_PORTS_END
@@ -572,7 +572,7 @@ static INPUT_PORTS_START( robocop )
DEC0_PLAYER2_CONTROL
DEC0_MACHINE_CONTROL
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
DEC0_COIN_SETTING
PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unused ) ) // Always OFF
PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
@@ -587,7 +587,7 @@ static INPUT_PORTS_START( robocop )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Player Energy" )
PORT_DIPSETTING( 0x01, DEF_STR( Low ) )
PORT_DIPSETTING( 0x03, DEF_STR( Medium ) )
@@ -617,7 +617,7 @@ static INPUT_PORTS_START( hippodrm )
DEC0_PLAYER2_CONTROL
DEC0_MACHINE_CONTROL
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
DEC0_COIN_SETTING
PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unused ) ) // Always OFF
PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
@@ -632,7 +632,7 @@ static INPUT_PORTS_START( hippodrm )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x03, "2" )
@@ -655,12 +655,12 @@ static INPUT_PORTS_START( hippodrm )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("VBLANK")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_VBLANK )
INPUT_PORTS_END
#define DEC1_PLAYER1_CONTROL \
- PORT_START_TAG("IN0") \
+ PORT_START("IN0") \
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY \
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY \
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY \
@@ -671,7 +671,7 @@ INPUT_PORTS_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
#define DEC1_PLAYER2_CONTROL \
- PORT_START_TAG("IN1")\
+ PORT_START("IN1")\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL \
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL \
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL \
@@ -686,7 +686,7 @@ static INPUT_PORTS_START( slyspy )
DEC1_PLAYER1_CONTROL
DEC1_PLAYER2_CONTROL
- PORT_START_TAG("IN2") /* Credits, start buttons */
+ PORT_START("IN2") /* Credits, start buttons */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -696,7 +696,7 @@ static INPUT_PORTS_START( slyspy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
DEC0_COIN_SETTING
PORT_SERVICE( 0x10, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x20, 0x20, DEF_STR( Demo_Sounds ) )
@@ -709,7 +709,7 @@ static INPUT_PORTS_START( slyspy )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Energy" )
PORT_DIPSETTING( 0x02, DEF_STR( Low ) )
PORT_DIPSETTING( 0x03, DEF_STR( Medium ) )
@@ -738,7 +738,7 @@ static INPUT_PORTS_START( midres )
DEC1_PLAYER1_CONTROL
DEC1_PLAYER2_CONTROL
- PORT_START_TAG("IN2") /* Credits */
+ PORT_START("IN2") /* Credits */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -748,7 +748,7 @@ static INPUT_PORTS_START( midres )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
DEC0_COIN_SETTING
PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unused ) ) // Always OFF
PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
@@ -763,7 +763,7 @@ static INPUT_PORTS_START( midres )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x03, "3" )
@@ -787,10 +787,10 @@ static INPUT_PORTS_START( midres )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("AN0") /* player 1 12-way rotary control - converted in controls_r() */
+ PORT_START("AN0") /* player 1 12-way rotary control - converted in controls_r() */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X) PORT_REVERSE
- PORT_START_TAG("AN1") /* player 2 12-way rotary control - converted in controls_r() */
+ PORT_START("AN1") /* player 2 12-way rotary control - converted in controls_r() */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M) PORT_REVERSE PORT_PLAYER(2)
INPUT_PORTS_END
@@ -798,7 +798,7 @@ static INPUT_PORTS_START( bouldash )
DEC1_PLAYER1_CONTROL
DEC1_PLAYER2_CONTROL
- PORT_START_TAG("IN2") /* Credits, start buttons */
+ PORT_START("IN2") /* Credits, start buttons */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -808,7 +808,7 @@ static INPUT_PORTS_START( bouldash )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
/* Different Coinage. Just a few combinations from manual, the rest was figured out */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
@@ -835,7 +835,7 @@ static INPUT_PORTS_START( bouldash )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x03, "3" )
diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c
index a70fcc71f90..6070f542029 100644
--- a/src/mame/drivers/dec8.c
+++ b/src/mame/drivers/dec8.c
@@ -1030,21 +1030,21 @@ ADDRESS_MAP_END
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
static INPUT_PORTS_START( cobracom )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PLAYER1_JOYSTICK
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PLAYER2_JOYSTICK
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -1054,7 +1054,7 @@ static INPUT_PORTS_START( cobracom )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -1078,7 +1078,7 @@ static INPUT_PORTS_START( cobracom )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -1104,21 +1104,21 @@ static INPUT_PORTS_START( cobracom )
INPUT_PORTS_END
static INPUT_PORTS_START( ghostb )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PLAYER1_JOYSTICK
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PLAYER2_JOYSTICK
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1128,7 +1128,7 @@ static INPUT_PORTS_START( ghostb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1146,13 +1146,13 @@ static INPUT_PORTS_START( ghostb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("I8751") /* Dummy input for i8751 */
+ PORT_START("I8751") /* Dummy input for i8751 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x03, "3" )
@@ -1192,7 +1192,7 @@ static INPUT_PORTS_START( ghostb3 )
INPUT_PORTS_END
static INPUT_PORTS_START( srdarwin )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -1202,7 +1202,7 @@ static INPUT_PORTS_START( srdarwin )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -1212,7 +1212,7 @@ static INPUT_PORTS_START( srdarwin )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -1236,7 +1236,7 @@ static INPUT_PORTS_START( srdarwin )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x03, "3" )
@@ -1260,20 +1260,20 @@ static INPUT_PORTS_START( srdarwin )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("FAKE")
+ PORT_START("FAKE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) /* Fake */
INPUT_PORTS_END
static INPUT_PORTS_START( gondo )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PLAYER1_JOYSTICK
/* Top 4 bits are rotary controller */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PLAYER2_JOYSTICK
/* Top 4 bits are rotary controller */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
@@ -1283,7 +1283,7 @@ static INPUT_PORTS_START( gondo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1293,17 +1293,17 @@ static INPUT_PORTS_START( gondo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("I8751") /* Fake port for the i8751 */
+ PORT_START("I8751") /* Fake port for the i8751 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("AN0") /* player 1 12-way rotary control */
+ PORT_START("AN0") /* player 1 12-way rotary control */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X) PORT_REVERSE
- PORT_START_TAG("AN1") /* player 2 12-way rotary control */
+ PORT_START("AN1") /* player 2 12-way rotary control */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -1327,7 +1327,7 @@ static INPUT_PORTS_START( gondo )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x03, "3" )
@@ -1353,21 +1353,21 @@ static INPUT_PORTS_START( gondo )
INPUT_PORTS_END
static INPUT_PORTS_START( oscar )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PLAYER1_JOYSTICK
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PLAYER2_JOYSTICK
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -1377,7 +1377,7 @@ static INPUT_PORTS_START( oscar )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -1401,7 +1401,7 @@ static INPUT_PORTS_START( oscar )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x03, "3" )
@@ -1426,21 +1426,21 @@ static INPUT_PORTS_START( oscar )
INPUT_PORTS_END
static INPUT_PORTS_START( oscarj0 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PLAYER1_JOYSTICK
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PLAYER2_JOYSTICK
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -1450,7 +1450,7 @@ static INPUT_PORTS_START( oscarj0 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_3C ) )
@@ -1474,7 +1474,7 @@ static INPUT_PORTS_START( oscarj0 )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x03, "3" )
@@ -1499,21 +1499,21 @@ static INPUT_PORTS_START( oscarj0 )
INPUT_PORTS_END
static INPUT_PORTS_START( lastmisn )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PLAYER1_JOYSTICK
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PLAYER2_JOYSTICK
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1523,7 +1523,7 @@ static INPUT_PORTS_START( lastmisn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -1547,7 +1547,7 @@ static INPUT_PORTS_START( lastmisn )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
@@ -1573,21 +1573,21 @@ static INPUT_PORTS_START( lastmisn )
INPUT_PORTS_END
static INPUT_PORTS_START( lastmsnj )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PLAYER1_JOYSTICK
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PLAYER2_JOYSTICK
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1597,7 +1597,7 @@ static INPUT_PORTS_START( lastmsnj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -1621,7 +1621,7 @@ static INPUT_PORTS_START( lastmsnj )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
@@ -1647,21 +1647,21 @@ static INPUT_PORTS_START( lastmsnj )
INPUT_PORTS_END
static INPUT_PORTS_START( shackled )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PLAYER1_JOYSTICK
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PLAYER2_JOYSTICK
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1671,7 +1671,7 @@ static INPUT_PORTS_START( shackled )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1694,7 +1694,7 @@ static INPUT_PORTS_START( shackled )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, "Power" )
PORT_DIPSETTING( 0x07, "200" )
PORT_DIPSETTING( 0x0b, "300" )
@@ -1726,21 +1726,21 @@ static INPUT_PORTS_START( shackled )
INPUT_PORTS_END
static INPUT_PORTS_START( csilver )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PLAYER1_JOYSTICK
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PLAYER2_JOYSTICK
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1750,7 +1750,7 @@ static INPUT_PORTS_START( csilver )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -1774,7 +1774,7 @@ static INPUT_PORTS_START( csilver )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x03, "3" )
@@ -1800,25 +1800,25 @@ static INPUT_PORTS_START( csilver )
INPUT_PORTS_END
static INPUT_PORTS_START( garyoret )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PLAYER1_JOYSTICK
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PLAYER2_JOYSTICK
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("I8751") /* Fake port for i8751 */
+ PORT_START("I8751") /* Fake port for i8751 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -1842,7 +1842,7 @@ static INPUT_PORTS_START( garyoret )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c
index c06cd7c3473..89142aba43e 100644
--- a/src/mame/drivers/deco156.c
+++ b/src/mame/drivers/deco156.c
@@ -278,7 +278,7 @@ ADDRESS_MAP_END
/***************************************************************************/
static INPUT_PORTS_START( hvysmsh )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -296,7 +296,7 @@ static INPUT_PORTS_START( hvysmsh )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -316,7 +316,7 @@ static INPUT_PORTS_START( hvysmsh )
INPUT_PORTS_END
static INPUT_PORTS_START( wcvol95 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -334,7 +334,7 @@ static INPUT_PORTS_START( wcvol95 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index 0440b77d42f..b61312b0e6e 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -1244,7 +1244,7 @@ COIN1n adds 100 energy points (based on "Coinage") for player n when ingame if e
*/
static INPUT_PORTS_START( captaven )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1262,7 +1262,7 @@ static INPUT_PORTS_START( captaven )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -1280,7 +1280,7 @@ static INPUT_PORTS_START( captaven )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -1298,7 +1298,7 @@ static INPUT_PORTS_START( captaven )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW") /* Dip switch bank 1 */
+ PORT_START("DSW") /* Dip switch bank 1 */
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) )
@@ -1350,7 +1350,7 @@ static INPUT_PORTS_START( captaven )
INPUT_PORTS_END
static INPUT_PORTS_START( fghthist )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -1368,7 +1368,7 @@ static INPUT_PORTS_START( fghthist )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1388,7 +1388,7 @@ static INPUT_PORTS_START( fghthist )
INPUT_PORTS_END
static INPUT_PORTS_START( dragngun )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1406,7 +1406,7 @@ static INPUT_PORTS_START( dragngun )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1424,7 +1424,7 @@ static INPUT_PORTS_START( dragngun )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED ) /* Would be a dipswitch, but only 1 present on board */
PORT_DIPNAME( 0x0100, 0x0000, "Reset" ) /* Behaves like Reset */
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -1451,7 +1451,7 @@ static INPUT_PORTS_START( dragngun )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE( 0x0004, IP_ACTIVE_LOW )
@@ -1461,21 +1461,21 @@ static INPUT_PORTS_START( dragngun )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("LIGHT0_X")
+ PORT_START("LIGHT0_X")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(25) PORT_PLAYER(1)
- PORT_START_TAG("LIGHT1_X")
+ PORT_START("LIGHT1_X")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(25) PORT_PLAYER(2)
- PORT_START_TAG("LIGHT0_Y")
+ PORT_START("LIGHT0_Y")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(25) PORT_PLAYER(1)
- PORT_START_TAG("LIGHT1_Y")
+ PORT_START("LIGHT1_Y")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(25) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( lockload )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1493,14 +1493,14 @@ static INPUT_PORTS_START( lockload )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_SPECIAL ) //check //test BUTTON F2
PORT_BIT( 0xfff0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED ) /* Would be a dipswitch, but only 1 present on board */
PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Free_Play ) )
PORT_DIPSETTING( 0x0100, DEF_STR( Off ) )
@@ -1527,35 +1527,35 @@ static INPUT_PORTS_START( lockload )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_VBLANK ) //IPT_VBLANK )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE( 0x0004, IP_ACTIVE_LOW )
PORT_BIT( 0x00f8, IP_ACTIVE_LOW, IPT_UNUSED ) //check //test BUTTON F2
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) /* mirror of fire buttons */
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_START_TAG("LIGHT0_X")
+ PORT_START("LIGHT0_X")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(20) PORT_KEYDELTA(25) PORT_PLAYER(1)
- PORT_START_TAG("LIGHT0_Y")
+ PORT_START("LIGHT0_Y")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(20) PORT_KEYDELTA(25) PORT_PLAYER(1)
- PORT_START_TAG("LIGHT1_X")
+ PORT_START("LIGHT1_X")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(20) PORT_KEYDELTA(25) PORT_PLAYER(2)
- PORT_START_TAG("LIGHT1_Y")
+ PORT_START("LIGHT1_Y")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(20) PORT_KEYDELTA(25) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( tattass )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1573,7 +1573,7 @@ static INPUT_PORTS_START( tattass )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1593,7 +1593,7 @@ static INPUT_PORTS_START( tattass )
INPUT_PORTS_END
static INPUT_PORTS_START( nslasher )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1611,7 +1611,7 @@ static INPUT_PORTS_START( nslasher )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
diff --git a/src/mame/drivers/deco_mlc.c b/src/mame/drivers/deco_mlc.c
index e240e7a8c40..de2878db8fd 100644
--- a/src/mame/drivers/deco_mlc.c
+++ b/src/mame/drivers/deco_mlc.c
@@ -329,7 +329,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( mlc )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -347,7 +347,7 @@ static INPUT_PORTS_START( mlc )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c
index e88c6121638..af355193328 100644
--- a/src/mame/drivers/decocass.c
+++ b/src/mame/drivers/decocass.c
@@ -94,8 +94,8 @@ static ADDRESS_MAP_START( decocass_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(tileram_w) AM_BASE(&decocass_tileram) AM_SIZE(&decocass_tileram_size)
AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE(objectram_w) AM_BASE(&decocass_objectram) AM_SIZE(&decocass_objectram_size)
AM_RANGE(0xe000, 0xe0ff) AM_RAM_WRITE(decocass_paletteram_w) AM_BASE(&paletteram)
- AM_RANGE(0xe300, 0xe300) AM_READWRITE(input_port_7_r, decocass_watchdog_count_w)
- AM_RANGE(0xe301, 0xe301) AM_READWRITE(input_port_8_r, decocass_watchdog_flip_w)
+ AM_RANGE(0xe300, 0xe300) AM_READ_PORT("DSW1") AM_WRITE(decocass_watchdog_count_w)
+ AM_RANGE(0xe301, 0xe301) AM_READ_PORT("DSW2") AM_WRITE(decocass_watchdog_flip_w)
AM_RANGE(0xe302, 0xe302) AM_WRITE(decocass_color_missiles_w)
AM_RANGE(0xe400, 0xe400) AM_WRITE(decocass_reset_w)
@@ -149,7 +149,7 @@ static ADDRESS_MAP_START( decocass_mcu_portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( decocass )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH,IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x02, IP_ACTIVE_HIGH,IPT_JOYSTICK_LEFT )
PORT_BIT( 0x04, IP_ACTIVE_HIGH,IPT_JOYSTICK_UP )
@@ -159,7 +159,7 @@ static INPUT_PORTS_START( decocass )
PORT_BIT( 0x40, IP_ACTIVE_HIGH,IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH,IPT_UNUSED )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH,IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH,IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH,IPT_JOYSTICK_UP ) PORT_COCKTAIL
@@ -169,7 +169,7 @@ static INPUT_PORTS_START( decocass )
PORT_BIT( 0x40, IP_ACTIVE_HIGH,IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH,IPT_UNUSED )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH,IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH,IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH,IPT_UNKNOWN )
@@ -179,19 +179,19 @@ static INPUT_PORTS_START( decocass )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
- PORT_START_TAG("AN0") /* IN3 */
+ PORT_START("AN0")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN1") /* IN4 */
+ PORT_START("AN1")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN2") /* IN5 */
+ PORT_START("AN2")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("AN3") /* IN6 */
+ PORT_START("AN3")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -212,7 +212,7 @@ static INPUT_PORTS_START( decocass )
PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/deniam.c b/src/mame/drivers/deniam.c
index 02fef705ef7..fcc55de6b50 100644
--- a/src/mame/drivers/deniam.c
+++ b/src/mame/drivers/deniam.c
@@ -96,11 +96,11 @@ static ADDRESS_MAP_START( deniam16b_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x400000, 0x40ffff) AM_READ(SMH_RAM)
AM_RANGE(0x410000, 0x410fff) AM_READ(SMH_RAM)
AM_RANGE(0xc40002, 0xc40003) AM_READ(deniam_coinctrl_r)
- AM_RANGE(0xc44000, 0xc44001) AM_READ(input_port_0_word_r)
- AM_RANGE(0xc44002, 0xc44003) AM_READ(input_port_1_word_r)
- AM_RANGE(0xc44004, 0xc44005) AM_READ(input_port_2_word_r)
+ AM_RANGE(0xc44000, 0xc44001) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0xc44002, 0xc44003) AM_READ_PORT("P1")
+ AM_RANGE(0xc44004, 0xc44005) AM_READ_PORT("P2")
AM_RANGE(0xc44006, 0xc44007) AM_READ(SMH_NOP) /* unused? */
- AM_RANGE(0xc4400a, 0xc4400b) AM_READ(input_port_3_word_r)
+ AM_RANGE(0xc4400a, 0xc4400b) AM_READ_PORT("DSW")
AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM)
ADDRESS_MAP_END
@@ -148,11 +148,11 @@ static ADDRESS_MAP_START( deniam16c_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x410000, 0x410fff) AM_READ(SMH_RAM)
AM_RANGE(0xc40000, 0xc40001) AM_READ(OKIM6295_status_0_lsb_r)
AM_RANGE(0xc40002, 0xc40003) AM_READ(deniam_coinctrl_r)
- AM_RANGE(0xc44000, 0xc44001) AM_READ(input_port_0_word_r)
- AM_RANGE(0xc44002, 0xc44003) AM_READ(input_port_1_word_r)
- AM_RANGE(0xc44004, 0xc44005) AM_READ(input_port_2_word_r)
+ AM_RANGE(0xc44000, 0xc44001) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0xc44002, 0xc44003) AM_READ_PORT("P1")
+ AM_RANGE(0xc44004, 0xc44005) AM_READ_PORT("P2")
AM_RANGE(0xc44006, 0xc44007) AM_READ(SMH_NOP) /* unused? */
- AM_RANGE(0xc4400a, 0xc4400b) AM_READ(input_port_3_word_r)
+ AM_RANGE(0xc4400a, 0xc4400b) AM_READ_PORT("DSW")
AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM)
ADDRESS_MAP_END
@@ -174,7 +174,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( karianx )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
@@ -184,7 +184,7 @@ static INPUT_PORTS_START( karianx )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -194,7 +194,7 @@ static INPUT_PORTS_START( karianx )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
@@ -204,7 +204,7 @@ static INPUT_PORTS_START( karianx )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -223,52 +223,13 @@ static INPUT_PORTS_START( karianx )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x20, DEF_STR( On ) )
PORT_DIPUNUSED( 0x40, IP_ACTIVE_LOW )
- PORT_DIPNAME( 0x80, 0x80, DEF_STR( Service_Mode ) )
- PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_SERVICE( 0x80, 0x80 )
INPUT_PORTS_END
static INPUT_PORTS_START( logicpr2 )
- PORT_START
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1)
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
+ PORT_INCLUDE( karianx )
- PORT_START
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2)
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
-
- PORT_START
- PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
- PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
- PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
- PORT_DIPSETTING( 0x04, DEF_STR( 3C_2C ) )
- PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) )
- PORT_DIPSETTING( 0x06, DEF_STR( 2C_3C ) )
- PORT_DIPSETTING( 0x03, DEF_STR( 1C_2C ) )
- PORT_DIPSETTING( 0x05, DEF_STR( 1C_3C ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
+ PORT_MODIFY("DSW")
PORT_DIPNAME( 0x18, 0x18, "Play Time" )
PORT_DIPSETTING( 0x08, "Slow" )
PORT_DIPSETTING( 0x18, DEF_STR( Normal ) )
diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c
index 8394f61dd36..beaabd6d1a7 100644
--- a/src/mame/drivers/destroyr.c
+++ b/src/mame/drivers/destroyr.c
@@ -181,7 +181,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( destroyr )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) /* call 7400 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED ) /* potsense1 */
@@ -194,7 +194,7 @@ static INPUT_PORTS_START( destroyr )
PORT_DIPSETTING( 0xc0, "3500 points" )
PORT_DIPSETTING( 0x00, "never" )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) /* actually a lever */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 )
@@ -204,7 +204,7 @@ static INPUT_PORTS_START( destroyr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) )
@@ -223,7 +223,7 @@ static INPUT_PORTS_START( destroyr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("PADDLE") /* IN3 */
+ PORT_START("PADDLE") /* IN3 */
PORT_BIT( 0xff, 0x00, IPT_PADDLE_V ) PORT_MINMAX(0,160) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_REVERSE
INPUT_PORTS_END
diff --git a/src/mame/drivers/dgpix.c b/src/mame/drivers/dgpix.c
index 6ed22c5a38d..e589cd043d0 100644
--- a/src/mame/drivers/dgpix.c
+++ b/src/mame/drivers/dgpix.c
@@ -181,7 +181,7 @@ static READ32_HANDLER( vblank_r )
{
/* burn a bunch of cycles because this is polled frequently during busy loops */
activecpu_adjust_icount(-100);
- return input_port_read(machine, "IN0");
+ return input_port_read(machine, "VBLANK");
}
static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 32 )
@@ -195,7 +195,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 32 )
AM_RANGE(0x0200, 0x0203) AM_READNOP // used to sync with the protecion PIC? tested bits 0 and 1
AM_RANGE(0x0400, 0x0403) AM_READWRITE(vblank_r, vbuffer_w)
- AM_RANGE(0x0a10, 0x0a13) AM_READ(input_port_1_dword_r)
+ AM_RANGE(0x0a10, 0x0a13) AM_READ_PORT("INPUTS")
AM_RANGE(0x0200, 0x0203) AM_WRITE(coin_w)
AM_RANGE(0x0c00, 0x0c03) AM_WRITENOP // writes only: 1, 0, 1 at startup
AM_RANGE(0x0c80, 0x0c83) AM_WRITENOP // sound commands / latches
@@ -235,11 +235,11 @@ static NVRAM_HANDLER( flashroms )
}
static INPUT_PORTS_START( dgpix )
- PORT_START_TAG("IN0")
+ PORT_START("VBLANK")
PORT_BIT( 0x00000003, IP_ACTIVE_LOW, IPT_VBLANK ) //value 2 is used by fmaniac3
PORT_BIT( 0xfffffffc, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("INPUTS")
PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c
index fcd81c2252a..29985bde4b2 100644
--- a/src/mame/drivers/dietgo.c
+++ b/src/mame/drivers/dietgo.c
@@ -67,13 +67,13 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( dietgo )
- PORT_START_TAG("IN0") /* Verified as 4 bit input port only */
+ PORT_START("IN0") /* Verified as 4 bit input port only */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("IN1") /* 16bit */
+ PORT_START("IN1") /* 16bit */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -91,7 +91,7 @@ static INPUT_PORTS_START( dietgo )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("DSW") /* Dip switch bank 1 */
+ PORT_START("DSW") /* Dip switch bank 1 */
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) )
diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c
index 20c4de29bb7..863c230715e 100644
--- a/src/mame/drivers/discoboy.c
+++ b/src/mame/drivers/discoboy.c
@@ -309,11 +309,11 @@ static READ8_HANDLER( discoboy_port_06_r )
static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READ(input_port_0_r) // DSWA
- AM_RANGE(0x01, 0x01) AM_READ(input_port_1_r) // Coins
- AM_RANGE(0x02, 0x02) AM_READ(input_port_2_r) // P1
- AM_RANGE(0x03, 0x03) AM_READ(input_port_3_r) // P2
- AM_RANGE(0x04, 0x04) AM_READ(input_port_4_r) // DSWB
+ AM_RANGE(0x00, 0x00) AM_READ_PORT("DSWA")
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0x02, 0x02) AM_READ_PORT("P1")
+ AM_RANGE(0x03, 0x03) AM_READ_PORT("P2")
+ AM_RANGE(0x04, 0x04) AM_READ_PORT("DSWB")
AM_RANGE(0x06, 0x06) AM_READ(discoboy_port_06_r) // ???
ADDRESS_MAP_END
@@ -368,30 +368,30 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( discoboy )
- PORT_START /* DSWA */
- PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SWA:6,7,8")
- PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
- PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
- PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
- PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) )
- PORT_DIPSETTING( 0x02, DEF_STR( 2C_3C ) )
- PORT_DIPSETTING( 0x06, DEF_STR( 1C_2C ) )
- PORT_DIPSETTING( 0x05, DEF_STR( 1C_3C ) )
- PORT_DIPSETTING( 0x04, DEF_STR( 1C_4C ) )
- PORT_DIPNAME( 0x08, 0x08, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SWA:5")
- PORT_DIPSETTING( 0x08, "Every 150000" )
- PORT_DIPSETTING( 0x00, "Every 300000" )
- PORT_DIPNAME( 0x10, 0x10, DEF_STR( Lives ) ) PORT_DIPLOCATION("SWA:4")
- PORT_DIPSETTING( 0x10, "3" )
- PORT_DIPSETTING( 0x00, "4" )
- PORT_DIPNAME( 0x60, 0x60, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SWA:2,3")
- PORT_DIPSETTING( 0x00, DEF_STR( Easy ) )
- PORT_DIPSETTING( 0x60, DEF_STR( Normal ) )
- PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
- PORT_DIPSETTING( 0x20, DEF_STR( Hardest ) )
+ PORT_START("DSWA")
+ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SWA:6,7,8")
+ PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
+ PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
+ PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
+ PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) )
+ PORT_DIPSETTING( 0x02, DEF_STR( 2C_3C ) )
+ PORT_DIPSETTING( 0x06, DEF_STR( 1C_2C ) )
+ PORT_DIPSETTING( 0x05, DEF_STR( 1C_3C ) )
+ PORT_DIPSETTING( 0x04, DEF_STR( 1C_4C ) )
+ PORT_DIPNAME( 0x08, 0x08, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SWA:5")
+ PORT_DIPSETTING( 0x08, "Every 150000" )
+ PORT_DIPSETTING( 0x00, "Every 300000" )
+ PORT_DIPNAME( 0x10, 0x10, DEF_STR( Lives ) ) PORT_DIPLOCATION("SWA:4")
+ PORT_DIPSETTING( 0x10, "3" )
+ PORT_DIPSETTING( 0x00, "4" )
+ PORT_DIPNAME( 0x60, 0x60, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SWA:2,3")
+ PORT_DIPSETTING( 0x00, DEF_STR( Easy ) )
+ PORT_DIPSETTING( 0x60, DEF_STR( Normal ) )
+ PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
+ PORT_DIPSETTING( 0x20, DEF_STR( Hardest ) )
PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_LOW, "SWA:1" )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -401,7 +401,7 @@ static INPUT_PORTS_START( discoboy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START /* IN1 */
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -411,7 +411,7 @@ static INPUT_PORTS_START( discoboy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
- PORT_START /* IN2 */
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
@@ -421,7 +421,7 @@ static INPUT_PORTS_START( discoboy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
- PORT_START /* DSWB */
+ PORT_START("DSWB")
PORT_DIPUNUSED_DIPLOC( 0x01, IP_ACTIVE_LOW, "SWB:8" )
PORT_DIPUNUSED_DIPLOC( 0x02, IP_ACTIVE_LOW, "SWB:7" )
PORT_DIPUNUSED_DIPLOC( 0x04, IP_ACTIVE_LOW, "SWB:6" )
@@ -429,9 +429,9 @@ static INPUT_PORTS_START( discoboy )
PORT_DIPUNUSED_DIPLOC( 0x10, IP_ACTIVE_LOW, "SWB:4" )
PORT_DIPUNUSED_DIPLOC( 0x20, IP_ACTIVE_LOW, "SWB:3" )
PORT_DIPUNUSED_DIPLOC( 0x40, IP_ACTIVE_LOW, "SWB:2" )
- PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SWB:1")
- PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SWB:1")
+ PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
INPUT_PORTS_END
diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c
index 88b78bf9480..deb521cc0e5 100644
--- a/src/mame/drivers/diverboy.c
+++ b/src/mame/drivers/diverboy.c
@@ -79,9 +79,9 @@ static ADDRESS_MAP_START( diverboy_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM)
AM_RANGE(0x040000, 0x04ffff) AM_READ(SMH_RAM)
AM_RANGE(0x080000, 0x083fff) AM_READ(SMH_RAM)
- AM_RANGE(0x180000, 0x180001) AM_READ(input_port_0_word_r)
- AM_RANGE(0x180002, 0x180003) AM_READ(input_port_1_word_r)
- AM_RANGE(0x180008, 0x180009) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x180000, 0x180001) AM_READ_PORT("P1_P2")
+ AM_RANGE(0x180002, 0x180003) AM_READ_PORT("DSW")
+ AM_RANGE(0x180008, 0x180009) AM_READ_PORT("COINS")
// AM_RANGE(0x18000a, 0x18000b) AM_READ(SMH_NOP)
ADDRESS_MAP_END
@@ -115,7 +115,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( diverboy )
- PORT_START // 0x180000.w
+ PORT_START("P1_P2") // 0x180000.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) // unused ?
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) // unused ?
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -133,7 +133,7 @@ static INPUT_PORTS_START( diverboy )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START // 0x180002.w
+ PORT_START("DSW") // 0x180002.w
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x06, DEF_STR( 3C_1C ) )
@@ -158,10 +158,10 @@ static INPUT_PORTS_START( diverboy )
PORT_DIPSETTING( 0x80, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
- PORT_START // 0x180008.w
+ PORT_START("COINS") // 0x180008.w
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) // read notes
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) // read notes
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // must be 00 - check code at 0x001680
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/djboy.c b/src/mame/drivers/djboy.c
index b0afe32e793..69bee8ec814 100644
--- a/src/mame/drivers/djboy.c
+++ b/src/mame/drivers/djboy.c
@@ -971,7 +971,7 @@ ROM_START( djboyj )
ROM_END
static INPUT_PORTS_START( djboy )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -981,7 +981,7 @@ static INPUT_PORTS_START( djboy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -991,7 +991,7 @@ static INPUT_PORTS_START( djboy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) /* jump */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1001,7 +1001,7 @@ static INPUT_PORTS_START( djboy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1025,7 +1025,7 @@ static INPUT_PORTS_START( djboy )
PORT_DIPSETTING( 0xc0, DEF_STR( 2C_3C ) )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x00, DEF_STR( Normal ) )
diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c
index 8a8249a6f2f..8525c672dc2 100644
--- a/src/mame/drivers/djmain.c
+++ b/src/mame/drivers/djmain.c
@@ -501,42 +501,7 @@ ADDRESS_MAP_END
*
*************************************/
-#define BEATMANIA_INPUT \
- PORT_START_TAG("IN0") /* IN 0 */ \
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) \
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) \
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) \
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) \
- \
- PORT_START_TAG("IN1") /* IN 1 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) \
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2) \
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START1 ) \
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) \
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_START3 ) PORT_NAME("Effect") /* EFFECT */ \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) \
- \
- PORT_START_TAG("IN2") /* IN 2 */ \
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F2) /* TEST SW */ \
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Service") /* SERVICE */ \
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Reset") /* RESET SW */ \
- PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define BEATMANIA_TURNTABLE \
- PORT_START_TAG("TT1") /* IN 6: turn table 1P */ \
- PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15) PORT_PLAYER(1) \
- \
- PORT_START_TAG("TT2") /* IN 7: turn table 2P */ \
- PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15) PORT_PLAYER(2)
-
#define BEATMANIA_DSW1(base,mask) \
- PORT_START_TAG("DSW1") /* IN 3 */ \
PORT_DIPNAME( 0xff, (0xff & mask) | base, DEF_STR( Coinage ) ) \
PORT_DIPSETTING( (0xe0 & mask) | base, "1P 8C / 2P 16C / Continue 8C" ) \
PORT_DIPSETTING( (0xe1 & mask) | base, "1P 8C / 2P 16C / Continue 7C" ) \
@@ -572,561 +537,429 @@ ADDRESS_MAP_END
PORT_DIPSETTING( (0xf9 & mask) | base, "1P 1C / 2P 1C / Continue 1C" ) \
PORT_DIPSETTING( (0x00 & mask) | base, DEF_STR( Free_Play ) )
-#define BM1STMIX_DSW1 \
- PORT_START_TAG("DSW1") /* IN 3 */ \
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_DIPNAME( 0x1f, 0x1f, DEF_STR( Coinage ) ) \
- PORT_DIPSETTING( 0x1e, "1P 3C / 2P 6C / Continue 3C" ) \
- PORT_DIPSETTING( 0x01, "1P 3C / 2P 6C / Continue 2C" ) \
- PORT_DIPSETTING( 0x11, "1P 3C / 2P 6C / Continue 1C" ) \
- PORT_DIPSETTING( 0x15, "1P 3C / 2P 3C / Continue 3C" ) \
- PORT_DIPSETTING( 0x0d, "1P 3C / 2P 3C / Continue 2C" ) \
- PORT_DIPSETTING( 0x1d, "1P 3C / 2P 3C / Continue 1C" ) \
- PORT_DIPSETTING( 0x09, "1P 3C / 2P 4C / Continue 3C" ) \
- PORT_DIPSETTING( 0x19, "1P 3C / 2P 4C / Continue 2C" ) \
- PORT_DIPSETTING( 0x05, "1P 3C / 2P 4C / Continue 1C" ) \
- PORT_DIPSETTING( 0x03, "1P 2C / 2P 4C / Continue 2C" ) \
- PORT_DIPSETTING( 0x1f, "1P 2C / 2P 4C / Continue 1C" ) \
- PORT_DIPSETTING( 0x0b, "1P 2C / 2P 3C / Continue 2C" ) \
- PORT_DIPSETTING( 0x1b, "1P 2C / 2P 3C / Continue 1C" ) \
- PORT_DIPSETTING( 0x07, "1P 2C / 2P 2C / Continue 2C" ) \
- PORT_DIPSETTING( 0x17, "1P 2C / 2P 2C / Continue 1C" ) \
- PORT_DIPSETTING( 0x0f, "1P 1C / 2P 2C / Continue 1C" ) \
- PORT_DIPSETTING( 0x13, "1P 1C / 2P 1C / Continue 1C" ) \
- PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
-
-#define BEATMANIA_DSW2 \
- PORT_START_TAG("DSW2") /* IN 4 */ \
- PORT_DIPNAME( 0x80, 0x80, "Score Display" ) \
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) \
- PORT_DIPSETTING( 0x80, DEF_STR( On ) ) \
- PORT_DIPNAME( 0x60, 0x60, DEF_STR( Demo_Sounds ) ) \
- PORT_DIPSETTING( 0x60, "Loud" ) \
- PORT_DIPSETTING( 0x20, DEF_STR( Medium ) ) \
- PORT_DIPSETTING( 0x40, DEF_STR( Low ) ) \
- PORT_DIPSETTING( 0x00, "Silent" ) \
- PORT_DIPNAME( 0x10, 0x10, "Level Display" ) \
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) \
- PORT_DIPSETTING( 0x10, DEF_STR( On ) ) \
- PORT_DIPNAME( 0x0c, 0x0c, "Normal Difficulty" ) \
- PORT_DIPSETTING( 0x08, "Level 0" ) \
- PORT_DIPSETTING( 0x0c, "Level 1" ) \
- PORT_DIPSETTING( 0x04, "Level 2" ) \
- PORT_DIPSETTING( 0x00, "Level 3" ) \
- PORT_DIPNAME( 0x03, 0x03, "Expert Difficulty" ) \
- PORT_DIPSETTING( 0x02, "Level 0" ) \
- PORT_DIPSETTING( 0x03, "Level 1" ) \
- PORT_DIPSETTING( 0x01, "Level 2" ) \
- PORT_DIPSETTING( 0x00, "Level 3" )
-
-#define BEATMANIA_DSW2_OLD_LEVEL \
- PORT_START_TAG("DSW2") /* IN 4 */ \
- PORT_DIPNAME( 0x80, 0x80, "Score Display" ) \
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) \
- PORT_DIPSETTING( 0x80, DEF_STR( On ) ) \
- PORT_DIPNAME( 0x60, 0x60, DEF_STR( Demo_Sounds ) ) \
- PORT_DIPSETTING( 0x60, "Loud" ) \
- PORT_DIPSETTING( 0x20, DEF_STR( Medium ) ) \
- PORT_DIPSETTING( 0x40, DEF_STR( Low ) ) \
- PORT_DIPSETTING( 0x00, "Silent" ) \
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* DSW 2-4 */ \
- PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Difficulty ) ) \
- PORT_DIPSETTING( 0x0a, "Level 0" ) \
- PORT_DIPSETTING( 0x0e, "Level 1" ) \
- PORT_DIPSETTING( 0x0d, "Level 2" ) \
- PORT_DIPSETTING( 0x0c, "Level 3" ) \
- PORT_DIPSETTING( 0x0b, "Level 4" ) \
- PORT_DIPSETTING( 0x0f, "Level 5" ) \
- PORT_DIPSETTING( 0x09, "Level 6" ) \
- PORT_DIPSETTING( 0x08, "Level 7" ) \
- PORT_DIPSETTING( 0x07, "Level 8" ) \
- PORT_DIPSETTING( 0x06, "Level 9" ) \
- PORT_DIPSETTING( 0x05, "Level 10" ) \
- PORT_DIPSETTING( 0x04, "Level 11" ) \
- PORT_DIPSETTING( 0x03, "Level 12" ) \
- PORT_DIPSETTING( 0x02, "Level 13" ) \
- PORT_DIPSETTING( 0x01, "Level 14" ) \
- PORT_DIPSETTING( 0x00, "Level 15" )
-#define BM1STMIX_DSW2 \
- PORT_START_TAG("DSW2") /* IN 4 */ \
- PORT_DIPNAME( 0x80, 0x80, "Enable Expert Mode" ) \
- PORT_DIPSETTING( 0x00, DEF_STR( No ) ) \
- PORT_DIPSETTING( 0x80, DEF_STR( Yes ) ) \
- PORT_DIPNAME( 0x60, 0x60, DEF_STR( Demo_Sounds ) ) \
- PORT_DIPSETTING( 0x60, "Loud" ) \
- PORT_DIPSETTING( 0x20, DEF_STR( Medium ) ) \
- PORT_DIPSETTING( 0x40, DEF_STR( Low ) ) \
- PORT_DIPSETTING( 0x00, "Silent" ) \
- PORT_BIT( 0x1f, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
-
-#define BMCOMPMX_DSW2 \
- PORT_START_TAG("DSW2") /* IN 4 */ \
- PORT_DIPNAME( 0x80, 0x80, "Score Display" ) \
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) \
- PORT_DIPSETTING( 0x80, DEF_STR( On ) ) \
- PORT_DIPNAME( 0x60, 0x60, DEF_STR( Demo_Sounds ) ) \
- PORT_DIPSETTING( 0x60, "Loud" ) \
- PORT_DIPSETTING( 0x20, DEF_STR( Medium ) ) \
- PORT_DIPSETTING( 0x40, DEF_STR( Low ) ) \
- PORT_DIPSETTING( 0x00, "Silent" ) \
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* DSW 2-4 */ \
- PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Difficulty ) ) \
- PORT_DIPSETTING( 0x0a, "Level 0" ) \
- PORT_DIPSETTING( 0x0e, "Level 1" ) \
- PORT_DIPSETTING( 0x0d, "Level 2" ) \
- PORT_DIPSETTING( 0x0c, "Level 3" ) \
- PORT_DIPSETTING( 0x0b, "Level 4" ) \
- PORT_DIPSETTING( 0x0f, "Level 5" ) \
- PORT_DIPSETTING( 0x09, "Level 6" ) \
- PORT_DIPSETTING( 0x08, "Level 7" ) \
- PORT_DIPSETTING( 0x07, "Level 8" ) \
- PORT_DIPSETTING( 0x06, "Level 9" ) \
- PORT_DIPSETTING( 0x05, "Level 10" ) \
- PORT_DIPSETTING( 0x04, "Level 11" ) \
- PORT_DIPSETTING( 0x03, "Level 12" ) \
- PORT_DIPSETTING( 0x02, "Level 13" ) \
- PORT_DIPSETTING( 0x01, "Level 14" ) \
- PORT_DIPSETTING( 0x00, "Level 15" )
-
-#define BEATMANIA_DSW3 \
- PORT_START_TAG("DSW3") /* IN 5 */ \
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_DIPNAME( 0x20, 0x20, "Event Mode" ) \
- PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) \
- PORT_DIPSETTING( 0x00, DEF_STR( On ) ) \
- PORT_DIPNAME( 0x1c, 0x1c, "Normal / Event Mode Stages" ) \
- PORT_DIPSETTING( 0x0c, "4 / 1" ) \
- PORT_DIPSETTING( 0x14, "4 / 2" ) \
- PORT_DIPSETTING( 0x10, "3 / 3" ) \
- PORT_DIPSETTING( 0x1c, "4 / 4" ) \
- PORT_DIPSETTING( 0x08, "5 / 5" ) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* DSW 3-5 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* DSW 3-6 */
+static INPUT_PORTS_START( beatmania )
+ PORT_START("IN0")
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
+
+ PORT_START("IN1")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2)
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_START3 ) PORT_NAME("Effect") /* EFFECT */
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
+
+ PORT_START("IN2")
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F2) /* TEST SW */
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Service") /* SERVICE */
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Reset") /* RESET SW */
+ PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN )
-#define BM1STMIX_DSW3 \
- PORT_START_TAG("DSW3") /* IN 5 */ \
- PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_START("DSW1")
+ BEATMANIA_DSW1(0x00, 0xff)
+
+ PORT_START("DSW2")
+ PORT_DIPNAME( 0x80, 0x80, "Score Display" )
+ PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x80, DEF_STR( On ) )
+ PORT_DIPNAME( 0x60, 0x60, DEF_STR( Demo_Sounds ) )
+ PORT_DIPSETTING( 0x60, "Loud" )
+ PORT_DIPSETTING( 0x20, DEF_STR( Medium ) )
+ PORT_DIPSETTING( 0x40, DEF_STR( Low ) )
+ PORT_DIPSETTING( 0x00, "Silent" )
+ PORT_DIPNAME( 0x10, 0x10, "Level Display" )
+ PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x10, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0c, 0x0c, "Normal Difficulty" )
+ PORT_DIPSETTING( 0x08, "Level 0" )
+ PORT_DIPSETTING( 0x0c, "Level 1" )
+ PORT_DIPSETTING( 0x04, "Level 2" )
+ PORT_DIPSETTING( 0x00, "Level 3" )
+ PORT_DIPNAME( 0x03, 0x03, "Expert Difficulty" )
+ PORT_DIPSETTING( 0x02, "Level 0" )
+ PORT_DIPSETTING( 0x03, "Level 1" )
+ PORT_DIPSETTING( 0x01, "Level 2" )
+ PORT_DIPSETTING( 0x00, "Level 3" )
-#define BM2NDMIX_DSW3 \
- PORT_START_TAG("DSW3") /* IN 5 */ \
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_DIPNAME( 0x39, 0x39, "Event Mode / Free Hidden Songs" ) \
- PORT_DIPSETTING( 0x39, "Off / Off" ) \
- PORT_DIPSETTING( 0x20, "Off / On" ) \
- PORT_DIPSETTING( 0x19, "1 Stages / On" ) \
- PORT_DIPSETTING( 0x09, "2 Stages / On" ) \
- PORT_DIPSETTING( 0x11, "3 Stages / On" ) \
- PORT_DIPSETTING( 0x01, "4 Stages / On" ) \
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* DSW 3-4 */ \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* DSW 3-5 */ \
-
-#define BMCOMPMX_DSW3 \
- PORT_START_TAG("DSW3") /* IN 5 */ \
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_DIPNAME( 0x20, 0x20, "Event Mode" ) \
- PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) \
- PORT_DIPSETTING( 0x00, DEF_STR( On ) ) \
- PORT_DIPNAME( 0x1c, 0x1c, "Normal / Event Mode Stages" ) \
- PORT_DIPSETTING( 0x0c, "4 / 1" ) \
- PORT_DIPSETTING( 0x14, "4 / 2" ) \
- PORT_DIPSETTING( 0x10, "3 / 3" ) \
- PORT_DIPSETTING( 0x1c, "4 / 4" ) \
- PORT_DIPSETTING( 0x08, "5 / 5" ) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* DSW 3-5 */ \
- PORT_DIPNAME( 0x01, 0x01, "Secret Expert Course" ) /* DSW 3-6 */ \
- PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) \
+ PORT_START("DSW3")
+ PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_DIPNAME( 0x20, 0x20, "Event Mode" )
+ PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-
-#define BM4THMIX_DSW3 \
- PORT_START_TAG("DSW3") /* IN 5 */ \
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_DIPNAME( 0x20, 0x20, "Event Mode" ) \
- PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) \
- PORT_DIPSETTING( 0x00, DEF_STR( On ) ) \
- PORT_DIPNAME( 0x1c, 0x1c, "Normal / Event Mode Stages" ) \
- PORT_DIPSETTING( 0x0c, "4 / 1" ) \
- PORT_DIPSETTING( 0x14, "4 / 2" ) \
- PORT_DIPSETTING( 0x10, "3 / 3" ) \
- PORT_DIPSETTING( 0x1c, "4 / 4" ) \
- PORT_DIPSETTING( 0x08, "5 / 5" ) \
- PORT_DIPNAME( 0x02, 0x02, "Secret Expert Course" ) /* DSW 3-5 */ \
- PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) \
- PORT_DIPSETTING( 0x00, DEF_STR( On ) ) \
+ PORT_DIPNAME( 0x1c, 0x1c, "Normal / Event Mode Stages" )
+ PORT_DIPSETTING( 0x0c, "4 / 1" )
+ PORT_DIPSETTING( 0x14, "4 / 2" )
+ PORT_DIPSETTING( 0x10, "3 / 3" )
+ PORT_DIPSETTING( 0x1c, "4 / 4" )
+ PORT_DIPSETTING( 0x08, "5 / 5" )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* DSW 3-5 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* DSW 3-6 */
-#define HMCOMPM2_DSW3 \
- PORT_START_TAG("DSW3") /* IN 5 */ \
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_DIPNAME( 0x20, 0x20, "Event Mode" ) \
- PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) \
- PORT_DIPSETTING( 0x00, DEF_STR( On ) ) \
- PORT_DIPNAME( 0x1c, 0x1c, "Normal / Event Mode Stages" ) \
- PORT_DIPSETTING( 0x0c, "4 / 1" ) \
- PORT_DIPSETTING( 0x14, "4 / 2" ) \
- PORT_DIPSETTING( 0x10, "3 / 3" ) \
- PORT_DIPSETTING( 0x1c, "4 / 4" ) \
- PORT_DIPSETTING( 0x08, "5 / 5" ) \
- PORT_DIPNAME( 0x02, 0x02, "Game Over Mode" ) \
- PORT_DIPSETTING( 0x02, "On Stage Middle" ) \
- PORT_DIPSETTING( 0x00, "On Stage Last" ) \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* DSW 3-6 */
+ PORT_START("TT1") /* turn table 1P */
+ PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15) PORT_PLAYER(1)
-#define BMDCT_DSW3 \
- PORT_START_TAG("DSW3") /* IN 5 */ \
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_DIPNAME( 0x20, 0x20, "Event Mode" ) \
- PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) \
- PORT_DIPSETTING( 0x00, DEF_STR( On ) ) \
- PORT_DIPNAME( 0x1c, 0x1c, "Normal / Event Mode Stages" ) \
- PORT_DIPSETTING( 0x0c, "3 / 1" ) \
- PORT_DIPSETTING( 0x14, "3 / 2" ) \
- PORT_DIPSETTING( 0x10, "4 / 3" ) \
- PORT_DIPSETTING( 0x1c, "3 / 4" ) \
- PORT_DIPSETTING( 0x08, "3 / 5" ) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* DSW 3-5 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* DSW 3-6 */
-
-static INPUT_PORTS_START( beatmania )
- BEATMANIA_INPUT /* IN 0-2 */
- BEATMANIA_DSW1(0x00, 0xff) /* IN 3 */
- BEATMANIA_DSW2 /* IN 4 */
- BEATMANIA_DSW3 /* IN 5 */
- BEATMANIA_TURNTABLE /* IN 6-7 */
+ PORT_START("TT2") /* turn table 2P */
+ PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( bm1stmix )
- BEATMANIA_INPUT /* IN 0-2 */
- BM1STMIX_DSW1 /* IN 3 */
- BM1STMIX_DSW2 /* IN 4 */
- BM1STMIX_DSW3 /* IN 5 */
- BEATMANIA_TURNTABLE /* IN 6-7 */
+ PORT_INCLUDE( beatmania )
+
+ PORT_MODIFY("DSW1")
+ PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_DIPNAME( 0x1f, 0x1f, DEF_STR( Coinage ) )
+ PORT_DIPSETTING( 0x1e, "1P 3C / 2P 6C / Continue 3C" )
+ PORT_DIPSETTING( 0x01, "1P 3C / 2P 6C / Continue 2C" )
+ PORT_DIPSETTING( 0x11, "1P 3C / 2P 6C / Continue 1C" )
+ PORT_DIPSETTING( 0x15, "1P 3C / 2P 3C / Continue 3C" )
+ PORT_DIPSETTING( 0x0d, "1P 3C / 2P 3C / Continue 2C" )
+ PORT_DIPSETTING( 0x1d, "1P 3C / 2P 3C / Continue 1C" )
+ PORT_DIPSETTING( 0x09, "1P 3C / 2P 4C / Continue 3C" )
+ PORT_DIPSETTING( 0x19, "1P 3C / 2P 4C / Continue 2C" )
+ PORT_DIPSETTING( 0x05, "1P 3C / 2P 4C / Continue 1C" )
+ PORT_DIPSETTING( 0x03, "1P 2C / 2P 4C / Continue 2C" )
+ PORT_DIPSETTING( 0x1f, "1P 2C / 2P 4C / Continue 1C" )
+ PORT_DIPSETTING( 0x0b, "1P 2C / 2P 3C / Continue 2C" )
+ PORT_DIPSETTING( 0x1b, "1P 2C / 2P 3C / Continue 1C" )
+ PORT_DIPSETTING( 0x07, "1P 2C / 2P 2C / Continue 2C" )
+ PORT_DIPSETTING( 0x17, "1P 2C / 2P 2C / Continue 1C" )
+ PORT_DIPSETTING( 0x0f, "1P 1C / 2P 2C / Continue 1C" )
+ PORT_DIPSETTING( 0x13, "1P 1C / 2P 1C / Continue 1C" )
+ PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
+
+ PORT_MODIFY("DSW2")
+ PORT_DIPNAME( 0x80, 0x80, "Enable Expert Mode" )
+ PORT_DIPSETTING( 0x00, DEF_STR( No ) )
+ PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
+ PORT_BIT( 0x1f, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_MODIFY("DSW3")
+ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( bm2ndmix )
- BEATMANIA_INPUT /* IN 0-2 */
- BEATMANIA_DSW1(0x00, 0xff) /* IN 3 */
- BEATMANIA_DSW2_OLD_LEVEL /* IN 4 */
- BM2NDMIX_DSW3 /* IN 5 */
- BEATMANIA_TURNTABLE /* IN 6-7 */
-INPUT_PORTS_END
+ PORT_INCLUDE( beatmania )
+
+ PORT_MODIFY("DSW2")
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* DSW 2-4 */
+ PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Difficulty ) )
+ PORT_DIPSETTING( 0x0a, "Level 0" )
+ PORT_DIPSETTING( 0x0e, "Level 1" )
+ PORT_DIPSETTING( 0x0d, "Level 2" )
+ PORT_DIPSETTING( 0x0c, "Level 3" )
+ PORT_DIPSETTING( 0x0b, "Level 4" )
+ PORT_DIPSETTING( 0x0f, "Level 5" )
+ PORT_DIPSETTING( 0x09, "Level 6" )
+ PORT_DIPSETTING( 0x08, "Level 7" )
+ PORT_DIPSETTING( 0x07, "Level 8" )
+ PORT_DIPSETTING( 0x06, "Level 9" )
+ PORT_DIPSETTING( 0x05, "Level 10" )
+ PORT_DIPSETTING( 0x04, "Level 11" )
+ PORT_DIPSETTING( 0x03, "Level 12" )
+ PORT_DIPSETTING( 0x02, "Level 13" )
+ PORT_DIPSETTING( 0x01, "Level 14" )
+ PORT_DIPSETTING( 0x00, "Level 15" )
-static INPUT_PORTS_START( bm3rdmix )
- BEATMANIA_INPUT /* IN 0-2 */
- BEATMANIA_DSW1(0x00, 0xff) /* IN 3 */
- BEATMANIA_DSW2 /* IN 4 */
- BEATMANIA_DSW3 /* IN 5 */
- BEATMANIA_TURNTABLE /* IN 6 */
+ PORT_MODIFY("DSW3")
+ PORT_DIPNAME( 0x39, 0x39, "Event Mode / Free Hidden Songs" )
+ PORT_DIPSETTING( 0x39, "Off / Off" )
+ PORT_DIPSETTING( 0x20, "Off / On" )
+ PORT_DIPSETTING( 0x19, "1 Stages / On" )
+ PORT_DIPSETTING( 0x09, "2 Stages / On" )
+ PORT_DIPSETTING( 0x11, "3 Stages / On" )
+ PORT_DIPSETTING( 0x01, "4 Stages / On" )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* DSW 3-4 */
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* DSW 3-5 */
INPUT_PORTS_END
static INPUT_PORTS_START( bmcompmx )
- BEATMANIA_INPUT /* IN 0-2 */
- BEATMANIA_DSW1(0x80, 0x3f) /* IN 3 */
- BMCOMPMX_DSW2 /* IN 4 */
- BMCOMPMX_DSW3 /* IN 5 */
- BEATMANIA_TURNTABLE /* IN 6-7 */
+ PORT_INCLUDE( beatmania )
+
+ PORT_MODIFY("DSW1")
+ BEATMANIA_DSW1(0x80, 0x3f)
+
+ PORT_MODIFY("DSW2")
+ PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* DSW 2-4 */
+ PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Difficulty ) )
+ PORT_DIPSETTING( 0x0a, "Level 0" )
+ PORT_DIPSETTING( 0x0e, "Level 1" )
+ PORT_DIPSETTING( 0x0d, "Level 2" )
+ PORT_DIPSETTING( 0x0c, "Level 3" )
+ PORT_DIPSETTING( 0x0b, "Level 4" )
+ PORT_DIPSETTING( 0x0f, "Level 5" )
+ PORT_DIPSETTING( 0x09, "Level 6" )
+ PORT_DIPSETTING( 0x08, "Level 7" )
+ PORT_DIPSETTING( 0x07, "Level 8" )
+ PORT_DIPSETTING( 0x06, "Level 9" )
+ PORT_DIPSETTING( 0x05, "Level 10" )
+ PORT_DIPSETTING( 0x04, "Level 11" )
+ PORT_DIPSETTING( 0x03, "Level 12" )
+ PORT_DIPSETTING( 0x02, "Level 13" )
+ PORT_DIPSETTING( 0x01, "Level 14" )
+ PORT_DIPSETTING( 0x00, "Level 15" )
+
+ PORT_MODIFY("DSW3")
+ PORT_DIPNAME( 0x01, 0x01, "Secret Expert Course" ) /* DSW 3-6 */
+ PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
INPUT_PORTS_END
static INPUT_PORTS_START( bm4thmix )
- BEATMANIA_INPUT /* IN 0-2 */
- BEATMANIA_DSW1(0x40, 0x3f) /* IN 3 */
- BEATMANIA_DSW2 /* IN 4 */
- BM4THMIX_DSW3 /* IN 5 */
- BEATMANIA_TURNTABLE /* IN 6-7 */
+ PORT_INCLUDE( beatmania )
+
+ PORT_MODIFY("DSW1")
+ BEATMANIA_DSW1(0x40, 0x3f)
+
+ PORT_MODIFY("DSW3")
+ PORT_DIPNAME( 0x02, 0x02, "Secret Expert Course" ) /* DSW 3-5 */
+ PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
INPUT_PORTS_END
static INPUT_PORTS_START( hmcompm2 )
- BEATMANIA_INPUT /* IN 0-2 */
- BEATMANIA_DSW1(0x00, 0xff) /* IN 3 */
- BEATMANIA_DSW2 /* IN 4 */
- HMCOMPM2_DSW3 /* IN 5 */
- BEATMANIA_TURNTABLE /* IN 6-7 */
+ PORT_INCLUDE( beatmania )
+
+ PORT_MODIFY("DSW3")
+ PORT_DIPNAME( 0x02, 0x02, "Game Over Mode" )
+ PORT_DIPSETTING( 0x02, "On Stage Middle" )
+ PORT_DIPSETTING( 0x00, "On Stage Last" )
INPUT_PORTS_END
static INPUT_PORTS_START( bmdct )
- BEATMANIA_INPUT /* IN 0-2 */
- BEATMANIA_DSW1(0x00, 0xff) /* IN 3 */
- BEATMANIA_DSW2 /* IN 4 */
- BMDCT_DSW3 /* IN 5 */
- BEATMANIA_TURNTABLE /* IN 6-7 */
+ PORT_INCLUDE( beatmania )
+
+ PORT_MODIFY("DSW3")
+ PORT_DIPNAME( 0x1c, 0x1c, "Normal / Event Mode Stages" )
+ PORT_DIPSETTING( 0x0c, "3 / 1" )
+ PORT_DIPSETTING( 0x14, "3 / 2" )
+ PORT_DIPSETTING( 0x10, "4 / 3" )
+ PORT_DIPSETTING( 0x1c, "3 / 4" )
+ PORT_DIPSETTING( 0x08, "3 / 5" )
INPUT_PORTS_END
-
-#define POPN_INPUT \
- PORT_START_TAG("IN0") /* IN 0 */ \
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) \
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) \
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) \
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_PLAYER(1) \
- \
- PORT_START_TAG("IN1") /* IN 1 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_PLAYER(1) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_PLAYER(1) \
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) \
- \
- PORT_START_TAG("IN2") /* IN 2 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F2) /* TEST SW */ \
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) /* SERVICE */ \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE2 ) /* RESET SW */ \
+#ifdef UNUSED_DEFINITION
+static INPUT_PORTS_START( popn1 )
+ PORT_START("IN0")
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1)
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_PLAYER(1)
+
+ PORT_START("IN1")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_PLAYER(1)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_PLAYER(1)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
+
+ PORT_START("IN2")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F2) /* TEST SW */
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) /* SERVICE */
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE2 ) /* RESET SW */
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN )
-#define POPN_DSW1 \
- PORT_START_TAG("DSW1") /* IN 3 */ \
- PORT_DIPNAME( 0xc0, 0xc0, "Jamming Gauge Blocks" ) \
- PORT_DIPSETTING( 0x80, "5" ) \
- PORT_DIPSETTING( 0xc0, "6" ) \
- PORT_DIPSETTING( 0x40, "7" ) \
- PORT_DIPSETTING( 0x00, "8" ) \
- PORT_DIPNAME( 0x20, 0x20, "Normal Mode Jamming" ) \
- PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) \
- PORT_DIPSETTING( 0x00, DEF_STR( On ) ) \
- PORT_DIPNAME( 0x1f, 0x1f, DEF_STR( Coinage ) ) \
- PORT_DIPSETTING( 0x01, "1P 8C / Continue 8C" ) \
- PORT_DIPSETTING( 0x02, "1P 8C / Continue 7C" ) \
- PORT_DIPSETTING( 0x03, "1P 8C / Continue 6C" ) \
- PORT_DIPSETTING( 0x04, "1P 8C / Continue 5C" ) \
- PORT_DIPSETTING( 0x05, "1P 8C / Continue 4C" ) \
- PORT_DIPSETTING( 0x06, "1P 8C / Continue 3C" ) \
- PORT_DIPSETTING( 0x07, "1P 7C / Continue 7C" ) \
- PORT_DIPSETTING( 0x08, "1P 7C / Continue 6C" ) \
- PORT_DIPSETTING( 0x09, "1P 7C / Continue 5C" ) \
- PORT_DIPSETTING( 0x0a, "1P 7C / Continue 4C" ) \
- PORT_DIPSETTING( 0x0b, "1P 7C / Continue 3C" ) \
- PORT_DIPSETTING( 0x0c, "1P 6C / Continue 6C" ) \
- PORT_DIPSETTING( 0x0d, "1P 6C / Continue 5C" ) \
- PORT_DIPSETTING( 0x0e, "1P 6C / Continue 4C" ) \
- PORT_DIPSETTING( 0x0f, "1P 6C / Continue 3C" ) \
- PORT_DIPSETTING( 0x10, "1P 6C / Continue 2C" ) \
- PORT_DIPSETTING( 0x11, "1P 5C / Continue 5C" ) \
- PORT_DIPSETTING( 0x12, "1P 5C / Continue 4C" ) \
- PORT_DIPSETTING( 0x13, "1P 5C / Continue 3C" ) \
- PORT_DIPSETTING( 0x14, "1P 5C / Continue 2C" ) \
- PORT_DIPSETTING( 0x15, "1P 5C / Continue 1C" ) \
- PORT_DIPSETTING( 0x16, "1P 4C / Continue 4C" ) \
- PORT_DIPSETTING( 0x17, "1P 4C / Continue 3C" ) \
- PORT_DIPSETTING( 0x18, "1P 4C / Continue 2C" ) \
- PORT_DIPSETTING( 0x19, "1P 4C / Continue 1C" ) \
- PORT_DIPSETTING( 0x1a, "1P 3C / Continue 3C" ) \
- PORT_DIPSETTING( 0x1b, "1P 3C / Continue 2C" ) \
- PORT_DIPSETTING( 0x1c, "1P 3C / Continue 1C" ) \
- PORT_DIPSETTING( 0x1d, "1P 2C / Continue 2C" ) \
- PORT_DIPSETTING( 0x1f, "1P 2C / Continue 1C" ) \
- PORT_DIPSETTING( 0x1e, "1P 1C / Continue 1C" ) \
+ PORT_START("DSW1")
+ PORT_DIPNAME( 0xc0, 0xc0, "Jamming Gauge Blocks" )
+ PORT_DIPSETTING( 0x80, "5" )
+ PORT_DIPSETTING( 0xc0, "6" )
+ PORT_DIPSETTING( 0x40, "7" )
+ PORT_DIPSETTING( 0x00, "8" )
+ PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coinage ) )
+ PORT_DIPSETTING( 0x01, "1P 5C / Continue 5C" )
+ PORT_DIPSETTING( 0x02, "1P 5C / Continue 4C" )
+ PORT_DIPSETTING( 0x03, "1P 5C / Continue 3C" )
+ PORT_DIPSETTING( 0x04, "1P 5C / Continue 2C" )
+ PORT_DIPSETTING( 0x05, "1P 5C / Continue 1C" )
+ PORT_DIPSETTING( 0x06, "1P 4C / Continue 4C" )
+ PORT_DIPSETTING( 0x07, "1P 4C / Continue 3C" )
+ PORT_DIPSETTING( 0x08, "1P 4C / Continue 2C" )
+ PORT_DIPSETTING( 0x09, "1P 4C / Continue 1C" )
+ PORT_DIPSETTING( 0x0a, "1P 3C / Continue 3C" )
+ PORT_DIPSETTING( 0x0b, "1P 3C / Continue 2C" )
+ PORT_DIPSETTING( 0x0c, "1P 3C / Continue 1C" )
+ PORT_DIPSETTING( 0x0d, "1P 2C / Continue 2C" )
+ PORT_DIPSETTING( 0x0f, "1P 2C / Continue 1C" )
+ PORT_DIPSETTING( 0x0e, "1P 1C / Continue 1C" )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
-#define POPN1_DSW1 \
- PORT_START_TAG("DSW1") /* IN 3 */ \
- PORT_DIPNAME( 0xc0, 0xc0, "Jamming Gauge Blocks" ) \
- PORT_DIPSETTING( 0x80, "5" ) \
- PORT_DIPSETTING( 0xc0, "6" ) \
- PORT_DIPSETTING( 0x40, "7" ) \
- PORT_DIPSETTING( 0x00, "8" ) \
- PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coinage ) ) \
- PORT_DIPSETTING( 0x01, "1P 5C / Continue 5C" ) \
- PORT_DIPSETTING( 0x02, "1P 5C / Continue 4C" ) \
- PORT_DIPSETTING( 0x03, "1P 5C / Continue 3C" ) \
- PORT_DIPSETTING( 0x04, "1P 5C / Continue 2C" ) \
- PORT_DIPSETTING( 0x05, "1P 5C / Continue 1C" ) \
- PORT_DIPSETTING( 0x06, "1P 4C / Continue 4C" ) \
- PORT_DIPSETTING( 0x07, "1P 4C / Continue 3C" ) \
- PORT_DIPSETTING( 0x08, "1P 4C / Continue 2C" ) \
- PORT_DIPSETTING( 0x09, "1P 4C / Continue 1C" ) \
- PORT_DIPSETTING( 0x0a, "1P 3C / Continue 3C" ) \
- PORT_DIPSETTING( 0x0b, "1P 3C / Continue 2C" ) \
- PORT_DIPSETTING( 0x0c, "1P 3C / Continue 1C" ) \
- PORT_DIPSETTING( 0x0d, "1P 2C / Continue 2C" ) \
- PORT_DIPSETTING( 0x0f, "1P 2C / Continue 1C" ) \
- PORT_DIPSETTING( 0x0e, "1P 1C / Continue 1C" ) \
- PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
-
-#define POPN_DSW2 \
- PORT_START_TAG("DSW2") /* IN 4 */ \
- PORT_DIPNAME( 0x80, 0x80, "Score Display" ) \
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) \
- PORT_DIPSETTING( 0x80, DEF_STR( On ) ) \
- PORT_DIPNAME( 0x60, 0x60, DEF_STR( Demo_Sounds ) ) \
- PORT_DIPSETTING( 0x60, "Loud" ) \
- PORT_DIPSETTING( 0x20, DEF_STR ( Medium ) ) \
- PORT_DIPSETTING( 0x40, DEF_STR ( Low ) ) \
- PORT_DIPSETTING( 0x00, "Silent" ) \
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_DIPNAME( 0x0c, 0x0c, "Guage Decrement Level" ) \
- PORT_DIPSETTING( 0x04, "0" ) \
- PORT_DIPSETTING( 0x0c, "1" ) \
- PORT_DIPSETTING( 0x08, "2" ) \
- PORT_DIPSETTING( 0x00, "3" ) \
- PORT_DIPNAME( 0x03, 0x03, "Guage Increment Level" ) \
- PORT_DIPSETTING( 0x01, "0" ) \
- PORT_DIPSETTING( 0x03, "1" ) \
- PORT_DIPSETTING( 0x02, "2" ) \
+ PORT_START("DSW2")
+ PORT_DIPNAME( 0x80, 0x80, "Score Display" )
+ PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x80, DEF_STR( On ) )
+ PORT_DIPNAME( 0x60, 0x60, DEF_STR( Demo_Sounds ) )
+ PORT_DIPSETTING( 0x60, "Loud" )
+ PORT_DIPSETTING( 0x20, DEF_STR ( Medium ) )
+ PORT_DIPSETTING( 0x40, DEF_STR ( Low ) )
+ PORT_DIPSETTING( 0x00, "Silent" )
+ PORT_DIPNAME( 0x10, 0x10, "Normal Mode Jamming" )
+ PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x10, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0c, 0x0c, "Guage Decrement Level" )
+ PORT_DIPSETTING( 0x04, "0" )
+ PORT_DIPSETTING( 0x0c, "1" )
+ PORT_DIPSETTING( 0x08, "2" )
PORT_DIPSETTING( 0x00, "3" )
-
-#define POPN1_DSW2 \
- PORT_START_TAG("DSW2") /* IN 4 */ \
- PORT_DIPNAME( 0x80, 0x80, "Score Display" ) \
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) \
- PORT_DIPSETTING( 0x80, DEF_STR( On ) ) \
- PORT_DIPNAME( 0x60, 0x60, DEF_STR( Demo_Sounds ) ) \
- PORT_DIPSETTING( 0x60, "Loud" ) \
- PORT_DIPSETTING( 0x20, DEF_STR ( Medium ) ) \
- PORT_DIPSETTING( 0x40, DEF_STR ( Low ) ) \
- PORT_DIPSETTING( 0x00, "Silent" ) \
- PORT_DIPNAME( 0x10, 0x10, "Normal Mode Jamming" ) \
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) \
- PORT_DIPSETTING( 0x10, DEF_STR( On ) ) \
- PORT_DIPNAME( 0x0c, 0x0c, "Guage Decrement Level" ) \
- PORT_DIPSETTING( 0x04, "0" ) \
- PORT_DIPSETTING( 0x0c, "1" ) \
- PORT_DIPSETTING( 0x08, "2" ) \
- PORT_DIPSETTING( 0x00, "3" ) \
- PORT_DIPNAME( 0x03, 0x03, "Guage Increment Level" ) \
- PORT_DIPSETTING( 0x01, "0" ) \
- PORT_DIPSETTING( 0x03, "1" ) \
- PORT_DIPSETTING( 0x02, "2" ) \
+ PORT_DIPNAME( 0x03, 0x03, "Guage Increment Level" )
+ PORT_DIPSETTING( 0x01, "0" )
+ PORT_DIPSETTING( 0x03, "1" )
+ PORT_DIPSETTING( 0x02, "2" )
PORT_DIPSETTING( 0x00, "3" )
-#define POPN_DSW3 \
- PORT_START_TAG("DSW3") /* IN 5 */ \
- PORT_BIT( 0xf7, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_DIPNAME( 0x08, 0x08, "All Song Mode" ) /* DSW 3-3 */ \
- PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) \
+ PORT_START("DSW3")
+ PORT_BIT( 0xec, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_DIPNAME( 0x10, 0x10, "All Song Mode" ) /* DSW 3-2 */
+ PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-
-#define POPN1_DSW3 \
- PORT_START_TAG("DSW3") /* IN 5 */ \
- PORT_BIT( 0xec, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_DIPNAME( 0x10, 0x10, "All Song Mode" ) /* DSW 3-2 */ \
- PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) \
- PORT_DIPSETTING( 0x00, DEF_STR( On ) ) \
- PORT_DIPNAME( 0x02, 0x02, "Enable \"RAVE\"" ) /* DSW 3-5 */ \
- PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) \
- PORT_DIPSETTING( 0x00, DEF_STR( On ) ) \
- PORT_DIPNAME( 0x01, 0x01, "Bonus Track" ) /* DSW 3-6 */ \
- PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) \
+ PORT_DIPNAME( 0x02, 0x02, "Enable"RAVE\"" ) /* DSW 3-5 */
+ PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x01, 0x01, "Bonus Track" ) /* DSW 3-6 */
+ PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-
-
-#ifdef UNUSED_DEFINITION
-static INPUT_PORTS_START( popnmusic )
- POPN_INPUT /* IN 0-2 */
- POPN_DSW1 /* IN 3 */
- POPN_DSW2 /* IN 4 */
- POPN_DSW3 /* IN 5 */
INPUT_PORTS_END
#endif
#ifdef UNUSED_DEFINITION
-static INPUT_PORTS_START( popn1 )
- POPN_INPUT /* IN 0-2 */
- POPN1_DSW1 /* IN 3 */
- POPN1_DSW2 /* IN 4 */
- POPN1_DSW3 /* IN 5 */
+static INPUT_PORTS_START( popnmusic )
+ PORT_INCLUDE( popn1 )
+
+ PORT_MODIFY("DSW1")
+ PORT_DIPNAME( 0x20, 0x20, "Normal Mode Jamming" )
+ PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x1f, 0x1f, DEF_STR( Coinage ) )
+ PORT_DIPSETTING( 0x01, "1P 8C / Continue 8C" )
+ PORT_DIPSETTING( 0x02, "1P 8C / Continue 7C" )
+ PORT_DIPSETTING( 0x03, "1P 8C / Continue 6C" )
+ PORT_DIPSETTING( 0x04, "1P 8C / Continue 5C" )
+ PORT_DIPSETTING( 0x05, "1P 8C / Continue 4C" )
+ PORT_DIPSETTING( 0x06, "1P 8C / Continue 3C" )
+ PORT_DIPSETTING( 0x07, "1P 7C / Continue 7C" )
+ PORT_DIPSETTING( 0x08, "1P 7C / Continue 6C" )
+ PORT_DIPSETTING( 0x09, "1P 7C / Continue 5C" )
+ PORT_DIPSETTING( 0x0a, "1P 7C / Continue 4C" )
+ PORT_DIPSETTING( 0x0b, "1P 7C / Continue 3C" )
+ PORT_DIPSETTING( 0x0c, "1P 6C / Continue 6C" )
+ PORT_DIPSETTING( 0x0d, "1P 6C / Continue 5C" )
+ PORT_DIPSETTING( 0x0e, "1P 6C / Continue 4C" )
+ PORT_DIPSETTING( 0x0f, "1P 6C / Continue 3C" )
+ PORT_DIPSETTING( 0x10, "1P 6C / Continue 2C" )
+ PORT_DIPSETTING( 0x11, "1P 5C / Continue 5C" )
+ PORT_DIPSETTING( 0x12, "1P 5C / Continue 4C" )
+ PORT_DIPSETTING( 0x13, "1P 5C / Continue 3C" )
+ PORT_DIPSETTING( 0x14, "1P 5C / Continue 2C" )
+ PORT_DIPSETTING( 0x15, "1P 5C / Continue 1C" )
+ PORT_DIPSETTING( 0x16, "1P 4C / Continue 4C" )
+ PORT_DIPSETTING( 0x17, "1P 4C / Continue 3C" )
+ PORT_DIPSETTING( 0x18, "1P 4C / Continue 2C" )
+ PORT_DIPSETTING( 0x19, "1P 4C / Continue 1C" )
+ PORT_DIPSETTING( 0x1a, "1P 3C / Continue 3C" )
+ PORT_DIPSETTING( 0x1b, "1P 3C / Continue 2C" )
+ PORT_DIPSETTING( 0x1c, "1P 3C / Continue 1C" )
+ PORT_DIPSETTING( 0x1d, "1P 2C / Continue 2C" )
+ PORT_DIPSETTING( 0x1f, "1P 2C / Continue 1C" )
+ PORT_DIPSETTING( 0x1e, "1P 1C / Continue 1C" )
+ PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
+
+ PORT_MODIFY("DSW2")
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_MODIFY("DSW3")
+ PORT_BIT( 0xf7, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_DIPNAME( 0x08, 0x08, "All Song Mode" ) /* DSW 3-3 */
+ PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
INPUT_PORTS_END
#endif
-#define POPNST_INPUT \
- PORT_START_TAG("IN0") /* IN 0 */ \
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) \
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) \
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) \
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_PLAYER(1) \
- \
- PORT_START_TAG("IN1") /* IN 1 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_PLAYER(1) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_PLAYER(1) \
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON10 ) PORT_PLAYER(1) \
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START1 ) /* LEFT SELECTION */ \
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) /* MIDDLE SELECTION */ \
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) /* RIGHT SELECTION */ \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) \
- \
- PORT_START_TAG("IN2") /* IN 2 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F2) /* TEST SW */ \
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) /* SERVICE */ \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define POPNST_DSW1 \
- PORT_START_TAG("DSW1") /* IN 3 */ \
- PORT_DIPNAME( 0xe0, 0xe0, "Coinage (6 Buttons)" ) \
- PORT_DIPSETTING( 0x20, "1P 4C / Continue 2C" ) \
- PORT_DIPSETTING( 0x40, "1P 3C / Continue 3C" ) \
- PORT_DIPSETTING( 0x60, "1P 3C / Continue 2C" ) \
- PORT_DIPSETTING( 0x80, "1P 3C / Continue 1C" ) \
- PORT_DIPSETTING( 0xa0, "1P 2C / Continue 2C" ) \
- PORT_DIPSETTING( 0xe0, "1P 2C / Continue 1C" ) \
- PORT_DIPSETTING( 0xc0, "1P 1C / Continue 1C" ) \
- PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) ) \
- PORT_DIPNAME( 0x1e, 0x1e, "Coinage (10 Buttons)" ) \
- PORT_DIPSETTING( 0x02, "1P 5C / Continue 5C" ) \
- PORT_DIPSETTING( 0x04, "1P 5C / Continue 4C" ) \
- PORT_DIPSETTING( 0x06, "1P 5C / Continue 3C" ) \
- PORT_DIPSETTING( 0x08, "1P 5C / Continue 2C" ) \
- PORT_DIPSETTING( 0x0c, "1P 5C / Continue 1C" ) \
- PORT_DIPSETTING( 0x0a, "1P 4C / Continue 4C" ) \
- PORT_DIPSETTING( 0x0e, "1P 4C / Continue 3C" ) \
- PORT_DIPSETTING( 0x10, "1P 4C / Continue 2C" ) \
- PORT_DIPSETTING( 0x12, "1P 4C / Continue 1C" ) \
- PORT_DIPSETTING( 0x14, "1P 3C / Continue 3C" ) \
- PORT_DIPSETTING( 0x1e, "1P 3C / Continue 2C" ) \
- PORT_DIPSETTING( 0x16, "1P 3C / Continue 1C" ) \
- PORT_DIPSETTING( 0x18, "1P 2C / Continue 2C" ) \
- PORT_DIPSETTING( 0x1a, "1P 2C / Continue 1C" ) \
- PORT_DIPSETTING( 0x1c, "1P 1C / Continue 1C" ) \
- PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) ) \
+#ifdef UNUSED_DEFINITION
+static INPUT_PORTS_START( popnstage )
+ PORT_INCLUDE( popn1 )
+
+ PORT_MODIFY("IN1")
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON10 ) PORT_PLAYER(1)
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START1 ) /* LEFT SELECTION */
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) /* MIDDLE SELECTION */
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) /* RIGHT SELECTION */
+
+ PORT_MODIFY("IN2")
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_MODIFY("DSW1")
+ PORT_DIPNAME( 0xe0, 0xe0, "Coinage (6 Buttons)" )
+ PORT_DIPSETTING( 0x20, "1P 4C / Continue 2C" )
+ PORT_DIPSETTING( 0x40, "1P 3C / Continue 3C" )
+ PORT_DIPSETTING( 0x60, "1P 3C / Continue 2C" )
+ PORT_DIPSETTING( 0x80, "1P 3C / Continue 1C" )
+ PORT_DIPSETTING( 0xa0, "1P 2C / Continue 2C" )
+ PORT_DIPSETTING( 0xe0, "1P 2C / Continue 1C" )
+ PORT_DIPSETTING( 0xc0, "1P 1C / Continue 1C" )
+ PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
+ PORT_DIPNAME( 0x1e, 0x1e, "Coinage (10 Buttons)" )
+ PORT_DIPSETTING( 0x02, "1P 5C / Continue 5C" )
+ PORT_DIPSETTING( 0x04, "1P 5C / Continue 4C" )
+ PORT_DIPSETTING( 0x06, "1P 5C / Continue 3C" )
+ PORT_DIPSETTING( 0x08, "1P 5C / Continue 2C" )
+ PORT_DIPSETTING( 0x0c, "1P 5C / Continue 1C" )
+ PORT_DIPSETTING( 0x0a, "1P 4C / Continue 4C" )
+ PORT_DIPSETTING( 0x0e, "1P 4C / Continue 3C" )
+ PORT_DIPSETTING( 0x10, "1P 4C / Continue 2C" )
+ PORT_DIPSETTING( 0x12, "1P 4C / Continue 1C" )
+ PORT_DIPSETTING( 0x14, "1P 3C / Continue 3C" )
+ PORT_DIPSETTING( 0x1e, "1P 3C / Continue 2C" )
+ PORT_DIPSETTING( 0x16, "1P 3C / Continue 1C" )
+ PORT_DIPSETTING( 0x18, "1P 2C / Continue 2C" )
+ PORT_DIPSETTING( 0x1a, "1P 2C / Continue 1C" )
+ PORT_DIPSETTING( 0x1c, "1P 1C / Continue 1C" )
+ PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
-#define POPNST_DSW2 \
- PORT_START_TAG("DSW2") /* IN 4 */ \
- PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Demo_Sounds ) ) \
- PORT_DIPSETTING( 0xc0, "Loud" ) \
- PORT_DIPSETTING( 0x80, DEF_STR ( Medium ) ) \
- PORT_DIPSETTING( 0x40, DEF_STR ( Low ) ) \
- PORT_DIPSETTING( 0x00, "Silent" ) \
- PORT_DIPNAME( 0x30, 0x30, "Guage Decrement Level" ) \
- PORT_DIPSETTING( 0x20, "0" ) \
- PORT_DIPSETTING( 0x30, "1" ) \
- PORT_DIPSETTING( 0x10, "2" ) \
- PORT_DIPSETTING( 0x00, "3" ) \
- PORT_DIPNAME( 0x0c, 0x0c, "Guage Increment Level" ) \
- PORT_DIPSETTING( 0x08, "0" ) \
- PORT_DIPSETTING( 0x0c, "1" ) \
- PORT_DIPSETTING( 0x04, "2" ) \
- PORT_DIPSETTING( 0x00, "3" ) \
- PORT_DIPNAME( 0x02, 0x02, "Score Display" ) \
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) \
- PORT_DIPSETTING( 0x02, DEF_STR( On ) ) \
+ PORT_MODIFY("DSW2")
+ PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Demo_Sounds ) )
+ PORT_DIPSETTING( 0xc0, "Loud" )
+ PORT_DIPSETTING( 0x80, DEF_STR ( Medium ) )
+ PORT_DIPSETTING( 0x40, DEF_STR ( Low ) )
+ PORT_DIPSETTING( 0x00, "Silent" )
+ PORT_DIPNAME( 0x30, 0x30, "Guage Decrement Level" )
+ PORT_DIPSETTING( 0x20, "0" )
+ PORT_DIPSETTING( 0x30, "1" )
+ PORT_DIPSETTING( 0x10, "2" )
+ PORT_DIPSETTING( 0x00, "3" )
+ PORT_DIPNAME( 0x0c, 0x0c, "Guage Increment Level" )
+ PORT_DIPSETTING( 0x08, "0" )
+ PORT_DIPSETTING( 0x0c, "1" )
+ PORT_DIPSETTING( 0x04, "2" )
+ PORT_DIPSETTING( 0x00, "3" )
+ PORT_DIPNAME( 0x02, 0x02, "Score Display" )
+ PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x02, DEF_STR( On ) )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
-#define POPNST_DSW3 \
- PORT_START_TAG("DSW3") /* IN 5 */ \
- PORT_BIT( 0xd5, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_DIPNAME( 0x2a, 0x2a, "Enable Secret Mode" ) \
- PORT_DIPSETTING( 0x2a, DEF_STR( Off ) ) \
+ PORT_MODIFY("DSW3")
+ PORT_BIT( 0xd5, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_DIPNAME( 0x2a, 0x2a, "Enable Secret Mode" )
+ PORT_DIPSETTING( 0x2a, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-
-#ifdef UNUSED_DEFINITION
-static INPUT_PORTS_START( popnstage )
- POPNST_INPUT /* IN 0-2 */
- POPNST_DSW1 /* IN 3 */
- POPNST_DSW2 /* IN 4 */
- POPNST_DSW3 /* IN 5 */
INPUT_PORTS_END
#endif
@@ -1946,7 +1779,7 @@ static DRIVER_INIT( bmfinal )
GAME( 1997, bm1stmix, 0, djmain, bm1stmix, beatmania, ROT0, "Konami", "beatmania (ver JA-B)", 0 )
GAME( 1998, bm2ndmix, 0, djmain, bm2ndmix, beatmania, ROT0, "Konami", "beatmania 2nd MIX (ver JA-B)", 0 )
GAME( 1998, bm2ndmxa, bm2ndmix, djmain, bm2ndmix, beatmania, ROT0, "Konami", "beatmania 2nd MIX (ver JA-A)", 0 )
-GAME( 1998, bm3rdmix, 0, djmain, bm3rdmix, beatmania, ROT0, "Konami", "beatmania 3rd MIX (ver JA-A)", 0 )
+GAME( 1998, bm3rdmix, 0, djmain, beatmania, beatmania, ROT0, "Konami", "beatmania 3rd MIX (ver JA-A)", 0 )
GAME( 1999, bmcompmx, 0, djmain, bmcompmx, beatmania, ROT0, "Konami", "beatmania complete MIX (ver JA-B)", 0 )
GAME( 1999, hmcompmx, bmcompmx, djmain, bmcompmx, hmcompmx, ROT0, "Konami", "hiphopmania complete MIX (ver UA-B)", 0 )
GAME( 1999, bm4thmix, 0, djmain, bm4thmix, bm4thmix, ROT0, "Konami", "beatmania 4th MIX (ver JA-A)", 0 )
diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c
index 5a777b85f27..eeb83b525f0 100644
--- a/src/mame/drivers/dkong.c
+++ b/src/mame/drivers/dkong.c
@@ -909,7 +909,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( radarscp_in0_2 )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED ) /* not connected - held to high */
@@ -921,7 +921,7 @@ static INPUT_PORTS_START( radarscp_in0_2 )
INPUT_PORTS_END
static INPUT_PORTS_START( radarscp_in1_2 )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_COCKTAIL /* not connected - held to high */
@@ -933,7 +933,7 @@ static INPUT_PORTS_START( radarscp_in1_2 )
INPUT_PORTS_END
static INPUT_PORTS_START( dkong_in0_4 )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -945,7 +945,7 @@ static INPUT_PORTS_START( dkong_in0_4 )
INPUT_PORTS_END
static INPUT_PORTS_START( dkong_in1_4 )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
@@ -957,7 +957,7 @@ static INPUT_PORTS_START( dkong_in1_4 )
INPUT_PORTS_END
static INPUT_PORTS_START( dkong_in0_8 )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -969,7 +969,7 @@ static INPUT_PORTS_START( dkong_in0_8 )
INPUT_PORTS_END
static INPUT_PORTS_START( dkong_in1_8 )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -985,7 +985,7 @@ static INPUT_PORTS_START( dkong_in2 )
* Bit 0x01 is going to the connector but it is not labeled
* It should be a IPT_UNKNOWN. In fact, it will reset the game.
*/
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* connection not labeled in schematics - reset */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* connection not labeled in schematics - freeze or reset */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -997,7 +997,7 @@ static INPUT_PORTS_START( dkong_in2 )
INPUT_PORTS_END
static INPUT_PORTS_START( dkong_dsw0 )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION( "SW1:!1,!2" )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -1023,10 +1023,10 @@ static INPUT_PORTS_START( dkong_dsw0 )
INPUT_PORTS_END
static INPUT_PORTS_START( dkong_config )
- PORT_START_TAG("VR2")
+ PORT_START("VR2")
PORT_ADJUSTER( 90, "VR2 - DAC Volume" )
- PORT_START_TAG("VIDHW")
+ PORT_START("VIDHW")
PORT_CONFNAME( 0x01, 0x01, "Video Hardware" )
PORT_CONFSETTING( 0x00, "TKG-02 (Radarscope Conversion)" )
PORT_CONFSETTING( 0x01, "TKG-04 (Two board set)" )
@@ -1050,13 +1050,13 @@ static INPUT_PORTS_START( radarscp )
PORT_INCLUDE( dkong_dsw0 )
- PORT_START_TAG("VR2")
+ PORT_START("VR2")
PORT_ADJUSTER( 35, "VR2 - DAC Volume" )
INPUT_PORTS_END
static INPUT_PORTS_START( dkong3 )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -1066,7 +1066,7 @@ static INPUT_PORTS_START( dkong3 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN3 )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
@@ -1076,7 +1076,7 @@ static INPUT_PORTS_START( dkong3 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(1)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW2:!1,!2,!3")
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 2C_1C ) )
@@ -1094,7 +1094,7 @@ static INPUT_PORTS_START( dkong3 )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:!1,!2")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -1123,7 +1123,7 @@ static INPUT_PORTS_START( dkong3b )
PORT_INCLUDE( dkong_in2 )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:!1,!2,!3")
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 2C_1C ) )
@@ -1149,7 +1149,7 @@ static INPUT_PORTS_START( dkongjr )
PORT_INCLUDE( dkong_dsw0 )
#if DEBUG_DISC_SOUND
- PORT_START_TAG("TST") /* TST */
+ PORT_START("TST") /* TST */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CODE(KEYCODE_A)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CODE(KEYCODE_B)
#endif
@@ -1180,17 +1180,17 @@ static INPUT_PORTS_START( hunchbkd )
PORT_DIPSETTING( 0x08, "40000" )
PORT_DIPSETTING( 0x0c, "80000" )
- PORT_START_TAG("SENSE") /* Sense */
+ PORT_START("SENSE") /* Sense */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_INCLUDE( dkong_config )
INPUT_PORTS_END
static INPUT_PORTS_START( shootgal )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(4) PORT_REVERSE
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(4) PORT_REVERSE
PORT_INCLUDE( dkong_in2 )
@@ -1200,7 +1200,7 @@ static INPUT_PORTS_START( shootgal )
//PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
//PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, "1" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1224,7 +1224,7 @@ static INPUT_PORTS_START( shootgal )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_HIGH )
- PORT_START_TAG("SENSE") /* Sense */
+ PORT_START("SENSE") /* Sense */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_INCLUDE( dkong_config )
@@ -1258,7 +1258,7 @@ static INPUT_PORTS_START( sbdk )
PORT_DIPUNKNOWN_DIPLOC( 0x04, 0x00, "SW1:!3" )
PORT_DIPUNKNOWN_DIPLOC( 0x08, 0x00, "SW1:!4" )
- PORT_START_TAG("SENSE") /* Sense */
+ PORT_START("SENSE") /* Sense */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_INCLUDE( dkong_config )
@@ -1278,7 +1278,7 @@ static INPUT_PORTS_START( herbiedk )
PORT_DIPUNKNOWN_DIPLOC( 0x04, 0x00, "SW1:!3" )
PORT_DIPUNKNOWN_DIPLOC( 0x08, 0x00, "SW1:!4" )
- PORT_START_TAG("SENSE") /* Sense */
+ PORT_START("SENSE") /* Sense */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_INCLUDE( dkong_config )
@@ -1312,7 +1312,7 @@ static INPUT_PORTS_START( herodk )
PORT_DIPSETTING( 0x08, "2" )
PORT_DIPSETTING( 0x0c, "3" )
- PORT_START_TAG("SENSE") /* Sense */
+ PORT_START("SENSE") /* Sense */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_INCLUDE( dkong_config )
@@ -1320,7 +1320,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( pestplce )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1)
@@ -1330,7 +1330,7 @@ static INPUT_PORTS_START( pestplce )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2)
@@ -1342,7 +1342,7 @@ static INPUT_PORTS_START( pestplce )
PORT_INCLUDE( dkong_in2 )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -1385,7 +1385,7 @@ static INPUT_PORTS_START( spclforc )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Start 1 / P1 Button 1") PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Start 2 / P1 Button 2") PORT_PLAYER(1)
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1410,7 +1410,7 @@ static INPUT_PORTS_START( spclforc )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_4C ) )
- PORT_START_TAG("SENSE") /* Sense */
+ PORT_START("SENSE") /* Sense */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_INCLUDE( dkong_config )
@@ -1424,7 +1424,7 @@ static INPUT_PORTS_START( 8ballact )
PORT_INCLUDE( dkong_in2 )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW1:!1" )
PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "SW1:!2" )
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION( "SW1:!3" )
@@ -1444,7 +1444,7 @@ static INPUT_PORTS_START( 8ballact )
PORT_DIPSETTING( 0x60, DEF_STR( 1C_4C ) )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW1:!8" )
- PORT_START_TAG("SENSE") /* Sense */
+ PORT_START("SENSE") /* Sense */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_INCLUDE( dkong_config )
@@ -1457,7 +1457,7 @@ static INPUT_PORTS_START( drakton )
PORT_INCLUDE( dkong_in2 )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1488,7 +1488,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( strtheat )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 )
@@ -1498,7 +1498,7 @@ static INPUT_PORTS_START( strtheat )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -1510,7 +1510,7 @@ static INPUT_PORTS_START( strtheat )
PORT_INCLUDE( dkong_in2 )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1535,10 +1535,10 @@ static INPUT_PORTS_START( strtheat )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("IN4") /* IN4 */
+ PORT_START("IN4") /* IN4 */
PORT_BIT( 0x03, 0x00, IPT_DIAL ) PORT_SENSITIVITY(40) PORT_KEYDELTA(10) PORT_REVERSE
- PORT_START_TAG("IN5") /* IN5 */
+ PORT_START("IN5") /* IN5 */
PORT_BIT( 0x03, 0x00, IPT_DIAL ) PORT_SENSITIVITY(40) PORT_KEYDELTA(10) PORT_REVERSE PORT_COCKTAIL
PORT_INCLUDE( dkong_config )
diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c
index 6d099b54db2..ecd3c9c36fc 100644
--- a/src/mame/drivers/dlair.c
+++ b/src/mame/drivers/dlair.c
@@ -499,16 +499,16 @@ static ADDRESS_MAP_START( dleuro_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xc7ff) AM_MIRROR(0x1800) AM_RAM AM_BASE(&videoram)
AM_RANGE(0xe000, 0xe000) AM_MIRROR(0x1f47) // WT LED 1
AM_RANGE(0xe008, 0xe008) AM_MIRROR(0x1f47) // WT LED 2
- AM_RANGE(0xe010, 0xe010) AM_MIRROR(0x1f47) AM_WRITE(led_den1_w) // WT EXT LED 1
- AM_RANGE(0xe018, 0xe018) AM_MIRROR(0x1f47) AM_WRITE(led_den2_w) // WT EXT LED 2
- AM_RANGE(0xe020, 0xe020) AM_MIRROR(0x1f47) AM_WRITE(laserdisc_w) // DISC WT
- AM_RANGE(0xe028, 0xe028) AM_MIRROR(0x1f47) AM_WRITE(dleuro_misc_w) // WT MISC
- AM_RANGE(0xe030, 0xe030) AM_MIRROR(0x1f47) AM_WRITE(watchdog_reset_w) // CLR WDOG
- AM_RANGE(0xe080, 0xe080) AM_MIRROR(0x1f47) AM_READ(input_port_0_r) // CP A
- AM_RANGE(0xe088, 0xe088) AM_MIRROR(0x1f47) AM_READ(input_port_1_r) // CP B
- AM_RANGE(0xe090, 0xe090) AM_MIRROR(0x1f47) AM_READ(input_port_2_r) // OPT SW A
- AM_RANGE(0xe098, 0xe098) AM_MIRROR(0x1f47) AM_READ(input_port_3_r) // OPT SW B
- AM_RANGE(0xe0a0, 0xe0a0) AM_MIRROR(0x1f47) AM_READ(laserdisc_r) // RD DISC DATA
+ AM_RANGE(0xe010, 0xe010) AM_MIRROR(0x1f47) AM_WRITE(led_den1_w) // WT EXT LED 1
+ AM_RANGE(0xe018, 0xe018) AM_MIRROR(0x1f47) AM_WRITE(led_den2_w) // WT EXT LED 2
+ AM_RANGE(0xe020, 0xe020) AM_MIRROR(0x1f47) AM_WRITE(laserdisc_w) // DISC WT
+ AM_RANGE(0xe028, 0xe028) AM_MIRROR(0x1f47) AM_WRITE(dleuro_misc_w) // WT MISC
+ AM_RANGE(0xe030, 0xe030) AM_MIRROR(0x1f47) AM_WRITE(watchdog_reset_w) // CLR WDOG
+ AM_RANGE(0xe080, 0xe080) AM_MIRROR(0x1f47) AM_READ_PORT("P1") // CP A
+ AM_RANGE(0xe088, 0xe088) AM_MIRROR(0x1f47) AM_READ_PORT("SYSTEM") // CP B
+ AM_RANGE(0xe090, 0xe090) AM_MIRROR(0x1f47) AM_READ_PORT("DSW1") // OPT SW A
+ AM_RANGE(0xe098, 0xe098) AM_MIRROR(0x1f47) AM_READ_PORT("DSW2") // OPT SW B
+ AM_RANGE(0xe0a0, 0xe0a0) AM_MIRROR(0x1f47) AM_READ(laserdisc_r) // RD DISC DATA
ADDRESS_MAP_END
@@ -585,7 +585,7 @@ Address in ROM:
*************************************/
static INPUT_PORTS_START( dlair )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("A:2,1")
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
// PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
@@ -608,7 +608,7 @@ static INPUT_PORTS_START( dlair )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_HIGH, "A:8" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, "Sound every 8 attracts" ) PORT_DIPLOCATION("B:1")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -627,16 +627,16 @@ static INPUT_PORTS_START( dlair )
PORT_DIPSETTING( 0x40, "PAYG3" )
PORT_DIPSETTING( 0x60, "PAYG4" )
PORT_DIPNAME( 0x90, 0x10, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("B:8,5")
- PORT_DIPSETTING( 0x00, "Increase after 5" ) PORT_CONDITION("DSW1",0x04,PORTCOND_EQUALS,0x00)
- PORT_DIPSETTING( 0x10, "Increase after 9" ) PORT_CONDITION("DSW1",0x04,PORTCOND_EQUALS,0x00)
- PORT_DIPSETTING( 0x80, DEF_STR( Easy ) ) PORT_CONDITION("DSW1",0x04,PORTCOND_EQUALS,0x00)
- PORT_DIPSETTING( 0x90, DEF_STR( Easy ) ) PORT_CONDITION("DSW1",0x04,PORTCOND_EQUALS,0x00)
- PORT_DIPSETTING( 0x00, DEF_STR( Hard ) ) PORT_CONDITION("DSW1",0x04,PORTCOND_EQUALS,0x04)
- PORT_DIPSETTING( 0x10, DEF_STR( Easy ) ) PORT_CONDITION("DSW1",0x04,PORTCOND_EQUALS,0x04)
- PORT_DIPSETTING( 0x80, DEF_STR( Easy ) ) PORT_CONDITION("DSW1",0x04,PORTCOND_EQUALS,0x04)
- PORT_DIPSETTING( 0x90, DEF_STR( Easy ) ) PORT_CONDITION("DSW1",0x04,PORTCOND_EQUALS,0x04)
-
- PORT_START_TAG("CONTROLS")
+ PORT_DIPSETTING( 0x00, "Increase after 5" ) PORT_CONDITION("DSW1", 0x04, PORTCOND_EQUALS, 0x00)
+ PORT_DIPSETTING( 0x10, "Increase after 9" ) PORT_CONDITION("DSW1", 0x04, PORTCOND_EQUALS, 0x00)
+ PORT_DIPSETTING( 0x80, DEF_STR( Easy ) ) PORT_CONDITION("DSW1", 0x04, PORTCOND_EQUALS, 0x00)
+ PORT_DIPSETTING( 0x90, DEF_STR( Easy ) ) PORT_CONDITION("DSW1", 0x04, PORTCOND_EQUALS, 0x00)
+ PORT_DIPSETTING( 0x00, DEF_STR( Hard ) ) PORT_CONDITION("DSW1", 0x04, PORTCOND_EQUALS, 0x04)
+ PORT_DIPSETTING( 0x10, DEF_STR( Easy ) ) PORT_CONDITION("DSW1", 0x04, PORTCOND_EQUALS, 0x04)
+ PORT_DIPSETTING( 0x80, DEF_STR( Easy ) ) PORT_CONDITION("DSW1", 0x04, PORTCOND_EQUALS, 0x04)
+ PORT_DIPSETTING( 0x90, DEF_STR( Easy ) ) PORT_CONDITION("DSW1", 0x04, PORTCOND_EQUALS, 0x04)
+
+ PORT_START("CONTROLS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
@@ -646,7 +646,7 @@ static INPUT_PORTS_START( dlair )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -668,7 +668,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( dleuro )
- PORT_START /* IN0 */
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
@@ -678,7 +678,7 @@ static INPUT_PORTS_START( dleuro )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START /* IN2 */
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -687,7 +687,7 @@ static INPUT_PORTS_START( dleuro )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(laserdisc_status_r, 0) /* status strobe */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(laserdisc_command_r, 0) /* command strobe */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("A:2,1")
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
// PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
@@ -710,7 +710,7 @@ static INPUT_PORTS_START( dleuro )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_HIGH, "A:8" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, "Sound every 8 attracts" ) PORT_DIPLOCATION("B:1")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -729,14 +729,14 @@ static INPUT_PORTS_START( dleuro )
PORT_DIPSETTING( 0x40, "PAYG3" )
PORT_DIPSETTING( 0x60, "PAYG4" )
PORT_DIPNAME( 0x90, 0x10, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("B:8,5s")
- PORT_DIPSETTING( 0x00, "Increase after 5" ) PORT_CONDITION("DSW1",0x04,PORTCOND_EQUALS,0x00)
- PORT_DIPSETTING( 0x10, "Increase after 9" ) PORT_CONDITION("DSW1",0x04,PORTCOND_EQUALS,0x00)
- PORT_DIPSETTING( 0x80, DEF_STR( Easy ) ) PORT_CONDITION("DSW1",0x04,PORTCOND_EQUALS,0x00)
- PORT_DIPSETTING( 0x90, DEF_STR( Easy ) ) PORT_CONDITION("DSW1",0x04,PORTCOND_EQUALS,0x00)
- PORT_DIPSETTING( 0x00, DEF_STR( Hard ) ) PORT_CONDITION("DSW1",0x04,PORTCOND_EQUALS,0x04)
- PORT_DIPSETTING( 0x10, DEF_STR( Easy ) ) PORT_CONDITION("DSW1",0x04,PORTCOND_EQUALS,0x04)
- PORT_DIPSETTING( 0x80, DEF_STR( Easy ) ) PORT_CONDITION("DSW1",0x04,PORTCOND_EQUALS,0x04)
- PORT_DIPSETTING( 0x90, DEF_STR( Easy ) ) PORT_CONDITION("DSW1",0x04,PORTCOND_EQUALS,0x04)
+ PORT_DIPSETTING( 0x00, "Increase after 5" ) PORT_CONDITION("DSW1", 0x04, PORTCOND_EQUALS, 0x00)
+ PORT_DIPSETTING( 0x10, "Increase after 9" ) PORT_CONDITION("DSW1", 0x04, PORTCOND_EQUALS, 0x00)
+ PORT_DIPSETTING( 0x80, DEF_STR( Easy ) ) PORT_CONDITION("DSW1", 0x04, PORTCOND_EQUALS, 0x00)
+ PORT_DIPSETTING( 0x90, DEF_STR( Easy ) ) PORT_CONDITION("DSW1", 0x04, PORTCOND_EQUALS, 0x00)
+ PORT_DIPSETTING( 0x00, DEF_STR( Hard ) ) PORT_CONDITION("DSW1", 0x04, PORTCOND_EQUALS, 0x04)
+ PORT_DIPSETTING( 0x10, DEF_STR( Easy ) ) PORT_CONDITION("DSW1", 0x04, PORTCOND_EQUALS, 0x04)
+ PORT_DIPSETTING( 0x80, DEF_STR( Easy ) ) PORT_CONDITION("DSW1", 0x04, PORTCOND_EQUALS, 0x04)
+ PORT_DIPSETTING( 0x90, DEF_STR( Easy ) ) PORT_CONDITION("DSW1", 0x04, PORTCOND_EQUALS, 0x04)
INPUT_PORTS_END
diff --git a/src/mame/drivers/dmndrby.c b/src/mame/drivers/dmndrby.c
index 95a176e9e17..b98e154fe4b 100644
--- a/src/mame/drivers/dmndrby.c
+++ b/src/mame/drivers/dmndrby.c
@@ -56,7 +56,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( dderby )
- PORT_START /* 8bit */
+ PORT_START("IN0") /* 8bit */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/docastle.c b/src/mame/drivers/docastle.c
index 4cbaec11a9e..a9342f7b188 100644
--- a/src/mame/drivers/docastle.c
+++ b/src/mame/drivers/docastle.c
@@ -220,12 +220,12 @@ static ADDRESS_MAP_START( docastle_map2, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa008) AM_READWRITE(docastle_shared1_r, docastle_shared0_w)
- AM_RANGE(0xc001, 0xc001) AM_MIRROR(0x0080) AM_READ(input_port_4_r)
- AM_RANGE(0xc002, 0xc002) AM_MIRROR(0x0080) AM_READ(input_port_3_r)
- AM_RANGE(0xc003, 0xc003) AM_MIRROR(0x0080) AM_READ(input_port_0_r)
+ AM_RANGE(0xc001, 0xc001) AM_MIRROR(0x0080) AM_READ_PORT("DSW2")
+ AM_RANGE(0xc002, 0xc002) AM_MIRROR(0x0080) AM_READ_PORT("DSW1")
+ AM_RANGE(0xc003, 0xc003) AM_MIRROR(0x0080) AM_READ_PORT("JOYS")
AM_RANGE(0xc004, 0xc004) AM_READWRITE(docastle_flipscreen_off_r, docastle_flipscreen_off_w)
- AM_RANGE(0xc005, 0xc005) AM_MIRROR(0x0080) AM_READ(input_port_1_r)
- AM_RANGE(0xc007, 0xc007) AM_MIRROR(0x0080) AM_READ(input_port_2_r)
+ AM_RANGE(0xc005, 0xc005) AM_MIRROR(0x0080) AM_READ_PORT("BUTTONS")
+ AM_RANGE(0xc007, 0xc007) AM_MIRROR(0x0080) AM_READ_PORT("SYSTEM")
AM_RANGE(0xc084, 0xc084) AM_READWRITE(docastle_flipscreen_on_r, docastle_flipscreen_on_w)
AM_RANGE(0xe000, 0xe000) AM_WRITE(SN76496_0_w)
AM_RANGE(0xe400, 0xe400) AM_WRITE(SN76496_1_w)
@@ -267,12 +267,12 @@ static ADDRESS_MAP_START( dorunrun_map2, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa400, 0xa400) AM_WRITE(SN76496_1_w)
AM_RANGE(0xa800, 0xa800) AM_WRITE(SN76496_2_w)
AM_RANGE(0xac00, 0xac00) AM_WRITE(SN76496_3_w)
- AM_RANGE(0xc001, 0xc001) AM_MIRROR(0x0080) AM_READ(input_port_4_r)
- AM_RANGE(0xc002, 0xc002) AM_MIRROR(0x0080) AM_READ(input_port_3_r)
- AM_RANGE(0xc003, 0xc003) AM_MIRROR(0x0080) AM_READ(input_port_0_r)
+ AM_RANGE(0xc001, 0xc001) AM_MIRROR(0x0080) AM_READ_PORT("DSW2")
+ AM_RANGE(0xc002, 0xc002) AM_MIRROR(0x0080) AM_READ_PORT("DSW1")
+ AM_RANGE(0xc003, 0xc003) AM_MIRROR(0x0080) AM_READ_PORT("JOYS")
AM_RANGE(0xc004, 0xc004) AM_READWRITE(docastle_flipscreen_off_r, docastle_flipscreen_off_w)
- AM_RANGE(0xc005, 0xc005) AM_MIRROR(0x0080) AM_READ(input_port_1_r)
- AM_RANGE(0xc007, 0xc007) AM_MIRROR(0x0080) AM_READ(input_port_2_r)
+ AM_RANGE(0xc005, 0xc005) AM_MIRROR(0x0080) AM_READ_PORT("BUTTONS")
+ AM_RANGE(0xc007, 0xc007) AM_MIRROR(0x0080) AM_READ_PORT("SYSTEM")
AM_RANGE(0xc084, 0xc084) AM_READWRITE(docastle_flipscreen_on_r, docastle_flipscreen_on_w)
AM_RANGE(0xe000, 0xe008) AM_READWRITE(docastle_shared1_r, docastle_shared0_w)
ADDRESS_MAP_END
@@ -295,13 +295,13 @@ static ADDRESS_MAP_START( idsoccer_map2, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa008) AM_READWRITE(docastle_shared1_r, docastle_shared0_w)
- AM_RANGE(0xc001, 0xc001) AM_MIRROR(0x0080) AM_READ(input_port_4_r)
- AM_RANGE(0xc002, 0xc002) AM_MIRROR(0x0080) AM_READ(input_port_3_r)
- AM_RANGE(0xc003, 0xc003) AM_MIRROR(0x0080) AM_READ(input_port_0_r)
- AM_RANGE(0xc004, 0xc004) AM_READWRITE(input_port_5_r, docastle_flipscreen_off_w)
- AM_RANGE(0xc005, 0xc005) AM_MIRROR(0x0080) AM_READ(input_port_1_r)
- AM_RANGE(0xc007, 0xc007) AM_MIRROR(0x0080) AM_READ(input_port_2_r)
- AM_RANGE(0xc084, 0xc084) AM_READWRITE(input_port_5_r, docastle_flipscreen_on_w)
+ AM_RANGE(0xc001, 0xc001) AM_MIRROR(0x0080) AM_READ_PORT("DSW2")
+ AM_RANGE(0xc002, 0xc002) AM_MIRROR(0x0080) AM_READ_PORT("DSW1")
+ AM_RANGE(0xc003, 0xc003) AM_MIRROR(0x0080) AM_READ_PORT("JOYS")
+ AM_RANGE(0xc004, 0xc004) AM_READ_PORT("JOYS_RIGHT") AM_WRITE(docastle_flipscreen_off_w)
+ AM_RANGE(0xc005, 0xc005) AM_MIRROR(0x0080) AM_READ_PORT("BUTTONS")
+ AM_RANGE(0xc007, 0xc007) AM_MIRROR(0x0080) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0xc084, 0xc084) AM_READ_PORT("JOYS_RIGHT") AM_WRITE(docastle_flipscreen_on_w)
AM_RANGE(0xe000, 0xe000) AM_WRITE(SN76496_0_w)
AM_RANGE(0xe400, 0xe400) AM_WRITE(SN76496_1_w)
AM_RANGE(0xe800, 0xe800) AM_WRITE(SN76496_2_w)
@@ -310,78 +310,39 @@ ADDRESS_MAP_END
/* Input Ports */
-// Coinage used for all games
-#define COINAGE_PORT \
- PORT_START \
- PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_B ) ) \
- PORT_DIPSETTING( 0x06, DEF_STR( 4C_1C ) ) \
- PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) ) \
- PORT_DIPSETTING( 0x0a, DEF_STR( 2C_1C ) ) \
- PORT_DIPSETTING( 0x07, DEF_STR( 3C_2C ) ) \
- PORT_DIPSETTING( 0x0f, DEF_STR( 1C_1C ) ) \
- PORT_DIPSETTING( 0x09, DEF_STR( 2C_3C ) ) \
- PORT_DIPSETTING( 0x0e, DEF_STR( 1C_2C ) ) \
- PORT_DIPSETTING( 0x0d, DEF_STR( 1C_3C ) ) \
- PORT_DIPSETTING( 0x0c, DEF_STR( 1C_4C ) ) \
- PORT_DIPSETTING( 0x0b, DEF_STR( 1C_5C ) ) \
- PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) ) \
- /* 0x01, 0x02, 0x03, 0x04, 0x05 all give 1 Coin/1 Credit */ \
- PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_A ) ) \
- PORT_DIPSETTING( 0x60, DEF_STR( 4C_1C ) ) \
- PORT_DIPSETTING( 0x80, DEF_STR( 3C_1C ) ) \
- PORT_DIPSETTING( 0xa0, DEF_STR( 2C_1C ) ) \
- PORT_DIPSETTING( 0x70, DEF_STR( 3C_2C ) ) \
- PORT_DIPSETTING( 0xf0, DEF_STR( 1C_1C ) ) \
- PORT_DIPSETTING( 0x90, DEF_STR( 2C_3C ) ) \
- PORT_DIPSETTING( 0xe0, DEF_STR( 1C_2C ) ) \
- PORT_DIPSETTING( 0xd0, DEF_STR( 1C_3C ) ) \
- PORT_DIPSETTING( 0xc0, DEF_STR( 1C_4C ) ) \
- PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ) ) \
- PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) ) \
- /* 0x10, 0x20, 0x30, 0x40, 0x50 all give 1 Coin/1 Credit */
-
-#define DOCASTLE_IN0 \
- PORT_START \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY \
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY \
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY \
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL \
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL \
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL \
+static INPUT_PORTS_START( docastle )
+ PORT_START("JOYS")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
-#define DOCASTLE_IN1 \
- PORT_START \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) \
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) \
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) \
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL \
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL \
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) \
+ PORT_START("BUTTONS")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
-#define DOCASTLE_IN2 \
- PORT_START \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT ) \
- PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW ) \
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_IMPULSE(32) \
- PORT_DIPNAME( 0x08, 0x08, "Freeze" ) \
- PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) \
- PORT_DIPSETTING( 0x00, DEF_STR( On ) ) \
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 ) \
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 ) \
+ PORT_START("SYSTEM")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
+ PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_IMPULSE(32)
+ PORT_DIPNAME( 0x08, 0x08, "Freeze" )
+ PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-static INPUT_PORTS_START( docastle )
- DOCASTLE_IN0
-
- DOCASTLE_IN1
-
- DOCASTLE_IN2
-
- PORT_START // DSW0
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1 (Beginner)" )
PORT_DIPSETTING( 0x02, "2" )
@@ -405,115 +366,89 @@ static INPUT_PORTS_START( docastle )
PORT_DIPSETTING( 0x80, "4" )
PORT_DIPSETTING( 0x40, "5" )
- COINAGE_PORT
+ PORT_START("DSW2")
+ PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_B ) )
+ PORT_DIPSETTING( 0x06, DEF_STR( 4C_1C ) )
+ PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
+ PORT_DIPSETTING( 0x0a, DEF_STR( 2C_1C ) )
+ PORT_DIPSETTING( 0x07, DEF_STR( 3C_2C ) )
+ PORT_DIPSETTING( 0x0f, DEF_STR( 1C_1C ) )
+ PORT_DIPSETTING( 0x09, DEF_STR( 2C_3C ) )
+ PORT_DIPSETTING( 0x0e, DEF_STR( 1C_2C ) )
+ PORT_DIPSETTING( 0x0d, DEF_STR( 1C_3C ) )
+ PORT_DIPSETTING( 0x0c, DEF_STR( 1C_4C ) )
+ PORT_DIPSETTING( 0x0b, DEF_STR( 1C_5C ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
+ /* 0x01, 0x02, 0x03, 0x04, 0x05 all give 1 Coin/1 Credit */
+ PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_A ) )
+ PORT_DIPSETTING( 0x60, DEF_STR( 4C_1C ) )
+ PORT_DIPSETTING( 0x80, DEF_STR( 3C_1C ) )
+ PORT_DIPSETTING( 0xa0, DEF_STR( 2C_1C ) )
+ PORT_DIPSETTING( 0x70, DEF_STR( 3C_2C ) )
+ PORT_DIPSETTING( 0xf0, DEF_STR( 1C_1C ) )
+ PORT_DIPSETTING( 0x90, DEF_STR( 2C_3C ) )
+ PORT_DIPSETTING( 0xe0, DEF_STR( 1C_2C ) )
+ PORT_DIPSETTING( 0xd0, DEF_STR( 1C_3C ) )
+ PORT_DIPSETTING( 0xc0, DEF_STR( 1C_4C ) )
+ PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
+ /* 0x10, 0x20, 0x30, 0x40, 0x50 all give 1 Coin/1 Credit */
INPUT_PORTS_END
static INPUT_PORTS_START( dorunrun )
- DOCASTLE_IN0
-
- DOCASTLE_IN1
-
- DOCASTLE_IN2
+ PORT_INCLUDE( docastle )
- PORT_START // DSW0
- PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
- PORT_DIPSETTING( 0x03, "1 (Beginner)" )
- PORT_DIPSETTING( 0x02, "2" )
- PORT_DIPSETTING( 0x01, "3" )
- PORT_DIPSETTING( 0x00, "4 (Advanced)" )
+ PORT_MODIFY("DSW1")
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x04, DEF_STR( On ) )
PORT_DIPNAME( 0x08, 0x08, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x10, 0x10, "Difficulty of EXTRA" )
- PORT_DIPSETTING( 0x10, DEF_STR( Easy ) )
- PORT_DIPSETTING( 0x00, "Difficult" )
- PORT_DIPNAME( 0x20, 0x00, DEF_STR( Cabinet ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
- PORT_DIPSETTING( 0x20, DEF_STR( Cocktail ) )
PORT_DIPNAME( 0x40, 0x40, "Special" )
PORT_DIPSETTING( 0x40, "Given" )
PORT_DIPSETTING( 0x00, "Not Given" )
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x80, "3" )
PORT_DIPSETTING( 0x00, "5" )
-
- COINAGE_PORT
INPUT_PORTS_END
static INPUT_PORTS_START( dowild )
- DOCASTLE_IN0
-
- DOCASTLE_IN1
+ PORT_INCLUDE( docastle )
- DOCASTLE_IN2
-
- PORT_START // DSW0
- PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
- PORT_DIPSETTING( 0x03, "1 (Beginner)" )
- PORT_DIPSETTING( 0x02, "2" )
- PORT_DIPSETTING( 0x01, "3" )
- PORT_DIPSETTING( 0x00, "4 (Advanced)" )
- PORT_DIPNAME( 0x04, 0x04, "Rack Test" )
- PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_MODIFY("DSW1")
PORT_DIPNAME( 0x08, 0x08, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x10, 0x10, "Difficulty of EXTRA" )
- PORT_DIPSETTING( 0x10, DEF_STR( Easy ) )
- PORT_DIPSETTING( 0x00, "Difficult" )
- PORT_DIPNAME( 0x20, 0x00, DEF_STR( Cabinet ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
- PORT_DIPSETTING( 0x20, DEF_STR( Cocktail ) )
PORT_DIPNAME( 0x40, 0x40, "Special" )
PORT_DIPSETTING( 0x40, "Given" )
PORT_DIPSETTING( 0x00, "Not Given" )
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x80, "3" )
PORT_DIPSETTING( 0x00, "5" )
-
- COINAGE_PORT
INPUT_PORTS_END
static INPUT_PORTS_START( jjack )
- DOCASTLE_IN0
-
- DOCASTLE_IN1
+ PORT_INCLUDE( docastle )
- DOCASTLE_IN2
-
- PORT_START // DSW0
+ PORT_MODIFY("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Difficulty?" )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Medium ) )
PORT_DIPSETTING( 0x01, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_DIPNAME( 0x04, 0x04, "Rack Test" )
- PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x08, 0x08, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x10, 0x10, "Extra?" )
PORT_DIPSETTING( 0x10, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hard ) )
- PORT_DIPNAME( 0x20, 0x00, DEF_STR( Cabinet ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
- PORT_DIPSETTING( 0x20, DEF_STR( Cocktail ) )
- PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) )
- PORT_DIPSETTING( 0x00, "2" )
- PORT_DIPSETTING( 0xc0, "3" )
- PORT_DIPSETTING( 0x80, "4" )
- PORT_DIPSETTING( 0x40, "5" )
-
- COINAGE_PORT
INPUT_PORTS_END
static INPUT_PORTS_START( kickridr )
- PORT_START // IN0
+ PORT_INCLUDE( docastle )
+
+ PORT_MODIFY("JOYS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -523,40 +458,30 @@ static INPUT_PORTS_START( kickridr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
- DOCASTLE_IN1
-
- DOCASTLE_IN2
-
- PORT_START // DSW0
+ PORT_MODIFY("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Difficulty?" )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Medium ) )
PORT_DIPSETTING( 0x01, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_DIPNAME( 0x04, 0x04, "Rack Test" )
- PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x08, 0x08, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x10, 0x10, "DSW4" )
PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x20, 0x00, DEF_STR( Cabinet ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
- PORT_DIPSETTING( 0x20, DEF_STR( Cocktail ) )
PORT_DIPNAME( 0x40, 0x40, "DSW2" )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x80, 0x80, "DSW1" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
-
- COINAGE_PORT
INPUT_PORTS_END
static INPUT_PORTS_START( idsoccer )
- PORT_START // IN0
+ PORT_INCLUDE( docastle )
+
+ PORT_MODIFY("JOYS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_8WAY
@@ -566,11 +491,7 @@ static INPUT_PORTS_START( idsoccer )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_8WAY PORT_PLAYER(2)
- DOCASTLE_IN1
-
- DOCASTLE_IN2
-
- PORT_START // DSW0
+ PORT_MODIFY("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Medium ) )
@@ -594,9 +515,7 @@ static INPUT_PORTS_START( idsoccer )
PORT_DIPSETTING( 0x40, "2:00" )
PORT_DIPSETTING( 0x00, "1:00" )
- COINAGE_PORT
-
- PORT_START
+ PORT_START("JOYS_RIGHT")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_UP ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT ) PORT_8WAY
diff --git a/src/mame/drivers/dogfgt.c b/src/mame/drivers/dogfgt.c
index 1f97485a767..8edd0607909 100644
--- a/src/mame/drivers/dogfgt.c
+++ b/src/mame/drivers/dogfgt.c
@@ -78,10 +78,10 @@ static WRITE8_HANDLER( dogfgt_soundcontrol_w )
static ADDRESS_MAP_START( main_readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_READ(sharedram_r)
- AM_RANGE(0x1800, 0x1800) AM_READ(input_port_0_r)
- AM_RANGE(0x1810, 0x1810) AM_READ(input_port_1_r)
- AM_RANGE(0x1820, 0x1820) AM_READ(input_port_2_r)
- AM_RANGE(0x1830, 0x1830) AM_READ(input_port_3_r)
+ AM_RANGE(0x1800, 0x1800) AM_READ_PORT("P1")
+ AM_RANGE(0x1810, 0x1810) AM_READ_PORT("P2")
+ AM_RANGE(0x1820, 0x1820) AM_READ_PORT("DSW1")
+ AM_RANGE(0x1830, 0x1830) AM_READ_PORT("DSW2")
AM_RANGE(0x2000, 0x3fff) AM_READ(dogfgt_bitmapram_r)
AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM)
ADDRESS_MAP_END
@@ -117,7 +117,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( dogfgt )
- PORT_START /* IN0 */
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -127,7 +127,7 @@ static INPUT_PORTS_START( dogfgt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(1)
- PORT_START /* IN1 */
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -137,7 +137,7 @@ static INPUT_PORTS_START( dogfgt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START /* DSW1 */
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
@@ -175,7 +175,7 @@ static INPUT_PORTS_START( dogfgt )
There is a side note for these two: "Change both together"
*/
- PORT_START /* DSW2 */
+ PORT_START("DSW2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Coin_A ) )
diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c
index d45cb538b96..0756496a91c 100644
--- a/src/mame/drivers/dominob.c
+++ b/src/mame/drivers/dominob.c
@@ -122,12 +122,6 @@ static WRITE8_HANDLER( dominob_d008_w )
/* is there a purpose on this ? always set to 0x00 (read from 0xc47b in RAM) */
}
-static READ8_HANDLER( dominob_input_2_r )
-{
- return input_port_read(machine, "IN2");
-}
-
-
static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_READWRITE(SMH_ROM, SMH_NOP) // there are some garbage writes to ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
@@ -135,9 +129,9 @@ static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xd000, 0xd000) AM_WRITE(AY8910_control_port_0_w)
AM_RANGE(0xd001, 0xd001) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
AM_RANGE(0xd008, 0xd008) AM_WRITE(dominob_d008_w)
- AM_RANGE(0xd00c, 0xd00c) AM_READ(input_port_0_r)
- AM_RANGE(0xd010, 0xd010) AM_READWRITE(input_port_1_r, SMH_NOP)
- AM_RANGE(0xd018, 0xd018) AM_READ(dominob_input_2_r) AM_WRITENOP
+ AM_RANGE(0xd00c, 0xd00c) AM_READ_PORT("IN0")
+ AM_RANGE(0xd010, 0xd010) AM_READ_PORT("IN1") AM_WRITE(SMH_NOP)
+ AM_RANGE(0xd018, 0xd018) AM_READ_PORT("IN2") AM_WRITENOP
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_BASE(&videoram)
AM_RANGE(0xe800, 0xe83f) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size)
@@ -161,7 +155,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( dominob )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) /* works (subs 2 credits), but starts a 1 player game as START1 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) /* SERVICE1 in 'arkanoid' */
@@ -171,19 +165,19 @@ static INPUT_PORTS_START( dominob )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SPECIAL )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) /* also works in "demo mode" ! */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* also works in "demo mode" ! */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* player 2 BUTTON1 in 'arkanoid' - only read to select the girl */
PORT_BIT( 0xf8, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* Spinner Player 1 */
+ PORT_START("IN2") /* Spinner Player 1 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15)
- PORT_START_TAG("IN3") /* Spinner Player 2 */ /* No Player 2 */
+ PORT_START("IN3") /* Spinner Player 2 */ /* No Player 2 */
// PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15) PORT_COCKTAIL
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c
index 2c4b059cd9b..4cfe6669b75 100644
--- a/src/mame/drivers/dooyong.c
+++ b/src/mame/drivers/dooyong.c
@@ -124,11 +124,11 @@ static WRITE8_HANDLER( flip_screen_w )
static ADDRESS_MAP_START( lastday_readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1)
- AM_RANGE(0xc010, 0xc010) AM_READ(input_port_4_r)
- AM_RANGE(0xc011, 0xc011) AM_READ(input_port_2_r)
- AM_RANGE(0xc012, 0xc012) AM_READ(input_port_3_r)
- AM_RANGE(0xc013, 0xc013) AM_READ(input_port_0_r)
- AM_RANGE(0xc014, 0xc014) AM_READ(input_port_1_r)
+ AM_RANGE(0xc010, 0xc010) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0xc011, 0xc011) AM_READ_PORT("P1")
+ AM_RANGE(0xc012, 0xc012) AM_READ_PORT("P2")
+ AM_RANGE(0xc013, 0xc013) AM_READ_PORT("DSW1")
+ AM_RANGE(0xc014, 0xc014) AM_READ_PORT("DSW2")
AM_RANGE(0xc800, 0xffff) AM_READ(SMH_RAM)
ADDRESS_MAP_END
@@ -149,11 +149,11 @@ static ADDRESS_MAP_START( pollux_readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1)
AM_RANGE(0xc000, 0xefff) AM_READ(SMH_RAM)
- AM_RANGE(0xf000, 0xf000) AM_READ(input_port_0_r)
- AM_RANGE(0xf001, 0xf001) AM_READ(input_port_1_r)
- AM_RANGE(0xf002, 0xf002) AM_READ(input_port_2_r)
- AM_RANGE(0xf003, 0xf003) AM_READ(input_port_3_r)
- AM_RANGE(0xf004, 0xf004) AM_READ(input_port_4_r)
+ AM_RANGE(0xf000, 0xf000) AM_READ_PORT("DSW1")
+ AM_RANGE(0xf001, 0xf001) AM_READ_PORT("DSW2")
+ AM_RANGE(0xf002, 0xf002) AM_READ_PORT("P1")
+ AM_RANGE(0xf003, 0xf003) AM_READ_PORT("P2")
+ AM_RANGE(0xf004, 0xf004) AM_READ_PORT("SYSTEM")
AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM)
ADDRESS_MAP_END
@@ -174,22 +174,22 @@ static ADDRESS_MAP_START( gulfstrm_readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1)
AM_RANGE(0xc000, 0xefff) AM_READ(SMH_RAM)
- AM_RANGE(0xf000, 0xf000) AM_READ(input_port_0_r)
- AM_RANGE(0xf001, 0xf001) AM_READ(input_port_1_r)
- AM_RANGE(0xf002, 0xf002) AM_READ(input_port_3_r)
- AM_RANGE(0xf003, 0xf003) AM_READ(input_port_2_r)
- AM_RANGE(0xf004, 0xf004) AM_READ(input_port_4_r)
+ AM_RANGE(0xf000, 0xf000) AM_READ_PORT("DSW1")
+ AM_RANGE(0xf001, 0xf001) AM_READ_PORT("DSW2")
+ AM_RANGE(0xf002, 0xf002) AM_READ_PORT("P2")
+ AM_RANGE(0xf003, 0xf003) AM_READ_PORT("P1")
+ AM_RANGE(0xf004, 0xf004) AM_READ_PORT("SYSTEM")
AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM)
ADDRESS_MAP_END
static ADDRESS_MAP_START( bluehawk_readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1)
- AM_RANGE(0xc000, 0xc000) AM_READ(input_port_0_r)
- AM_RANGE(0xc001, 0xc001) AM_READ(input_port_1_r)
- AM_RANGE(0xc002, 0xc002) AM_READ(input_port_2_r)
- AM_RANGE(0xc003, 0xc003) AM_READ(input_port_3_r)
- AM_RANGE(0xc004, 0xc004) AM_READ(input_port_4_r)
+ AM_RANGE(0xc000, 0xc000) AM_READ_PORT("DSW1")
+ AM_RANGE(0xc001, 0xc001) AM_READ_PORT("DSW2")
+ AM_RANGE(0xc002, 0xc002) AM_READ_PORT("P1")
+ AM_RANGE(0xc003, 0xc003) AM_READ_PORT("P2")
+ AM_RANGE(0xc004, 0xc004) AM_READ_PORT("SYSTEM")
AM_RANGE(0xc800, 0xffff) AM_READ(SMH_RAM)
ADDRESS_MAP_END
@@ -212,11 +212,11 @@ static ADDRESS_MAP_START( flytiger_readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1)
AM_RANGE(0xc000, 0xcfff) AM_READ(SMH_RAM)
AM_RANGE(0xd000, 0xdfff) AM_READ(SMH_RAM)
- AM_RANGE(0xe000, 0xe000) AM_READ(input_port_2_r)
- AM_RANGE(0xe002, 0xe002) AM_READ(input_port_3_r)
- AM_RANGE(0xe004, 0xe004) AM_READ(input_port_4_r)
- AM_RANGE(0xe006, 0xe006) AM_READ(input_port_0_r)
- AM_RANGE(0xe008, 0xe008) AM_READ(input_port_1_r)
+ AM_RANGE(0xe000, 0xe000) AM_READ_PORT("P1")
+ AM_RANGE(0xe002, 0xe002) AM_READ_PORT("P2")
+ AM_RANGE(0xe004, 0xe004) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0xe006, 0xe006) AM_READ_PORT("DSW1")
+ AM_RANGE(0xe008, 0xe008) AM_READ_PORT("DSW2")
AM_RANGE(0xe800, 0xefff) AM_READ(SMH_RAM)
AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM)
AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM)
@@ -241,11 +241,11 @@ static ADDRESS_MAP_START( primella_readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xcfff) AM_READ(SMH_RAM)
AM_RANGE(0xd000, 0xd3ff) AM_READ(SMH_RAM)
AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM)
- AM_RANGE(0xf800, 0xf800) AM_READ(input_port_0_r)
- AM_RANGE(0xf810, 0xf810) AM_READ(input_port_1_r)
- AM_RANGE(0xf820, 0xf820) AM_READ(input_port_2_r)
- AM_RANGE(0xf830, 0xf830) AM_READ(input_port_3_r)
- AM_RANGE(0xf840, 0xf840) AM_READ(input_port_4_r)
+ AM_RANGE(0xf800, 0xf800) AM_READ_PORT("DSW1")
+ AM_RANGE(0xf810, 0xf810) AM_READ_PORT("DSW2")
+ AM_RANGE(0xf820, 0xf820) AM_READ_PORT("P1")
+ AM_RANGE(0xf830, 0xf830) AM_READ_PORT("P2")
+ AM_RANGE(0xf840, 0xf840) AM_READ_PORT("SYSTEM")
ADDRESS_MAP_END
static ADDRESS_MAP_START( primella_writemem, ADDRESS_SPACE_PROGRAM, 8 )
@@ -266,9 +266,9 @@ static ADDRESS_MAP_START( rshark_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x040000, 0x04cfff) AM_READ(SMH_RAM)
AM_RANGE(0x04d000, 0x04dfff) AM_READ(SMH_RAM)
AM_RANGE(0x04e000, 0x04ffff) AM_READ(SMH_RAM)
- AM_RANGE(0x0c0002, 0x0c0003) AM_READ(input_port_0_word_r)
- AM_RANGE(0x0c0004, 0x0c0005) AM_READ(input_port_1_word_r)
- AM_RANGE(0x0c0006, 0x0c0007) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x0c0002, 0x0c0003) AM_READ_PORT("DSW")
+ AM_RANGE(0x0c0004, 0x0c0005) AM_READ_PORT("P1_P2")
+ AM_RANGE(0x0c0006, 0x0c0007) AM_READ_PORT("SYSTEM")
ADDRESS_MAP_END
static ADDRESS_MAP_START( rshark_writemem, ADDRESS_SPACE_PROGRAM, 16 )
@@ -292,9 +292,9 @@ static ADDRESS_MAP_START( superx_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0d0000, 0x0dcfff) AM_READ(SMH_RAM)
AM_RANGE(0x0dd000, 0x0ddfff) AM_READ(SMH_RAM)
AM_RANGE(0x0de000, 0x0dffff) AM_READ(SMH_RAM)
- AM_RANGE(0x080002, 0x080003) AM_READ(input_port_0_word_r)
- AM_RANGE(0x080004, 0x080005) AM_READ(input_port_1_word_r)
- AM_RANGE(0x080006, 0x080007) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x080002, 0x080003) AM_READ_PORT("DSW")
+ AM_RANGE(0x080004, 0x080005) AM_READ_PORT("P1_P2")
+ AM_RANGE(0x080006, 0x080007) AM_READ_PORT("SYSTEM")
ADDRESS_MAP_END
static ADDRESS_MAP_START( superx_writemem, ADDRESS_SPACE_PROGRAM, 16 )
@@ -318,9 +318,9 @@ static ADDRESS_MAP_START( popbingo_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x040000, 0x04cfff) AM_READ(SMH_RAM)
AM_RANGE(0x04d000, 0x04dfff) AM_READ(SMH_RAM) // sprites
AM_RANGE(0x04e000, 0x04ffff) AM_READ(SMH_RAM)
- AM_RANGE(0x0c0002, 0x0c0003) AM_READ(input_port_0_word_r)
- AM_RANGE(0x0c0004, 0x0c0005) AM_READ(input_port_1_word_r)
- AM_RANGE(0x0c0006, 0x0c0007) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x0c0002, 0x0c0003) AM_READ_PORT("DSW")
+ AM_RANGE(0x0c0004, 0x0c0005) AM_READ_PORT("P1_P2")
+ AM_RANGE(0x0c0006, 0x0c0007) AM_READ_PORT("SYSTEM")
ADDRESS_MAP_END
static ADDRESS_MAP_START( popbingo_writemem, ADDRESS_SPACE_PROGRAM, 16 )
@@ -401,7 +401,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( dooyongz80_generic )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x02, "Coin Type" )
PORT_DIPSETTING( 0x02, "A" )
@@ -413,25 +413,25 @@ static INPUT_PORTS_START( dooyongz80_generic )
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) )
- PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW1",0x02,PORTCOND_EQUALS,0x02)
- PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW1",0x02,PORTCOND_EQUALS,0x02)
- PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW1",0x02,PORTCOND_EQUALS,0x02)
- PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW1",0x02,PORTCOND_EQUALS,0x02)
- PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) ) PORT_CONDITION("DSW1",0x02,PORTCOND_NOTEQUALS,0x02)
- PORT_DIPSETTING( 0x10, DEF_STR( 3C_1C ) ) PORT_CONDITION("DSW1",0x02,PORTCOND_NOTEQUALS,0x02)
- PORT_DIPSETTING( 0x20, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW1",0x02,PORTCOND_NOTEQUALS,0x02)
- PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW1",0x02,PORTCOND_NOTEQUALS,0x02)
+ PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW1", 0x02, PORTCOND_EQUALS, 0x02)
+ PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW1", 0x02, PORTCOND_EQUALS, 0x02)
+ PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW1", 0x02, PORTCOND_EQUALS, 0x02)
+ PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW1", 0x02, PORTCOND_EQUALS, 0x02)
+ PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) ) PORT_CONDITION("DSW1", 0x02, PORTCOND_NOTEQUALS, 0x02)
+ PORT_DIPSETTING( 0x10, DEF_STR( 3C_1C ) ) PORT_CONDITION("DSW1", 0x02, PORTCOND_NOTEQUALS, 0x02)
+ PORT_DIPSETTING( 0x20, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW1", 0x02, PORTCOND_NOTEQUALS, 0x02)
+ PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW1", 0x02, PORTCOND_NOTEQUALS, 0x02)
PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_B ) )
- PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW1",0x02,PORTCOND_EQUALS,0x02)
- PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW1",0x02,PORTCOND_EQUALS,0x02)
- PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW1",0x02,PORTCOND_EQUALS,0x02)
- PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW1",0x02,PORTCOND_EQUALS,0x02)
- PORT_DIPSETTING( 0xc0, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW1",0x02,PORTCOND_NOTEQUALS,0x02)
- PORT_DIPSETTING( 0x80, DEF_STR( 1C_3C ) ) PORT_CONDITION("DSW1",0x02,PORTCOND_NOTEQUALS,0x02)
- PORT_DIPSETTING( 0x40, DEF_STR( 1C_4C ) ) PORT_CONDITION("DSW1",0x02,PORTCOND_NOTEQUALS,0x02)
- PORT_DIPSETTING( 0x00, DEF_STR( 1C_6C ) ) PORT_CONDITION("DSW1",0x02,PORTCOND_NOTEQUALS,0x02)
-
- PORT_START_TAG("DSW2")
+ PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW1", 0x02, PORTCOND_EQUALS, 0x02)
+ PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW1", 0x02, PORTCOND_EQUALS, 0x02)
+ PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW1", 0x02, PORTCOND_EQUALS, 0x02)
+ PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW1", 0x02, PORTCOND_EQUALS, 0x02)
+ PORT_DIPSETTING( 0xc0, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW1", 0x02, PORTCOND_NOTEQUALS, 0x02)
+ PORT_DIPSETTING( 0x80, DEF_STR( 1C_3C ) ) PORT_CONDITION("DSW1", 0x02, PORTCOND_NOTEQUALS, 0x02)
+ PORT_DIPSETTING( 0x40, DEF_STR( 1C_4C ) ) PORT_CONDITION("DSW1", 0x02, PORTCOND_NOTEQUALS, 0x02)
+ PORT_DIPSETTING( 0x00, DEF_STR( 1C_6C ) ) PORT_CONDITION("DSW1", 0x02, PORTCOND_NOTEQUALS, 0x02)
+
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -455,7 +455,7 @@ static INPUT_PORTS_START( dooyongz80_generic )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -465,7 +465,7 @@ static INPUT_PORTS_START( dooyongz80_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -474,6 +474,16 @@ static INPUT_PORTS_START( dooyongz80_generic )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START("SYSTEM")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE1 )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
/***************************************************************************
@@ -483,7 +493,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( dooyongm68_generic )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0002, 0x0002, "Coin Type" )
PORT_DIPSETTING( 0x0002, "A" )
@@ -495,23 +505,23 @@ static INPUT_PORTS_START( dooyongm68_generic )
PORT_DIPSETTING( 0x0008, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_DIPNAME( 0x0030, 0x0030, DEF_STR( Coin_A ) )
- PORT_DIPSETTING( 0x0010, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW",0x0002,PORTCOND_EQUALS,0x0002)
- PORT_DIPSETTING( 0x0030, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW",0x0002,PORTCOND_EQUALS,0x0002)
- PORT_DIPSETTING( 0x0000, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW",0x0002,PORTCOND_EQUALS,0x0002)
- PORT_DIPSETTING( 0x0020, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW",0x0002,PORTCOND_EQUALS,0x0002)
- PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) ) PORT_CONDITION("DSW",0x0002,PORTCOND_NOTEQUALS,0x0002)
- PORT_DIPSETTING( 0x0010, DEF_STR( 3C_1C ) ) PORT_CONDITION("DSW",0x0002,PORTCOND_NOTEQUALS,0x0002)
- PORT_DIPSETTING( 0x0020, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW",0x0002,PORTCOND_NOTEQUALS,0x0002)
- PORT_DIPSETTING( 0x0030, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW",0x0002,PORTCOND_NOTEQUALS,0x0002)
+ PORT_DIPSETTING( 0x0010, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW", 0x0002, PORTCOND_EQUALS, 0x0002)
+ PORT_DIPSETTING( 0x0030, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW", 0x0002, PORTCOND_EQUALS, 0x0002)
+ PORT_DIPSETTING( 0x0000, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW", 0x0002, PORTCOND_EQUALS, 0x0002)
+ PORT_DIPSETTING( 0x0020, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW", 0x0002, PORTCOND_EQUALS, 0x0002)
+ PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) ) PORT_CONDITION("DSW", 0x0002, PORTCOND_NOTEQUALS, 0x0002)
+ PORT_DIPSETTING( 0x0010, DEF_STR( 3C_1C ) ) PORT_CONDITION("DSW", 0x0002, PORTCOND_NOTEQUALS, 0x0002)
+ PORT_DIPSETTING( 0x0020, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW", 0x0002, PORTCOND_NOTEQUALS, 0x0002)
+ PORT_DIPSETTING( 0x0030, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW", 0x0002, PORTCOND_NOTEQUALS, 0x0002)
PORT_DIPNAME( 0x00c0, 0x00c0, DEF_STR( Coin_B ) )
- PORT_DIPSETTING( 0x0040, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW",0x0002,PORTCOND_EQUALS,0x0002)
- PORT_DIPSETTING( 0x00c0, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW",0x0002,PORTCOND_EQUALS,0x0002)
- PORT_DIPSETTING( 0x0000, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW",0x0002,PORTCOND_EQUALS,0x0002)
- PORT_DIPSETTING( 0x0080, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW",0x0002,PORTCOND_EQUALS,0x0002)
- PORT_DIPSETTING( 0x00c0, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW",0x0002,PORTCOND_NOTEQUALS,0x0002)
- PORT_DIPSETTING( 0x0080, DEF_STR( 1C_3C ) ) PORT_CONDITION("DSW",0x0002,PORTCOND_NOTEQUALS,0x0002)
- PORT_DIPSETTING( 0x0040, DEF_STR( 1C_4C ) ) PORT_CONDITION("DSW",0x0002,PORTCOND_NOTEQUALS,0x0002)
- PORT_DIPSETTING( 0x0000, DEF_STR( 1C_6C ) ) PORT_CONDITION("DSW",0x0002,PORTCOND_NOTEQUALS,0x0002)
+ PORT_DIPSETTING( 0x0040, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW", 0x0002, PORTCOND_EQUALS, 0x0002)
+ PORT_DIPSETTING( 0x00c0, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW", 0x0002, PORTCOND_EQUALS, 0x0002)
+ PORT_DIPSETTING( 0x0000, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW", 0x0002, PORTCOND_EQUALS, 0x0002)
+ PORT_DIPSETTING( 0x0080, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW", 0x0002, PORTCOND_EQUALS, 0x0002)
+ PORT_DIPSETTING( 0x00c0, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW", 0x0002, PORTCOND_NOTEQUALS, 0x0002)
+ PORT_DIPSETTING( 0x0080, DEF_STR( 1C_3C ) ) PORT_CONDITION("DSW", 0x0002, PORTCOND_NOTEQUALS, 0x0002)
+ PORT_DIPSETTING( 0x0040, DEF_STR( 1C_4C ) ) PORT_CONDITION("DSW", 0x0002, PORTCOND_NOTEQUALS, 0x0002)
+ PORT_DIPSETTING( 0x0000, DEF_STR( 1C_6C ) ) PORT_CONDITION("DSW", 0x0002, PORTCOND_NOTEQUALS, 0x0002)
PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0000, "1" )
PORT_DIPSETTING( 0x0200, "2" )
@@ -535,7 +545,7 @@ static INPUT_PORTS_START( dooyongm68_generic )
PORT_DIPSETTING( 0x0000, DEF_STR( No ) )
PORT_DIPSETTING( 0x8000, DEF_STR( Yes ) )
- PORT_START
+ PORT_START("P1_P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -553,7 +563,7 @@ static INPUT_PORTS_START( dooyongm68_generic )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -591,7 +601,7 @@ static INPUT_PORTS_START( lastday )
PORT_DIPSETTING( 0x00, DEF_STR( Low ) )
PORT_DIPSETTING( 0x40, DEF_STR( High ) )
- PORT_START
+ PORT_MODIFY("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
@@ -615,7 +625,7 @@ static INPUT_PORTS_START( gulfstrm )
PORT_DIPSETTING( 0x40, "1" )
PORT_DIPSETTING( 0x00, "2" )
- PORT_START
+ PORT_MODIFY("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -629,7 +639,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( pollux )
PORT_INCLUDE( dooyongz80_generic )
- PORT_START
+ PORT_MODIFY("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -642,16 +652,6 @@ INPUT_PORTS_END
static INPUT_PORTS_START( bluehawk )
PORT_INCLUDE( dooyongz80_generic )
-
- PORT_START
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( flytiger )
@@ -661,16 +661,6 @@ static INPUT_PORTS_START( flytiger )
PORT_DIPNAME( 0x40, 0x40, "Auto Fire" ) /* Mainly (only?) for 3-way charge */
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
-
- PORT_START
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( sadari )
@@ -688,16 +678,6 @@ static INPUT_PORTS_START( sadari )
PORT_DIPNAME( 0x40, 0x40, "Girl Show Point" )
PORT_DIPSETTING( 0x40, "Other Country" )
PORT_DIPSETTING( 0x00, DEF_STR( Asia ) )
-
- PORT_START
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( primella )
@@ -712,16 +692,6 @@ static INPUT_PORTS_START( primella )
PORT_DIPNAME( 0x10, 0x10, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x10, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
-
- PORT_START
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( rshark )
@@ -729,14 +699,14 @@ static INPUT_PORTS_START( rshark )
PORT_MODIFY("DSW")
PORT_DIPNAME( 0x00c0, 0x00c0, DEF_STR( Coin_B ) )
- PORT_DIPSETTING( 0x0040, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW",0x0002,PORTCOND_EQUALS,0x0002)
- PORT_DIPSETTING( 0x00c0, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW",0x0002,PORTCOND_EQUALS,0x0002)
- PORT_DIPSETTING( 0x0000, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW",0x0002,PORTCOND_EQUALS,0x0002)
- PORT_DIPSETTING( 0x0080, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW",0x0002,PORTCOND_EQUALS,0x0002)
- PORT_DIPSETTING( 0x00c0, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW",0x0002,PORTCOND_NOTEQUALS,0x0002)
- PORT_DIPSETTING( 0x0080, DEF_STR( 1C_3C ) ) PORT_CONDITION("DSW",0x0002,PORTCOND_NOTEQUALS,0x0002)
- PORT_DIPSETTING( 0x0040, DEF_STR( 1C_4C ) ) PORT_CONDITION("DSW",0x0002,PORTCOND_NOTEQUALS,0x0002)
- PORT_DIPSETTING( 0x0000, DEF_STR( 1C_6C ) ) PORT_CONDITION("DSW",0x0002,PORTCOND_NOTEQUALS,0x0002)
+ PORT_DIPSETTING( 0x0040, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW", 0x0002, PORTCOND_EQUALS, 0x0002)
+ PORT_DIPSETTING( 0x00c0, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW", 0x0002, PORTCOND_EQUALS, 0x0002)
+ PORT_DIPSETTING( 0x0000, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW", 0x0002, PORTCOND_EQUALS, 0x0002)
+ PORT_DIPSETTING( 0x0080, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW", 0x0002, PORTCOND_EQUALS, 0x0002)
+ PORT_DIPSETTING( 0x00c0, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW", 0x0002, PORTCOND_NOTEQUALS, 0x0002)
+ PORT_DIPSETTING( 0x0080, DEF_STR( 1C_3C ) ) PORT_CONDITION("DSW", 0x0002, PORTCOND_NOTEQUALS, 0x0002)
+ PORT_DIPSETTING( 0x0040, DEF_STR( 1C_4C ) ) PORT_CONDITION("DSW", 0x0002, PORTCOND_NOTEQUALS, 0x0002)
+ PORT_DIPSETTING( 0x0000, DEF_STR( 1C_6C ) ) PORT_CONDITION("DSW", 0x0002, PORTCOND_NOTEQUALS, 0x0002)
INPUT_PORTS_END
static INPUT_PORTS_START( superx )
@@ -747,7 +717,6 @@ static INPUT_PORTS_START( popbingo )
PORT_INCLUDE( dooyongm68_generic )
PORT_MODIFY("DSW")
-
PORT_DIPNAME( 0x0004, 0x0000, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0004, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/dorachan.c b/src/mame/drivers/dorachan.c
index 1ff3f7b4470..3d95c654b02 100644
--- a/src/mame/drivers/dorachan.c
+++ b/src/mame/drivers/dorachan.c
@@ -134,10 +134,10 @@ static ADDRESS_MAP_START( dorachan_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x17ff) AM_ROM
AM_RANGE(0x1800, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x23ff) AM_ROM
- AM_RANGE(0x2400, 0x2400) AM_MIRROR(0x03ff) AM_READ(input_port_0_r)
- AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x03ff) AM_READ(input_port_1_r)
- AM_RANGE(0x2c00, 0x2c00) AM_MIRROR(0x03ff) AM_READ(input_port_2_r)
- AM_RANGE(0x3800, 0x3800) AM_MIRROR(0x03ff) AM_READ(input_port_3_r)
+ AM_RANGE(0x2400, 0x2400) AM_MIRROR(0x03ff) AM_READ_PORT("PROT")
+ AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x03ff) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0x2c00, 0x2c00) AM_MIRROR(0x03ff) AM_READ_PORT("JOY")
+ AM_RANGE(0x3800, 0x3800) AM_MIRROR(0x03ff) AM_READ_PORT("V128")
AM_RANGE(0x4000, 0x5fff) AM_RAM AM_BASE(&dorachan_videoram) AM_SIZE(&dorachan_videoram_size)
AM_RANGE(0x6000, 0x77ff) AM_ROM
ADDRESS_MAP_END
@@ -166,10 +166,10 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( dorachan )
- PORT_START
+ PORT_START("PROT")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(dorachan_protection_r, 0)
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
@@ -185,7 +185,7 @@ static INPUT_PORTS_START( dorachan )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("JOY")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
@@ -195,7 +195,7 @@ static INPUT_PORTS_START( dorachan )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
- PORT_START
+ PORT_START("V128")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(dorachan_v128_r, 0)
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/dotrikun.c b/src/mame/drivers/dotrikun.c
index ca245a3416f..1a3b88333ae 100644
--- a/src/mame/drivers/dotrikun.c
+++ b/src/mame/drivers/dotrikun.c
@@ -40,7 +40,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READ(input_port_0_r)
+ AM_RANGE(0x00, 0x00) AM_READ_PORT("INPUTS")
ADDRESS_MAP_END
static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 )
@@ -50,7 +50,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( dotrikun )
- PORT_START
+ PORT_START("INPUTS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
diff --git a/src/mame/drivers/dragrace.c b/src/mame/drivers/dragrace.c
index 1facf09ee77..54c993298da 100644
--- a/src/mame/drivers/dragrace.c
+++ b/src/mame/drivers/dragrace.c
@@ -194,7 +194,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( dragrace )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Player 1 Gas") PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) /* player 1 gear 1 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) /* player 1 gear 2 */
@@ -207,7 +207,7 @@ static INPUT_PORTS_START( dragrace )
PORT_DIPSETTING( 0x40, "4.9 seconds" )
PORT_DIPSETTING( 0xc0, "Never" )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Player 2 Gas") PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) /* player 2 gear 1 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) /* player 2 gear 2 */
@@ -219,7 +219,7 @@ static INPUT_PORTS_START( dragrace )
PORT_DIPSETTING( 0x80, "4" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) /* IN0 connects here */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED ) /* IN1 connects here */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -232,30 +232,30 @@ static INPUT_PORTS_START( dragrace )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
- PORT_START_TAG("DIAL1") /* IN3 */
+ PORT_START("DIAL1") /* IN3 */
PORT_BIT( 0xff, 0x00, IPT_DIAL_V ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("DIAL2") /* IN4 */
+ PORT_START("DIAL2") /* IN4 */
PORT_BIT( 0xff, 0x00, IPT_DIAL_V ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("P1") /* IN5 */
+ PORT_START("P1") /* IN5 */
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Player 1 Gear 1") PORT_PLAYER(1)
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Player 1 Gear 2") PORT_PLAYER(1)
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Player 1 Gear 3") PORT_PLAYER(1)
PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Player 1 Gear 4") PORT_PLAYER(1)
PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("Player 1 Neutral") PORT_PLAYER(1)
- PORT_START_TAG("P2") /* IN6 */
+ PORT_START("P2") /* IN6 */
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Player 2 Gear 1") PORT_PLAYER(2)
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Player 2 Gear 2") PORT_PLAYER(2)
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Player 2 Gear 3") PORT_PLAYER(2)
PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Player 2 Gear 4") PORT_PLAYER(2)
PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("Player 2 Neutral") PORT_PLAYER(2)
- PORT_START_TAG("MOTOR1")
+ PORT_START("MOTOR1")
PORT_ADJUSTER( 81, "Motor 1 RPM" )
- PORT_START_TAG("MOTOR2")
+ PORT_START("MOTOR2")
PORT_ADJUSTER( 85, "Motor 2 RPM" )
INPUT_PORTS_END
diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c
index 8dede86688a..6a39a3a15cb 100644
--- a/src/mame/drivers/dreamwld.c
+++ b/src/mame/drivers/dreamwld.c
@@ -190,16 +190,9 @@ static READ32_HANDLER( dreamwld_protdata_r )
}
-static READ32_HANDLER( dreamwld_inputs_r )
-{
- return input_port_read(machine, "IN1")|(input_port_read(machine, "IN0")<<16);
-}
-
static READ32_HANDLER( dreamwld_dips_r )
{
- int x;
- x= input_port_read(machine, "DSW");
- return x|(x<<16);
+ return input_port_read(machine, "DSW") | (input_port_read(machine, "DSW")<<16);
}
static WRITE32_HANDLER( dreamwld_palette_w )
@@ -295,7 +288,7 @@ static ADDRESS_MAP_START( dreamwld_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x802000, 0x803fff) AM_RAM_WRITE(dreamwld_bg2_videoram_w ) AM_BASE( &dreamwld_bg2_videoram )
AM_RANGE(0x804000, 0x805fff) AM_RAM AM_BASE( &dreamwld_bg_scroll ) // scroll regs etc.
- AM_RANGE(0xc00000, 0xc00003) AM_READ(dreamwld_inputs_r)
+ AM_RANGE(0xc00000, 0xc00003) AM_READ_PORT("INPUTS")
AM_RANGE(0xc00004, 0xc00007) AM_READ(dreamwld_dips_r)
@@ -313,71 +306,70 @@ ADDRESS_MAP_END
static INPUT_PORTS_START(dreamwld)
- PORT_START_TAG("IN0")
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
- PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
-
- PORT_START_TAG("IN1")
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_DIPNAME( 0x0004, 0x0004, "Not Dips?" ) // i don't think these are dips, they're probably just unused parts of the coin port input
- PORT_DIPSETTING( 0x0004, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x0008, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x0010, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x0020, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x0040, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x0100, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x0200, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x0400, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x0800, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x1000, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x2000, 0x2000, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x2000, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x4000, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
-
- PORT_START_TAG("DSW") /* 16bit */
+ PORT_START("INPUTS") /* 32bit */
+ PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_COIN1 )
+ PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_COIN2 )
+ PORT_DIPNAME( 0x00000004, 0x00000004, "Not Dips?" ) // i don't think these are dips, they're probably just unused parts of the coin port input
+ PORT_DIPSETTING( 0x00000004, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x00000008, 0x00000008, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x00000008, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x00000010, 0x00000010, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x00000010, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x00000020, 0x00000020, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x00000020, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x00000040, 0x00000040, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x00000040, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x00000080, 0x00000080, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x00000080, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x00000100, 0x00000100, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x00000100, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x00000200, 0x00000200, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x00000200, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x00000400, 0x00000400, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x00000400, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x00000800, 0x00000800, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x00000800, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x00001000, 0x00001000, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x00001000, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x00002000, 0x00002000, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x00002000, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x00004000, 0x00004000, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x00004000, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x00008000, 0x00008000, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x00008000, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
+
+ PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_START2 )
+ PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
+ PORT_BIT( 0x00040000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
+ PORT_BIT( 0x00080000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
+ PORT_BIT( 0x00100000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
+ PORT_BIT( 0x00200000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
+ PORT_BIT( 0x00400000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
+ PORT_BIT( 0x00800000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
+ PORT_BIT( 0x01000000, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_BIT( 0x02000000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
+ PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
+ PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
+ PORT_BIT( 0x10000000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
+ PORT_BIT( 0x20000000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
+ PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
+ PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
+
+ PORT_START("DSW") /* 16bit */
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x0001, "1" )
PORT_DIPSETTING( 0x0003, "2" )
diff --git a/src/mame/drivers/drgnmst.c b/src/mame/drivers/drgnmst.c
index 2e37690cc1f..2d36d0fea0c 100644
--- a/src/mame/drivers/drgnmst.c
+++ b/src/mame/drivers/drgnmst.c
@@ -173,16 +173,16 @@ static READ8_HANDLER( PIC16C5X_T0_clk_r )
static ADDRESS_MAP_START( drgnmst_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
- AM_RANGE(0x800000, 0x800001) AM_READ(input_port_0_word_r)
- AM_RANGE(0x800018, 0x800019) AM_READ(input_port_1_word_r)
- AM_RANGE(0x80001a, 0x80001b) AM_READ(input_port_2_word_r)
- AM_RANGE(0x80001c, 0x80001d) AM_READ(input_port_3_word_r)
+ AM_RANGE(0x800000, 0x800001) AM_READ_PORT("P1_P2")
+ AM_RANGE(0x800018, 0x800019) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0x80001a, 0x80001b) AM_READ_PORT("DSW1")
+ AM_RANGE(0x80001c, 0x80001d) AM_READ_PORT("DSW2")
AM_RANGE(0x800030, 0x800031) AM_WRITE(drgnmst_coin_w)
AM_RANGE(0x800100, 0x80011f) AM_WRITE(SMH_RAM) AM_BASE(&drgnmst_vidregs)
AM_RANGE(0x800120, 0x800121) AM_WRITENOP
AM_RANGE(0x80014a, 0x80014b) AM_WRITENOP
AM_RANGE(0x800154, 0x800155) AM_WRITE(SMH_RAM) AM_BASE(&drgnmst_vidregs2) // seems to be priority control
- AM_RANGE(0x800176, 0x800177) AM_READ(input_port_4_word_r)
+ AM_RANGE(0x800176, 0x800177) AM_READ_PORT("EXTRA")
AM_RANGE(0x800180, 0x800181) AM_WRITE(drgnmst_snd_command_w)
AM_RANGE(0x800188, 0x800189) AM_WRITE(drgnmst_snd_flag_w)
AM_RANGE(0x8001e0, 0x8001e1) AM_WRITENOP
@@ -213,7 +213,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( drgnmst )
- PORT_START
+ PORT_START("P1_P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -231,7 +231,7 @@ static INPUT_PORTS_START( drgnmst )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -241,7 +241,7 @@ static INPUT_PORTS_START( drgnmst )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0700, 0x0700, DEF_STR( Coinage ) )
/* PORT_DIPSETTING( 0x0300, DEF_STR( Off ) ) */
PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) )
@@ -267,7 +267,7 @@ static INPUT_PORTS_START( drgnmst )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0700, 0x0400, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0700, DEF_STR( Easiest ) )
PORT_DIPSETTING( 0x0600, DEF_STR( Easier ) )
@@ -291,7 +291,7 @@ static INPUT_PORTS_START( drgnmst )
PORT_DIPSETTING( 0x0000, "Red" )
PORT_SERVICE( 0x8000, IP_ACTIVE_LOW )
- PORT_START
+ PORT_START("EXTRA")
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_PLAYER(1)
diff --git a/src/mame/drivers/dribling.c b/src/mame/drivers/dribling.c
index fd6b532674b..b8bbe15c6ad 100644
--- a/src/mame/drivers/dribling.c
+++ b/src/mame/drivers/dribling.c
@@ -250,7 +250,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( dribling )
- PORT_START_TAG("MUX0") /* IN0 (mux 0) */
+ PORT_START("MUX0") /* IN0 (mux 0) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_PLAYER(1)
@@ -260,7 +260,7 @@ static INPUT_PORTS_START( dribling )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_PLAYER(1)
- PORT_START_TAG("MUX1") /* IN0 (mux 1) */
+ PORT_START("MUX1") /* IN0 (mux 1) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_PLAYER(2)
@@ -270,7 +270,7 @@ static INPUT_PORTS_START( dribling )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_PLAYER(2)
- PORT_START_TAG("MUX2") /* IN0 (mux 2) */
+ PORT_START("MUX2") /* IN0 (mux 2) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -278,7 +278,7 @@ static INPUT_PORTS_START( dribling )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
diff --git a/src/mame/drivers/drmicro.c b/src/mame/drivers/drmicro.c
index 1c095c973ab..1c3dd35c237 100644
--- a/src/mame/drivers/drmicro.c
+++ b/src/mame/drivers/drmicro.c
@@ -89,10 +89,10 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READ(input_port_0_r)
- AM_RANGE(0x01, 0x01) AM_READ(input_port_1_r)
- AM_RANGE(0x03, 0x03) AM_READ(input_port_2_r)
- AM_RANGE(0x04, 0x04) AM_READ(input_port_3_r)
+ AM_RANGE(0x00, 0x00) AM_READ_PORT("P1")
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("P2")
+ AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW1")
+ AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW2")
AM_RANGE(0x05, 0x05) AM_READ(SMH_NOP) // unused?
ADDRESS_MAP_END
@@ -109,7 +109,7 @@ ADDRESS_MAP_END
/****************************************************************************/
static INPUT_PORTS_START( drmicro )
- PORT_START // 1P (0)
+ PORT_START("P1")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -119,7 +119,7 @@ static INPUT_PORTS_START( drmicro )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
- PORT_START // 2P (1)
+ PORT_START("P2")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START1 )
@@ -129,7 +129,7 @@ static INPUT_PORTS_START( drmicro )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2)
- PORT_START // DSW1 (2)
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "3" )
@@ -151,7 +151,7 @@ static INPUT_PORTS_START( drmicro )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START // DSW2 (3)
+ PORT_START("DSW2")
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x06, DEF_STR( 3C_1C ) )
@@ -162,7 +162,6 @@ static INPUT_PORTS_START( drmicro )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 1C_5C ) )
PORT_BIT( 0xf8, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // 4-8
-
INPUT_PORTS_END
/****************************************************************************/
diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c
index 39d53f01abf..4bdf72e9ab7 100644
--- a/src/mame/drivers/drtomy.c
+++ b/src/mame/drivers/drtomy.c
@@ -136,10 +136,10 @@ static ADDRESS_MAP_START( drtomy_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE(drtomy_vram_bg_w) AM_BASE(&drtomy_videoram_bg) /* Video RAM BG */
AM_RANGE(0x200000, 0x2007ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) /* Palette */
AM_RANGE(0x440000, 0x440fff) AM_RAM AM_BASE(&drtomy_spriteram) /* Sprite RAM */
- AM_RANGE(0x700000, 0x700001) AM_READ(input_port_0_word_r) /* DIPSW #1 */
- AM_RANGE(0x700002, 0x700003) AM_READ(input_port_1_word_r) /* DIPSW #2 */
- AM_RANGE(0x700004, 0x700005) AM_READ(input_port_2_word_r) /* INPUT #1 */
- AM_RANGE(0x700006, 0x700007) AM_READ(input_port_3_word_r) /* INPUT #2 */
+ AM_RANGE(0x700000, 0x700001) AM_READ_PORT("DSW1")
+ AM_RANGE(0x700002, 0x700003) AM_READ_PORT("DSW2")
+ AM_RANGE(0x700004, 0x700005) AM_READ_PORT("P1")
+ AM_RANGE(0x700006, 0x700007) AM_READ_PORT("P2")
AM_RANGE(0x70000c, 0x70000d) AM_WRITE(drtomy_okibank_w) /* OKI banking */
AM_RANGE(0x70000e, 0x70000f) AM_READWRITE(OKIM6295_status_0_lsb_r, OKIM6295_data_0_lsb_w) /* OKI 6295*/
AM_RANGE(0xffc000, 0xffffff) AM_RAM /* Work RAM */
@@ -175,7 +175,7 @@ GFXDECODE_END
static INPUT_PORTS_START( drtomy )
- PORT_START /* DSW #1 */
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0a, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x07, DEF_STR( 3C_2C ) )
@@ -201,7 +201,7 @@ static INPUT_PORTS_START( drtomy )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ) )
- PORT_START /* DSW #2 */
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, "Time" )
PORT_DIPSETTING( 0x00, "Less" )
PORT_DIPSETTING( 0x01, "More" )
@@ -225,7 +225,7 @@ static INPUT_PORTS_START( drtomy )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* 1P INPUTS & COINSW */
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1)
@@ -235,7 +235,7 @@ static INPUT_PORTS_START( drtomy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START /* 2P INPUTS & STARTSW */
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c
index 0d54f458476..967e8d65197 100644
--- a/src/mame/drivers/dunhuang.c
+++ b/src/mame/drivers/dunhuang.c
@@ -442,7 +442,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( dunhuang )
- PORT_START_TAG("DSW1") /* IN0 - DSW1 */
+ PORT_START("DSW1") /* IN0 - DSW1 */
PORT_DIPNAME( 0x0f, 0x0f, "Main Game Chance (%)" ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x00, "78" )
PORT_DIPSETTING( 0x01, "80" )
@@ -472,7 +472,7 @@ static INPUT_PORTS_START( dunhuang )
PORT_DIPSETTING( 0x80, "Keys" )
PORT_DIPSETTING( 0x00, "Payout" )
- PORT_START_TAG("DSW2") /* IN1 - DSW2 */
+ PORT_START("DSW2") /* IN1 - DSW2 */
PORT_DIPUNKNOWN_DIPLOC( 0x01, 0x01, "SW2:1" )
PORT_DIPNAME( 0x06, 0x06, "Credits Per Coin" ) PORT_DIPLOCATION("SW2:2,3")
PORT_DIPSETTING( 0x06, "1" )
@@ -493,7 +493,7 @@ static INPUT_PORTS_START( dunhuang )
PORT_DIPSETTING( 0x80, "1000" )
PORT_DIPSETTING( 0xc0, "3000" )
- PORT_START_TAG("DSW3") /* IN2 - DSW3 */
+ PORT_START("DSW3") /* IN2 - DSW3 */
PORT_DIPNAME( 0x03, 0x03, "Min Bet" ) PORT_DIPLOCATION("SW3:1,2")
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -515,7 +515,7 @@ static INPUT_PORTS_START( dunhuang )
PORT_DIPSETTING( 0x80, "5" )
PORT_DIPSETTING( 0xc0, "6" )
- PORT_START_TAG("DSW4") /* IN3 - DSW4 */
+ PORT_START("DSW4") /* IN3 - DSW4 */
PORT_DIPNAME( 0x07, 0x07, "Credits Limit" ) PORT_DIPLOCATION("SW4:1,2,3")
PORT_DIPSETTING( 0x07, "2k" )
PORT_DIPSETTING( 0x06, "3k" )
@@ -541,7 +541,7 @@ static INPUT_PORTS_START( dunhuang )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START_TAG("DSW5") /* IN4 - DSW5 */
+ PORT_START("DSW5") /* IN4 - DSW5 */
PORT_DIPNAME( 0x03, 0x03, "Douple Up Chance (%)" ) PORT_DIPLOCATION("SW5:1,2")
PORT_DIPSETTING( 0x00, "50" )
PORT_DIPSETTING( 0x01, "60" )
@@ -565,7 +565,7 @@ static INPUT_PORTS_START( dunhuang )
PORT_DIPSETTING( 0x80, "Strong" )
PORT_DIPSETTING( 0x00, "Weak" )
- PORT_START_TAG("SERVICE") /* IN5 - SERVICE */
+ PORT_START("SERVICE") /* IN5 - SERVICE */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE3 ) // clear (during boot)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE2 ) // book
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) // test (in game: dips, during boot: service mode)
@@ -575,7 +575,7 @@ static INPUT_PORTS_START( dunhuang )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) // 0 = tiles block transferrer busy
- PORT_START_TAG("IN0") /* IN6 - P1 */
+ PORT_START("IN0") /* IN6 - P1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
@@ -585,7 +585,7 @@ static INPUT_PORTS_START( dunhuang )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN7 - P1 */
+ PORT_START("IN1") /* IN7 - P1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
@@ -595,7 +595,7 @@ static INPUT_PORTS_START( dunhuang )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN8 - P1 */
+ PORT_START("IN2") /* IN8 - P1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
@@ -605,7 +605,7 @@ static INPUT_PORTS_START( dunhuang )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* IN9 - P1 */
+ PORT_START("IN3") /* IN9 - P1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
@@ -615,7 +615,7 @@ static INPUT_PORTS_START( dunhuang )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN4") /* IN10 - P1 */
+ PORT_START("IN4") /* IN10 - P1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c
index e1fa630693a..54c79178ead 100644
--- a/src/mame/drivers/dwarfd.c
+++ b/src/mame/drivers/dwarfd.c
@@ -374,13 +374,13 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x40, 0x40) AM_WRITENOP // unknown
AM_RANGE(0x60, 0x60) AM_WRITE(output1_w)
AM_RANGE(0x80, 0x80) AM_WRITE(output2_w)
- AM_RANGE(0xc0, 0xc0) AM_READ(input_port_0_r)
- AM_RANGE(0xc1, 0xc1) AM_READ(input_port_1_r)
+ AM_RANGE(0xc0, 0xc0) AM_READ_PORT("DSW1")
+ AM_RANGE(0xc1, 0xc1) AM_READ_PORT("DSW2")
ADDRESS_MAP_END
static INPUT_PORTS_START( dwarfd )
- PORT_START /* 8bit */
+ PORT_START("DSW1") /* 8bit */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -406,7 +406,7 @@ static INPUT_PORTS_START( dwarfd )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* 8bit */
+ PORT_START("DSW2") /* 8bit */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -432,7 +432,7 @@ static INPUT_PORTS_START( dwarfd )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Zap 1") PORT_CODE(KEYCODE_Z) //z1 zap 1
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Zap 2") PORT_CODE(KEYCODE_X) //z2 zap 2
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Zap 3") PORT_CODE(KEYCODE_C) //z3 zap 3
@@ -443,7 +443,7 @@ static INPUT_PORTS_START( dwarfd )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Bet x2") PORT_CODE(KEYCODE_D) //x2 bet x2
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -452,7 +452,6 @@ static INPUT_PORTS_START( dwarfd )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Replace") PORT_CODE(KEYCODE_F) //rp replace
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Take") PORT_CODE(KEYCODE_G) //tk take
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Unzap") PORT_CODE(KEYCODE_N) //uz unzap
-
INPUT_PORTS_END
diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c
index d1180a3a3cb..74b50a8833d 100644
--- a/src/mame/drivers/dynadice.c
+++ b/src/mame/drivers/dynadice.c
@@ -72,9 +72,9 @@ static ADDRESS_MAP_START( dynadice_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static ADDRESS_MAP_START( dynadice_io_map, ADDRESS_SPACE_IO, 8 )
- AM_RANGE(0x50, 0x50) AM_READ(input_port_0_r)
- AM_RANGE(0x51, 0x51) AM_READ(input_port_1_r)
- AM_RANGE(0x52, 0x52) AM_READ(input_port_2_r)
+ AM_RANGE(0x50, 0x50) AM_READ_PORT("IN0")
+ AM_RANGE(0x51, 0x51) AM_READ_PORT("IN1")
+ AM_RANGE(0x52, 0x52) AM_READ_PORT("DSW")
AM_RANGE(0x62, 0x62) AM_WRITE(SMH_NOP)
AM_RANGE(0x63, 0x63) AM_WRITE(soundlatch_w)
AM_RANGE(0x70, 0x77) AM_WRITE(SMH_NOP)
@@ -94,21 +94,19 @@ static ADDRESS_MAP_START( dynadice_sound_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( dynadice )
-
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_DIPNAME( 0x02, 0x02, "Initialize NVRAM" )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-
PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) /* increase number of coins */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* decrease number of coins */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 ) /* start /stop */
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x1c, 0x1c, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ))
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ))
@@ -134,7 +132,6 @@ static INPUT_PORTS_START( dynadice )
PORT_DIPNAME( 0x80, 0x80, "DSW 1-7" )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-
INPUT_PORTS_END
static const gfx_layout charlayout =
diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c
index b4368d9be41..d990499304c 100644
--- a/src/mame/drivers/dynax.c
+++ b/src/mame/drivers/dynax.c
@@ -1446,7 +1446,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( MAHJONG_KEYS )
/* Keyboard 1 */
- PORT_START_TAG("KEY0")
+ PORT_START("KEY0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_PLAYER(1)
@@ -1454,7 +1454,7 @@ static INPUT_PORTS_START( MAHJONG_KEYS )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(1)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_PLAYER(1)
@@ -1462,7 +1462,7 @@ static INPUT_PORTS_START( MAHJONG_KEYS )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_PLAYER(1)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) PORT_PLAYER(1)
@@ -1470,7 +1470,7 @@ static INPUT_PORTS_START( MAHJONG_KEYS )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(1)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_PLAYER(1)
@@ -1478,7 +1478,7 @@ static INPUT_PORTS_START( MAHJONG_KEYS )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY4")
+ PORT_START("KEY4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) PORT_PLAYER(1) // "l"
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1487,7 +1487,7 @@ static INPUT_PORTS_START( MAHJONG_KEYS )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
/* Keyboard 2 */
- PORT_START_TAG("KEY5")
+ PORT_START("KEY5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_PLAYER(2)
@@ -1495,7 +1495,7 @@ static INPUT_PORTS_START( MAHJONG_KEYS )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("KEY6")
+ PORT_START("KEY6")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_PLAYER(2)
@@ -1503,7 +1503,7 @@ static INPUT_PORTS_START( MAHJONG_KEYS )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY7")
+ PORT_START("KEY7")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) PORT_PLAYER(2)
@@ -1511,7 +1511,7 @@ static INPUT_PORTS_START( MAHJONG_KEYS )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY8")
+ PORT_START("KEY8")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_PLAYER(2)
@@ -1519,7 +1519,7 @@ static INPUT_PORTS_START( MAHJONG_KEYS )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY9")
+ PORT_START("KEY9")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) PORT_PLAYER(2) // "l"
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1530,7 +1530,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( MAHJONG_KEYS_BET )
/* Keyboard 1 */
- PORT_START_TAG("KEY0")
+ PORT_START("KEY0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_PLAYER(1)
@@ -1538,7 +1538,7 @@ static INPUT_PORTS_START( MAHJONG_KEYS_BET )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(1)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_PLAYER(1)
@@ -1546,7 +1546,7 @@ static INPUT_PORTS_START( MAHJONG_KEYS_BET )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_PLAYER(1)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) PORT_PLAYER(1)
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) PORT_PLAYER(1)
@@ -1554,7 +1554,7 @@ static INPUT_PORTS_START( MAHJONG_KEYS_BET )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(1)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_PLAYER(1)
@@ -1562,7 +1562,7 @@ static INPUT_PORTS_START( MAHJONG_KEYS_BET )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY4")
+ PORT_START("KEY4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) PORT_PLAYER(1) // "l"
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) PORT_PLAYER(1) // "t"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) PORT_PLAYER(1) // "w"
@@ -1571,7 +1571,7 @@ static INPUT_PORTS_START( MAHJONG_KEYS_BET )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) PORT_PLAYER(1) // "s"
/* Keyboard 2 */
- PORT_START_TAG("KEY5")
+ PORT_START("KEY5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_PLAYER(2)
@@ -1579,7 +1579,7 @@ static INPUT_PORTS_START( MAHJONG_KEYS_BET )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("KEY6")
+ PORT_START("KEY6")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_PLAYER(2)
@@ -1587,7 +1587,7 @@ static INPUT_PORTS_START( MAHJONG_KEYS_BET )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) PORT_PLAYER(2)
- PORT_START_TAG("KEY7")
+ PORT_START("KEY7")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) PORT_PLAYER(2)
@@ -1595,7 +1595,7 @@ static INPUT_PORTS_START( MAHJONG_KEYS_BET )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY8")
+ PORT_START("KEY8")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_PLAYER(2)
@@ -1603,7 +1603,7 @@ static INPUT_PORTS_START( MAHJONG_KEYS_BET )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY9")
+ PORT_START("KEY9")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) PORT_PLAYER(2) // "l"
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) PORT_PLAYER(2) // "t"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) PORT_PLAYER(2) // "w"
@@ -1614,7 +1614,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( HANAFUDA_KEYS )
/* Keyboard 1 */
- PORT_START_TAG("KEY0")
+ PORT_START("KEY0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("1") PORT_CODE(KEYCODE_1_PAD)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("5") PORT_CODE(KEYCODE_5_PAD)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1622,7 +1622,7 @@ static INPUT_PORTS_START( HANAFUDA_KEYS )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("2") PORT_CODE(KEYCODE_2_PAD)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("6") PORT_CODE(KEYCODE_6_PAD)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1630,7 +1630,7 @@ static INPUT_PORTS_START( HANAFUDA_KEYS )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("3") PORT_CODE(KEYCODE_3_PAD)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("7") PORT_CODE(KEYCODE_7_PAD)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1638,7 +1638,7 @@ static INPUT_PORTS_START( HANAFUDA_KEYS )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("4") PORT_CODE(KEYCODE_4_PAD)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("8") PORT_CODE(KEYCODE_8_PAD)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1646,7 +1646,7 @@ static INPUT_PORTS_START( HANAFUDA_KEYS )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY4")
+ PORT_START("KEY4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) // "l"
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1655,7 +1655,7 @@ static INPUT_PORTS_START( HANAFUDA_KEYS )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
/* Keyboard 2 */
- PORT_START_TAG("KEY5")
+ PORT_START("KEY5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_PLAYER(2)
@@ -1663,7 +1663,7 @@ static INPUT_PORTS_START( HANAFUDA_KEYS )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("KEY6")
+ PORT_START("KEY6")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_PLAYER(2)
@@ -1671,7 +1671,7 @@ static INPUT_PORTS_START( HANAFUDA_KEYS )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY7")
+ PORT_START("KEY7")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) PORT_PLAYER(2)
@@ -1679,7 +1679,7 @@ static INPUT_PORTS_START( HANAFUDA_KEYS )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY8")
+ PORT_START("KEY8")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_PLAYER(2)
@@ -1687,7 +1687,7 @@ static INPUT_PORTS_START( HANAFUDA_KEYS )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY9")
+ PORT_START("KEY9")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) PORT_PLAYER(2) // "l"
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1698,7 +1698,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( HANAFUDA_KEYS_BET )
/* Keyboard 1 */
- PORT_START_TAG("KEY0")
+ PORT_START("KEY0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("1") PORT_CODE(KEYCODE_1_PAD)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("5") PORT_CODE(KEYCODE_5_PAD)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1706,7 +1706,7 @@ static INPUT_PORTS_START( HANAFUDA_KEYS_BET )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("2") PORT_CODE(KEYCODE_2_PAD)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("6") PORT_CODE(KEYCODE_6_PAD)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1714,7 +1714,7 @@ static INPUT_PORTS_START( HANAFUDA_KEYS_BET )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("3") PORT_CODE(KEYCODE_3_PAD)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("7") PORT_CODE(KEYCODE_7_PAD)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1722,7 +1722,7 @@ static INPUT_PORTS_START( HANAFUDA_KEYS_BET )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("4") PORT_CODE(KEYCODE_4_PAD)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("8") PORT_CODE(KEYCODE_8_PAD)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1730,7 +1730,7 @@ static INPUT_PORTS_START( HANAFUDA_KEYS_BET )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY4")
+ PORT_START("KEY4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) PORT_PLAYER(1) // "l"
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) PORT_PLAYER(1) // "t"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) PORT_PLAYER(1) // "w"
@@ -1739,7 +1739,7 @@ static INPUT_PORTS_START( HANAFUDA_KEYS_BET )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) PORT_PLAYER(1) // "s"
/* Keyboard 2 */
- PORT_START_TAG("KEY5")
+ PORT_START("KEY5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_PLAYER(2)
@@ -1747,7 +1747,7 @@ static INPUT_PORTS_START( HANAFUDA_KEYS_BET )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("KEY6")
+ PORT_START("KEY6")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_PLAYER(2)
@@ -1755,7 +1755,7 @@ static INPUT_PORTS_START( HANAFUDA_KEYS_BET )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) PORT_PLAYER(2)
- PORT_START_TAG("KEY7")
+ PORT_START("KEY7")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) PORT_PLAYER(2)
@@ -1763,7 +1763,7 @@ static INPUT_PORTS_START( HANAFUDA_KEYS_BET )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY8")
+ PORT_START("KEY8")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_PLAYER(2)
@@ -1771,7 +1771,7 @@ static INPUT_PORTS_START( HANAFUDA_KEYS_BET )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY9")
+ PORT_START("KEY9")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) PORT_PLAYER(2) // "l"
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) PORT_PLAYER(2) // "t"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) PORT_PLAYER(2) // "w"
@@ -1782,7 +1782,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( hanamai )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1806,7 +1806,7 @@ static INPUT_PORTS_START( hanamai )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1832,7 +1832,7 @@ static INPUT_PORTS_START( hanamai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1)
@@ -1846,7 +1846,7 @@ static INPUT_PORTS_START( hanamai )
INPUT_PORTS_END
static INPUT_PORTS_START( hnkochou )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1872,7 +1872,7 @@ static INPUT_PORTS_START( hnkochou )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1898,7 +1898,7 @@ static INPUT_PORTS_START( hnkochou )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 ) // Pay
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW ) // Test (there isn't a dip switch)
@@ -1913,7 +1913,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( hnoridur )
- PORT_START_TAG("DSW0") /* note that these are in reverse order wrt the others */
+ PORT_START("DSW0") /* note that these are in reverse order wrt the others */
PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_2C ) )
@@ -1935,7 +1935,7 @@ static INPUT_PORTS_START( hnoridur )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1961,7 +1961,7 @@ static INPUT_PORTS_START( hnoridur )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1)
@@ -1973,7 +1973,7 @@ static INPUT_PORTS_START( hnoridur )
PORT_INCLUDE( HANAFUDA_KEYS )
- PORT_START_TAG("DSW2") /* IN13 */
+ PORT_START("DSW2") /* IN13 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1999,7 +1999,7 @@ static INPUT_PORTS_START( hnoridur )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* IN14 */
+ PORT_START("DSW3") /* IN14 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2028,7 +2028,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( sprtmtch )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -2038,7 +2038,7 @@ static INPUT_PORTS_START( sprtmtch )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -2048,7 +2048,7 @@ static INPUT_PORTS_START( sprtmtch )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(10)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(10)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2058,7 +2058,7 @@ static INPUT_PORTS_START( sprtmtch )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
@@ -2082,7 +2082,7 @@ static INPUT_PORTS_START( sprtmtch )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x04, DEF_STR( Difficulty ) ) // Time
PORT_DIPSETTING( 0x00, "1 (Easy)" )
PORT_DIPSETTING( 0x01, "2" )
@@ -2109,7 +2109,7 @@ static INPUT_PORTS_START( sprtmtch )
INPUT_PORTS_END
static INPUT_PORTS_START( mjfriday )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
@@ -2132,7 +2132,7 @@ static INPUT_PORTS_START( mjfriday )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "Auto TSUMO" )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x01, DEF_STR( Yes ) )
@@ -2158,7 +2158,7 @@ static INPUT_PORTS_START( mjfriday )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) // "17B"
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // "18B"
PORT_SERVICE(0x04, IP_ACTIVE_LOW ) // Test (there isn't a dip switch)
@@ -2173,7 +2173,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mjdialq2 )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
@@ -2198,7 +2198,7 @@ static INPUT_PORTS_START( mjdialq2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x07, "Time Setting" )
PORT_DIPSETTING( 0x07, "08:30" )
PORT_DIPSETTING( 0x06, "09:00" )
@@ -2224,7 +2224,7 @@ static INPUT_PORTS_START( mjdialq2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) // "17B"
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // "18B"
PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW) // Test (there isn't a dip switch)
@@ -2239,7 +2239,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( yarunara )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -2263,7 +2263,7 @@ static INPUT_PORTS_START( yarunara )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "PINFU with TSUMO" )
PORT_DIPSETTING( 0x01, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
@@ -2287,7 +2287,7 @@ static INPUT_PORTS_START( yarunara )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) // "17B"
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // "18B"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1)
@@ -2301,7 +2301,7 @@ static INPUT_PORTS_START( yarunara )
INPUT_PORTS_END
static INPUT_PORTS_START( hanayara )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -2325,7 +2325,7 @@ static INPUT_PORTS_START( hanayara )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "PINFU with TSUMO" )
PORT_DIPSETTING( 0x01, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
@@ -2349,7 +2349,7 @@ static INPUT_PORTS_START( hanayara )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) // "17B"
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // "18B"
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1)
@@ -2363,7 +2363,7 @@ static INPUT_PORTS_START( hanayara )
INPUT_PORTS_END
static INPUT_PORTS_START( quiztvqq )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -2387,7 +2387,7 @@ static INPUT_PORTS_START( quiztvqq )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Unknown 2-0&1" )
PORT_DIPSETTING( 0x03, "0" )
PORT_DIPSETTING( 0x02, "1" )
@@ -2410,7 +2410,7 @@ static INPUT_PORTS_START( quiztvqq )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) // Test, during boot
@@ -2421,7 +2421,7 @@ static INPUT_PORTS_START( quiztvqq )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
/* Keyboard 1 */
- PORT_START_TAG("KEY0")
+ PORT_START("KEY0")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -2429,17 +2429,17 @@ static INPUT_PORTS_START( quiztvqq )
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY4")
+ PORT_START("KEY4")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNKNOWN )
/* Keyboard 2 */
- PORT_START_TAG("KEY5")
+ PORT_START("KEY5")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
@@ -2447,19 +2447,19 @@ static INPUT_PORTS_START( quiztvqq )
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("KEY6")
+ PORT_START("KEY6")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY7")
+ PORT_START("KEY7")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY8")
+ PORT_START("KEY8")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY9")
+ PORT_START("KEY9")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( mcnpshnt )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2483,7 +2483,7 @@ static INPUT_PORTS_START( mcnpshnt )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x07, "Time Setting" )
PORT_DIPSETTING( 0x07, "8:30" )
PORT_DIPSETTING( 0x06, "9:00" )
@@ -2510,7 +2510,7 @@ static INPUT_PORTS_START( mcnpshnt )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) // Test
@@ -2525,7 +2525,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( nanajign )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
@@ -2550,7 +2550,7 @@ static INPUT_PORTS_START( nanajign )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2574,7 +2574,7 @@ static INPUT_PORTS_START( nanajign )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) // Test
@@ -2586,7 +2586,7 @@ static INPUT_PORTS_START( nanajign )
PORT_INCLUDE( MAHJONG_KEYS )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2615,7 +2615,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( jantouki )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x07, "0" ) // 0 6 2
PORT_DIPSETTING( 0x06, "1" ) // 0 6 1
@@ -2640,7 +2640,7 @@ static INPUT_PORTS_START( jantouki )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x07, "Time Setting" )
PORT_DIPSETTING( 0x07, "08:30" )
PORT_DIPSETTING( 0x06, "09:00" )
@@ -2669,7 +2669,7 @@ static INPUT_PORTS_START( jantouki )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW )
@@ -2679,7 +2679,7 @@ static INPUT_PORTS_START( jantouki )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("KEY0")
+ PORT_START("KEY0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
@@ -2687,7 +2687,7 @@ static INPUT_PORTS_START( jantouki )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN)
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
@@ -2695,7 +2695,7 @@ static INPUT_PORTS_START( jantouki )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
@@ -2703,7 +2703,7 @@ static INPUT_PORTS_START( jantouki )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
@@ -2711,7 +2711,7 @@ static INPUT_PORTS_START( jantouki )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY4")
+ PORT_START("KEY4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2722,7 +2722,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mjelct3 )
- PORT_START_TAG("DSW2") /* 7c21 (select = 00) */
+ PORT_START("DSW2") /* 7c21 (select = 00) */
PORT_DIPNAME( 0x03, 0x03, "Difficulty?" )
PORT_DIPSETTING( 0x03, "0" ) // 20
PORT_DIPSETTING( 0x00, "1" ) // 32
@@ -2745,7 +2745,7 @@ static INPUT_PORTS_START( mjelct3 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* 7c20 (select = 40) */
+ PORT_START("DSW1") /* 7c20 (select = 40) */
PORT_DIPNAME( 0x0f, 0x07, "Pay Out Rate" )
PORT_DIPSETTING( 0x00, "50" )
PORT_DIPSETTING( 0x01, "53" )
@@ -2775,7 +2775,7 @@ static INPUT_PORTS_START( mjelct3 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE4 ) // Pay
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // 18B
PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) // Test
@@ -2787,7 +2787,7 @@ static INPUT_PORTS_START( mjelct3 )
PORT_INCLUDE( MAHJONG_KEYS_BET )
- PORT_START_TAG("DSW3") /* 7c22 (select = 80) */
+ PORT_START("DSW3") /* 7c22 (select = 80) */
PORT_DIPNAME( 0x07, 0x07, "YAKUMAN Bonus" )
PORT_DIPSETTING( 0x07, "Cut" )
PORT_DIPSETTING( 0x06, "1 T" )
@@ -2813,7 +2813,7 @@ static INPUT_PORTS_START( mjelct3 )
PORT_DIPSETTING( 0x80, "None (Part 2)" )
PORT_DIPSETTING( 0x00, "Super Express (Part 3)" )
- PORT_START_TAG("DSW4") /* 7c23 (select = c0) */
+ PORT_START("DSW4") /* 7c23 (select = c0) */
PORT_DIPNAME( 0x01, 0x01, "Last Chance" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -2839,7 +2839,7 @@ static INPUT_PORTS_START( mjelct3 )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("FAKE") /* IN10 - Fake DSW */
+ PORT_START("FAKE") /* IN10 - Fake DSW */
PORT_DIPNAME( 0xff, 0xff, "Allow Bets" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0xff, DEF_STR( On ) )
@@ -2847,7 +2847,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mjelctrn )
- PORT_START_TAG("DSW2") /* 7c21 (select = 00) */
+ PORT_START("DSW2") /* 7c21 (select = 00) */
PORT_DIPNAME( 0x03, 0x03, "Difficulty?" )
PORT_DIPSETTING( 0x03, "0" ) // 20
PORT_DIPSETTING( 0x00, "1" ) // 32
@@ -2870,7 +2870,7 @@ static INPUT_PORTS_START( mjelctrn )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* 7c20 (select = 40) */
+ PORT_START("DSW1") /* 7c20 (select = 40) */
PORT_DIPNAME( 0x0f, 0x07, "Pay Out Rate" )
PORT_DIPSETTING( 0x00, "50" )
PORT_DIPSETTING( 0x01, "53" )
@@ -2900,7 +2900,7 @@ static INPUT_PORTS_START( mjelctrn )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE4 ) // Pay
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // 18B
PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) // Test
@@ -2912,7 +2912,7 @@ static INPUT_PORTS_START( mjelctrn )
PORT_INCLUDE( MAHJONG_KEYS_BET )
- PORT_START_TAG("DSW3") /* 7c22 (select = 80) */
+ PORT_START("DSW3") /* 7c22 (select = 80) */
PORT_DIPNAME( 0x07, 0x07, "YAKUMAN Bonus" )
PORT_DIPSETTING( 0x07, "Cut" )
PORT_DIPSETTING( 0x06, "1 T" )
@@ -2938,7 +2938,7 @@ static INPUT_PORTS_START( mjelctrn )
PORT_DIPSETTING( 0x80, "None (Part 2)" )
PORT_DIPSETTING( 0x00, "???? (Part 4)" )
- PORT_START_TAG("DSW4") // 7c23 (select = c0)
+ PORT_START("DSW4") // 7c23 (select = c0)
PORT_DIPNAME( 0x01, 0x01, "Last Chance" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -2964,7 +2964,7 @@ static INPUT_PORTS_START( mjelctrn )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("FAKE") /* IN10 - Fake DSW */
+ PORT_START("FAKE") /* IN10 - Fake DSW */
PORT_DIPNAME( 0xff, 0xff, "Allow Bets" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0xff, DEF_STR( On ) )
@@ -2972,7 +2972,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( majxtal7 )
- PORT_START_TAG("DSW2") /* select = 00 */
+ PORT_START("DSW2") /* select = 00 */
PORT_DIPNAME( 0x03, 0x03, "Difficulty?" )
PORT_DIPSETTING( 0x03, "0" ) // 20
PORT_DIPSETTING( 0x00, "1" ) // 32
@@ -2995,7 +2995,7 @@ static INPUT_PORTS_START( majxtal7 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* select = 40 */
+ PORT_START("DSW1") /* select = 40 */
PORT_DIPNAME( 0x0f, 0x07, "Pay Out Rate" )
PORT_DIPSETTING( 0x00, "50" )
PORT_DIPSETTING( 0x01, "53" )
@@ -3025,7 +3025,7 @@ static INPUT_PORTS_START( majxtal7 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE4 ) // Pay
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // 18B
PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) // Test
@@ -3037,7 +3037,7 @@ static INPUT_PORTS_START( majxtal7 )
PORT_INCLUDE( MAHJONG_KEYS_BET )
- PORT_START_TAG("DSW3") /* select = 80 */
+ PORT_START("DSW3") /* select = 80 */
PORT_DIPNAME( 0x07, 0x07, "YAKUMAN Bonus" )
PORT_DIPSETTING( 0x07, "Cut" )
PORT_DIPSETTING( 0x06, "1 T" )
@@ -3063,7 +3063,7 @@ static INPUT_PORTS_START( majxtal7 )
PORT_DIPSETTING( 0x80, "X-Tal" )
PORT_DIPSETTING( 0x00, "Diamond" )
- PORT_START_TAG("DSW4") /* select = c0 */
+ PORT_START("DSW4") /* select = c0 */
PORT_DIPNAME( 0x01, 0x01, "Last Chance" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -3089,14 +3089,14 @@ static INPUT_PORTS_START( majxtal7 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("FAKE") /* IN10 - Fake DSW */
+ PORT_START("FAKE") /* IN10 - Fake DSW */
PORT_DIPNAME( 0xff, 0xff, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0xff, DEF_STR( On ) )
INPUT_PORTS_END
static INPUT_PORTS_START( neruton )
- PORT_START_TAG("DSW2") /* 6a77 (select = 00) */
+ PORT_START("DSW2") /* 6a77 (select = 00) */
PORT_DIPNAME( 0x07, 0x07, "Time Setting" )
PORT_DIPSETTING( 0x07, "08:30" )
PORT_DIPSETTING( 0x06, "09:00" )
@@ -3120,7 +3120,7 @@ static INPUT_PORTS_START( neruton )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW1") /* 6a76 (select = 40) */
+ PORT_START("DSW1") /* 6a76 (select = 40) */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
@@ -3145,7 +3145,7 @@ static INPUT_PORTS_START( neruton )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) // 17B
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // 18B
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) // Test
@@ -3158,14 +3158,14 @@ static INPUT_PORTS_START( neruton )
PORT_INCLUDE( MAHJONG_KEYS )
/* 2008-06 FP: the following are needed to make happy the read handlers shared with mjelctrn*/
- PORT_START_TAG("DSW3")
- PORT_START_TAG("DSW4")
- PORT_START_TAG("FAKE")
+ PORT_START("DSW3")
+ PORT_START("DSW4")
+ PORT_START("FAKE")
INPUT_PORTS_END
static INPUT_PORTS_START( tenkai )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x0f, 0x07, "Pay Out Rate" )
PORT_DIPSETTING( 0x00, "50" )
PORT_DIPSETTING( 0x01, "53" )
@@ -3194,7 +3194,7 @@ static INPUT_PORTS_START( tenkai )
PORT_DIPSETTING( 0x40, "10" )
PORT_DIPSETTING( 0x00, "20" )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Unknown 1-0&1" )
PORT_DIPSETTING( 0x03, "1:1" )
PORT_DIPSETTING( 0x02, "1:2" )
@@ -3218,7 +3218,7 @@ static INPUT_PORTS_START( tenkai )
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x80, "2" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, "Unknown 2-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3244,7 +3244,7 @@ static INPUT_PORTS_START( tenkai )
PORT_DIPSETTING( 0x80, "Start" )
PORT_DIPSETTING( 0x00, "Flip Flop" )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3270,7 +3270,7 @@ static INPUT_PORTS_START( tenkai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW4") /* (top) */
+ PORT_START("DSW4") /* (top) */
PORT_DIPNAME( 0x01, 0x01, "Credits Per Note" )
PORT_DIPSETTING( 0x01, "5" )
PORT_DIPSETTING( 0x00, "10" )
@@ -3296,7 +3296,7 @@ static INPUT_PORTS_START( tenkai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE4 ) // Pay
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // 18B
PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) // Test
@@ -3311,7 +3311,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mjreach )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x0f, 0x07, "Pay Out Rate" )
PORT_DIPSETTING( 0x00, "50" )
PORT_DIPSETTING( 0x01, "53" )
@@ -3340,7 +3340,7 @@ static INPUT_PORTS_START( mjreach )
PORT_DIPSETTING( 0x40, "10" )
PORT_DIPSETTING( 0x00, "20" )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Unknown 1-0&1" )
PORT_DIPSETTING( 0x03, "1:1" )
PORT_DIPSETTING( 0x02, "1:2" )
@@ -3364,7 +3364,7 @@ static INPUT_PORTS_START( mjreach )
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x80, "2" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, "Unknown 2-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3390,7 +3390,7 @@ static INPUT_PORTS_START( mjreach )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3416,7 +3416,7 @@ static INPUT_PORTS_START( mjreach )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW4") /* 4 (top) */
+ PORT_START("DSW4") /* 4 (top) */
PORT_DIPNAME( 0x01, 0x01, "Credits Per Note" )
PORT_DIPSETTING( 0x01, "5" )
PORT_DIPSETTING( 0x00, "10" )
@@ -3441,7 +3441,7 @@ static INPUT_PORTS_START( mjreach )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE4 ) // Pay
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // 18B
PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) // Test
@@ -3455,7 +3455,7 @@ static INPUT_PORTS_START( mjreach )
INPUT_PORTS_END
static INPUT_PORTS_START( htengoku )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE4 ) // medal out
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1)
@@ -3467,7 +3467,7 @@ static INPUT_PORTS_START( htengoku )
PORT_INCLUDE( HANAFUDA_KEYS_BET )
- PORT_START_TAG("DSW0") /* IN11 - DSW1 */
+ PORT_START("DSW0") /* IN11 - DSW1 */
PORT_DIPNAME( 0x01, 0x01, "Show Girls" )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x01, DEF_STR( Yes ) )
@@ -3493,7 +3493,7 @@ static INPUT_PORTS_START( htengoku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* IN12 - DSW2 */
+ PORT_START("DSW1") /* IN12 - DSW2 */
PORT_DIPNAME( 0x07, 0x05, "Payout Rate" )
PORT_DIPSETTING( 0x00, "Lowest" )
PORT_DIPSETTING( 0x01, "Lower" )
@@ -3518,7 +3518,7 @@ static INPUT_PORTS_START( htengoku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* IN13 - DSW3 */
+ PORT_START("DSW2") /* IN13 - DSW3 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
@@ -3541,7 +3541,7 @@ static INPUT_PORTS_START( htengoku )
PORT_DIPSETTING( 0x40, "3000" )
PORT_DIPSETTING( 0x00, "5000" )
- PORT_START_TAG("DSW3") /* IN14 - DSW4 */
+ PORT_START("DSW3") /* IN14 - DSW4 */
PORT_DIPNAME( 0x03, 0x03, "Odds For Goko" )
PORT_DIPSETTING( 0x03, "100" )
PORT_DIPSETTING( 0x02, "200" )
@@ -3564,7 +3564,7 @@ static INPUT_PORTS_START( htengoku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW4") /* IN15 - DSWs top bits */
+ PORT_START("DSW4") /* IN15 - DSWs top bits */
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x02, "Set Clock" )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
diff --git a/src/mame/drivers/dynduke.c b/src/mame/drivers/dynduke.c
index c5816372af0..64664a200b4 100644
--- a/src/mame/drivers/dynduke.c
+++ b/src/mame/drivers/dynduke.c
@@ -19,6 +19,47 @@
Emulation by Bryan McPhail, mish@tendril.co.uk
+
+ SW#1
+ --------------------------------------------------------------------
+ DESCRIPTION 1 2 3 4 5 6 7 8
+ --------------------------------------------------------------------
+ COIN MODE MODE 1 OFF
+ MODE 2 ON
+ --------------------------------------------------------------------
+ COIN/CREDIT*
+ MODE #1 1C/1P OFF OFF OFF OFF
+ 2C/1P ON OFF OFF OFF
+ 3C/1P OFF ON OFF OFF
+ 4C/1P ON ON OFF OFF
+ FREE PLAY ON ON ON ON
+ MODE #2
+ COIN A 1C/1P OFF OFF
+ 2C/1P ON OFF
+ 3C/1P OFF ON
+ 5C/1P ON ON
+ COIN B 1C/2P OFF OFF
+ 1C/3P ON OFF
+ 1C/5P OFF ON
+ 1C/6P ON ON
+ --------------------------------------------------------------------
+ STARTING COIN NORMAL OFF
+ X2 ON
+ --------------------------------------------------------------------
+ CABINET TYPE TABLE ON
+ UPRIGHT OFF
+ --------------------------------------------------------------------
+ VIDEO SCREEN NORMAL OFF
+ FLIP ON
+ --------------------------------------------------------------------
+ FACTORY SETTINGS OFF OFF OFF OFF OFF OFF OFF OFF
+ --------------------------------------------------------------------
+
+
+2008-07
+Dip locations and factory settings verified with dip listing
+Also, implemented conditional port for Coin Mode (SW1:1)
+
***************************************************************************/
#include "driver.h"
@@ -46,8 +87,8 @@ static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x07000, 0x07fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size)
AM_RANGE(0x08000, 0x080ff) AM_RAM AM_BASE(&dynduke_scroll_ram)
AM_RANGE(0x0a000, 0x0afff) AM_RAM AM_SHARE(1)
- AM_RANGE(0x0b000, 0x0b001) AM_READ(input_port_1_word_r)
- AM_RANGE(0x0b002, 0x0b003) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x0b000, 0x0b001) AM_READ_PORT("P1_P2")
+ AM_RANGE(0x0b002, 0x0b003) AM_READ_PORT("DSW")
AM_RANGE(0x0b004, 0x0b005) AM_WRITENOP
AM_RANGE(0x0b006, 0x0b007) AM_WRITE(dynduke_control_w)
AM_RANGE(0x0c000, 0x0c7ff) AM_RAM_WRITE(dynduke_text_w) AM_BASE(&videoram16)
@@ -74,8 +115,8 @@ static ADDRESS_MAP_START( masterj_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x09000, 0x0900d) AM_READWRITE(seibu_main_word_r, seibu_main_word_w)
AM_RANGE(0x0c000, 0x0c0ff) AM_RAM AM_BASE(&dynduke_scroll_ram)
AM_RANGE(0x0e000, 0x0efff) AM_RAM AM_SHARE(1)
- AM_RANGE(0x0f000, 0x0f001) AM_READ(input_port_1_word_r)
- AM_RANGE(0x0f002, 0x0f003) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x0f000, 0x0f001) AM_READ_PORT("P1_P2")
+ AM_RANGE(0x0f002, 0x0f003) AM_READ_PORT("DSW")
AM_RANGE(0x0f004, 0x0f005) AM_WRITENOP
AM_RANGE(0x0f006, 0x0f007) AM_WRITE(dynduke_control_w)
AM_RANGE(0xa0000, 0xfffff) AM_ROM
@@ -86,7 +127,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( dynduke )
SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */
- PORT_START_TAG("IN0")
+ PORT_START("P1_P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -104,80 +145,53 @@ static INPUT_PORTS_START( dynduke )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- /*
- SW#1
- --------------------------------------------------------------------
- DESCRIPTION 1 2 3 4 5 6 7 8
- --------------------------------------------------------------------
- COIN MODE MODE 1 OFF
- MODE 2 ON
- --------------------------------------------------------------------
- COIN/CREDIT*
- MODE #1 1C/1P OFF OFF OFF OFF
- 2C/1P ON OFF OFF OFF
- 3C/1P OFF ON OFF OFF
- 4C/1P ON ON OFF OFF
- FREE PLAY ON ON ON ON
- MODE #2
- COIN A 1C/1P OFF OFF
- 2C/1P ON OFF
- 3C/1P OFF ON
- 5C/1P ON ON
- COIN B 1C/2P OFF OFF
- 1C/3P ON OFF
- 1C/5P OFF ON
- 1C/6P ON ON
- --------------------------------------------------------------------
- STARTING COIN NORMAL OFF
- X2 ON
- --------------------------------------------------------------------
- CABINET TYPE TABLE ON
- UPRIGHT OFF
- --------------------------------------------------------------------
- VIDEO SCREEN NORMAL OFF
- FLIP ON
- --------------------------------------------------------------------
- FACTORY SETTINGS OFF OFF OFF OFF OFF OFF OFF OFF
- --------------------------------------------------------------------
- */
- PORT_START_TAG("DSW")
- PORT_DIPNAME( 0x0007, 0x0006, DEF_STR( Coin_A ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) )
- PORT_DIPSETTING( 0x0002, DEF_STR( 3C_1C ) )
- PORT_DIPSETTING( 0x0004, DEF_STR( 2C_1C ) )
- PORT_DIPSETTING( 0x0006, DEF_STR( 1C_1C ) )
- PORT_DIPNAME( 0x0018, 0x0008, DEF_STR( Coin_B ) )
- PORT_DIPSETTING( 0x0018, DEF_STR( 1C_2C ) )
- PORT_DIPSETTING( 0x0010, DEF_STR( 1C_3C ) )
- PORT_DIPSETTING( 0x0008, DEF_STR( 1C_5C ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( 1C_6C ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( Free_Play ) )
- PORT_DIPNAME( 0x0020, 0x0020, "Starting Coin" )
- PORT_DIPSETTING( 0x0020, DEF_STR( Normal ) )
- PORT_DIPSETTING( 0x0000, "X 2" )
- PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x0040, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Flip_Screen ) )
- PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_BIT( 0x0300, 0x0300, IPT_UNUSED )
- PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Bonus_Life ) )
- PORT_DIPSETTING( 0x0c00, "80K 100K+" )
- PORT_DIPSETTING( 0x0800, "100K 100K+" )
- PORT_DIPSETTING( 0x0400, "120K 100K+" )
- PORT_DIPSETTING( 0x0000, "120K 120K+" )
- PORT_DIPNAME( 0x3000, 0x3000, DEF_STR( Difficulty ) )
- PORT_DIPSETTING( 0x3000, DEF_STR( Normal ) )
- PORT_DIPSETTING( 0x2000, DEF_STR( Easy ) )
- PORT_DIPSETTING( 0x1000, DEF_STR( Hard ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( Hardest ) )
- PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Allow_Continue ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x4000, DEF_STR( On ) )
- PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Demo_Sounds ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x8000, DEF_STR( On ) )
+ PORT_START("DSW")
+ PORT_DIPNAME( 0x0001, 0x0001, "Coin Mode" ) PORT_DIPLOCATION("SW1:1")
+ PORT_DIPSETTING( 0x0001, "Mode 1" )
+ PORT_DIPSETTING( 0x0000, "Mode 2" )
+ PORT_DIPNAME( 0x0006, 0x0006, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:2,3") PORT_CONDITION("DSW", 0x0001, PORTCOND_EQUALS, 0x0000)
+ PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) )
+ PORT_DIPSETTING( 0x0002, DEF_STR( 3C_1C ) )
+ PORT_DIPSETTING( 0x0004, DEF_STR( 2C_1C ) )
+ PORT_DIPSETTING( 0x0006, DEF_STR( 1C_1C ) )
+ PORT_DIPNAME( 0x0018, 0x0008, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:4,5") PORT_CONDITION("DSW", 0x0001, PORTCOND_EQUALS, 0x0000)
+ PORT_DIPSETTING( 0x0018, DEF_STR( 1C_2C ) )
+ PORT_DIPSETTING( 0x0010, DEF_STR( 1C_3C ) )
+ PORT_DIPSETTING( 0x0008, DEF_STR( 1C_5C ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( 1C_6C ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( Free_Play ) )
+ PORT_DIPNAME( 0x001e, 0x001e, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:2,3,4,5") PORT_CONDITION("DSW", 0x0001, PORTCOND_EQUALS, 0x0001)
+ PORT_DIPSETTING( 0x0018, DEF_STR( 4C_1C ) )
+ PORT_DIPSETTING( 0x001a, DEF_STR( 3C_1C ) )
+ PORT_DIPSETTING( 0x001c, DEF_STR( 2C_1C ) )
+ PORT_DIPSETTING( 0x001e, DEF_STR( 1C_1C ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( Free_Play ) )
+ PORT_DIPNAME( 0x0020, 0x0020, "Starting Coin" ) PORT_DIPLOCATION("SW1:6")
+ PORT_DIPSETTING( 0x0020, DEF_STR( Normal ) )
+ PORT_DIPSETTING( 0x0000, "X 2" )
+ PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:7")
+ PORT_DIPSETTING( 0x0040, DEF_STR( Upright ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( Cocktail ) )
+ PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:8")
+ PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_BIT( 0x0300, 0x0300, IPT_UNUSED ) /* "SW2:1,2" - Always OFF according to the manual */
+ PORT_DIPNAME( 0x0c00, 0x0400, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:3,4")
+ PORT_DIPSETTING( 0x0c00, "80K 100K+" )
+ PORT_DIPSETTING( 0x0800, "100K 100K+" )
+ PORT_DIPSETTING( 0x0400, "120K 100K+" )
+ PORT_DIPSETTING( 0x0000, "120K 120K+" )
+ PORT_DIPNAME( 0x3000, 0x3000, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:5,6")
+ PORT_DIPSETTING( 0x3000, DEF_STR( Normal ) )
+ PORT_DIPSETTING( 0x2000, DEF_STR( Easy ) )
+ PORT_DIPSETTING( 0x1000, DEF_STR( Hard ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( Hardest ) )
+ PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW2:7")
+ PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x4000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8")
+ PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x8000, DEF_STR( On ) )
INPUT_PORTS_END
/* Graphics Layouts */
diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c
index 60bd409cc03..afa01289ba5 100644
--- a/src/mame/drivers/egghunt.c
+++ b/src/mame/drivers/egghunt.c
@@ -204,12 +204,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READ(input_port_0_r)
- AM_RANGE(0x01, 0x01) AM_READ(input_port_1_r)
- AM_RANGE(0x02, 0x02) AM_READ(input_port_2_r)
- AM_RANGE(0x03, 0x03) AM_READ(input_port_3_r)
- AM_RANGE(0x04, 0x04) AM_READ(input_port_4_r)
- AM_RANGE(0x06, 0x06) AM_READ(input_port_5_r)
+ AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW1")
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0x02, 0x02) AM_READ_PORT("P1")
+ AM_RANGE(0x03, 0x03) AM_READ_PORT("P2")
+ AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW2")
+ AM_RANGE(0x06, 0x06) AM_READ_PORT("UNK")
ADDRESS_MAP_END
static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 )
@@ -238,7 +238,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( egghunt )
- PORT_START /* 8bit */
+ PORT_START("DSW1") /* 8bit */
PORT_DIPNAME( 0x01, 0x01, "Debug Mode" ) // Run all the animations
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -264,7 +264,7 @@ static INPUT_PORTS_START( egghunt )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* 8bit */
+ PORT_START("SYSTEM") /* 8bit */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -274,7 +274,7 @@ static INPUT_PORTS_START( egghunt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START /* IN1 */
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -284,7 +284,7 @@ static INPUT_PORTS_START( egghunt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
@@ -294,7 +294,7 @@ static INPUT_PORTS_START( egghunt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
- PORT_START /* 8bit */
+ PORT_START("DSW2") /* 8bit */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -320,7 +320,7 @@ static INPUT_PORTS_START( egghunt )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START /* 8bit */
+ PORT_START("UNK") /* 8bit */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/embargo.c b/src/mame/drivers/embargo.c
index bc4c2bbd263..b6c4bc23913 100644
--- a/src/mame/drivers/embargo.c
+++ b/src/mame/drivers/embargo.c
@@ -168,10 +168,10 @@ ADDRESS_MAP_END
*************************************/
static ADDRESS_MAP_START( main_io_map, ADDRESS_SPACE_IO, 8 )
- AM_RANGE(0x01, 0x01) AM_READWRITE(input_port_0_r, port_1_w)
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("IN0") AM_WRITE(port_1_w)
AM_RANGE(0x02, 0x02) AM_READWRITE(dial_r, port_2_w)
AM_RANGE(0x03, 0x03) AM_WRITE(SMH_NOP) /* always 0xFE */
- AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ(input_port_2_r)
+ AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ_PORT("IN2")
AM_RANGE(S2650_CTRL_PORT, S2650_CTRL_PORT) AM_READWRITE(input_port_bit_r, input_select_w)
ADDRESS_MAP_END
@@ -185,14 +185,14 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( embargo )
- PORT_START_TAG("IN0") /* port 0x01 */
+ PORT_START("IN0") /* port 0x01 */
PORT_DIPNAME( 0x03, 0x00, "Rounds" )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
PORT_DIPSETTING( 0x02, "5" )
PORT_DIPSETTING( 0x03, "6" )
- PORT_START_TAG("IN1") /* S2650_CONTROL_PORT */
+ PORT_START("IN1") /* S2650_CONTROL_PORT */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START3 )
@@ -202,19 +202,19 @@ static INPUT_PORTS_START( embargo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
- PORT_START_TAG("IN2") /* S2650_DATA_PORT */
+ PORT_START("IN2") /* S2650_DATA_PORT */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("DIAL0")
+ PORT_START("DIAL0")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(8) PORT_PLAYER(1)
- PORT_START_TAG("DIAL1")
+ PORT_START("DIAL1")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(8) PORT_PLAYER(2)
- PORT_START_TAG("DIAL2")
+ PORT_START("DIAL2")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(8) PORT_PLAYER(3)
- PORT_START_TAG("DIAL3")
+ PORT_START("DIAL3")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(8) PORT_PLAYER(4)
INPUT_PORTS_END
diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c
index 37bc15ee5c9..1e8b634c3d8 100644
--- a/src/mame/drivers/enigma2.c
+++ b/src/mame/drivers/enigma2.c
@@ -409,8 +409,8 @@ static ADDRESS_MAP_START( engima2_main_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0x4fff) AM_ROM AM_WRITENOP
AM_RANGE(0x5000, 0x57ff) AM_READWRITE(dip_switch_r, SMH_NOP)
AM_RANGE(0x5800, 0x5800) AM_MIRROR(0x07f8) AM_NOP
- AM_RANGE(0x5801, 0x5801) AM_MIRROR(0x07f8) AM_READWRITE(input_port_0_r, SMH_NOP)
- AM_RANGE(0x5802, 0x5802) AM_MIRROR(0x07f8) AM_READWRITE(input_port_1_r, SMH_NOP)
+ AM_RANGE(0x5801, 0x5801) AM_MIRROR(0x07f8) AM_READ_PORT("IN0") AM_WRITENOP
+ AM_RANGE(0x5802, 0x5802) AM_MIRROR(0x07f8) AM_READ_PORT("IN1") AM_WRITENOP
AM_RANGE(0x5803, 0x5803) AM_MIRROR(0x07f8) AM_READWRITE(SMH_NOP, sound_data_w)
AM_RANGE(0x5804, 0x5804) AM_MIRROR(0x07f8) AM_NOP
AM_RANGE(0x5805, 0x5805) AM_MIRROR(0x07f8) AM_READWRITE(SMH_NOP, enigma2_flip_screen_w)
@@ -430,8 +430,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( engima2a_main_cpu_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7)
AM_RANGE(0x00, 0x00) AM_NOP
- AM_RANGE(0x01, 0x01) AM_READWRITE(input_port_0_r, SMH_NOP)
- AM_RANGE(0x02, 0x02) AM_READWRITE(input_port_1_r, SMH_NOP)
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("IN0") AM_WRITENOP
+ AM_RANGE(0x02, 0x02) AM_READ_PORT("IN1") AM_WRITENOP
AM_RANGE(0x03, 0x03) AM_READWRITE(SMH_NOP, sound_data_w)
AM_RANGE(0x04, 0x04) AM_NOP
AM_RANGE(0x05, 0x05) AM_READWRITE(SMH_NOP, enigma2_flip_screen_w)
@@ -453,21 +453,21 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( enigma2 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x78, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(p1_controls_r, 0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x78, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(p2_controls_r, 0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -490,14 +490,14 @@ static INPUT_PORTS_START( enigma2 )
PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
- PORT_START_TAG("P1CONTROLS")
+ PORT_START("P1CONTROLS")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("P2CONTROLS")
+ PORT_START("P2CONTROLS")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
@@ -507,7 +507,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( enigma2a )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -515,7 +515,7 @@ static INPUT_PORTS_START( enigma2a )
PORT_BIT( 0x70, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(p1_controls_r, 0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -523,7 +523,7 @@ static INPUT_PORTS_START( enigma2a )
PORT_BIT( 0x70, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(p2_controls_r, 0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -546,13 +546,13 @@ static INPUT_PORTS_START( enigma2a )
PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
- PORT_START_TAG("P1CONTROLS")
+ PORT_START("P1CONTROLS")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0xf8, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("P2CONTROLS")
+ PORT_START("P2CONTROLS")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c
index 011678042b7..3806cd12c7a 100644
--- a/src/mame/drivers/eolith.c
+++ b/src/mame/drivers/eolith.c
@@ -131,7 +131,7 @@ static ADDRESS_MAP_START( eolith_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xfc000000, 0xfc000003) AM_READ(eolith_custom_r)
AM_RANGE(0xfc400000, 0xfc400003) AM_WRITE(systemcontrol_w)
AM_RANGE(0xfc800000, 0xfc800003) AM_WRITENOP // sound latch
- AM_RANGE(0xfca00000, 0xfca00003) AM_READ(input_port_1_dword_r)
+ AM_RANGE(0xfca00000, 0xfca00003) AM_READ_PORT("DSW1")
AM_RANGE(0xfcc00000, 0xfcc0005b) AM_WRITENOP // crt registers ?
// hidden catch 3 touch screen inputs
@@ -147,7 +147,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( common )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -175,7 +175,7 @@ static INPUT_PORTS_START( common )
PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_BIT( 0xffffffff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/eolith16.c b/src/mame/drivers/eolith16.c
index 6c066654e0f..b7c3632a1f4 100644
--- a/src/mame/drivers/eolith16.c
+++ b/src/mame/drivers/eolith16.c
@@ -45,7 +45,7 @@ static WRITE16_HANDLER( eeprom_w )
static READ16_HANDLER( eolith16_custom_r )
{
eolith_speedup_read();
- return (input_port_read(machine, "IN0") & ~0x10) | (eeprom_read_bit() << 4);
+ return (input_port_read(machine, "SPECIAL") & ~0x10) | (eeprom_read_bit() << 4);
}
@@ -68,19 +68,19 @@ static ADDRESS_MAP_START( eolith16_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffe40000, 0xffe40001) AM_READWRITE(OKIM6295_status_0_lsb_r, OKIM6295_data_0_lsb_w)
AM_RANGE(0xffe80000, 0xffe80001) AM_WRITE(eeprom_w)
AM_RANGE(0xffea0000, 0xffea0001) AM_READ(eolith16_custom_r)
- AM_RANGE(0xffea0002, 0xffea0003) AM_READ(input_port_1_word_r)
+ AM_RANGE(0xffea0002, 0xffea0003) AM_READ_PORT("SYSTEM")
AM_RANGE(0xffec0000, 0xffec0001) AM_READNOP // not used?
- AM_RANGE(0xffec0002, 0xffec0003) AM_READ(input_port_2_word_r)
+ AM_RANGE(0xffec0002, 0xffec0003) AM_READ_PORT("INPUTS")
AM_RANGE(0xfff80000, 0xffffffff) AM_ROM AM_REGION("user1", 0)
ADDRESS_MAP_END
static INPUT_PORTS_START( eolith16 )
- PORT_START_TAG("IN0")
+ PORT_START("SPECIAL")
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SPECIAL ) // eeprom bit
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(eolith_speedup_getvblank, 0)
PORT_BIT( 0xff6f, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -90,10 +90,10 @@ static INPUT_PORTS_START( eolith16 )
PORT_SERVICE_NO_TOGGLE( 0x0040, IP_ACTIVE_LOW )
PORT_BIT( 0xff80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
+ PORT_START("INPUTS")
+ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
+ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
+ PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0xffe0, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/epos.c b/src/mame/drivers/epos.c
index a84d4780d20..5894f4fb7c7 100644
--- a/src/mame/drivers/epos.c
+++ b/src/mame/drivers/epos.c
@@ -92,10 +92,10 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READ(input_port_0_r)
- AM_RANGE(0x01, 0x01) AM_READ(input_port_1_r)
- AM_RANGE(0x02, 0x02) AM_READ(input_port_2_r)
- AM_RANGE(0x03, 0x03) AM_READ(input_port_3_r)
+ AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW")
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0x02, 0x02) AM_READ_PORT("INPUTS")
+ AM_RANGE(0x03, 0x03) AM_READ_PORT("UNK")
ADDRESS_MAP_END
@@ -111,7 +111,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( dealer_readport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x13) AM_DEVREAD(PPI8255, "ppi8255", ppi8255_r)
- AM_RANGE(0x38, 0x38) AM_READ(input_port_0_r)
+ AM_RANGE(0x38, 0x38) AM_READ_PORT("DSW")
ADDRESS_MAP_END
static ADDRESS_MAP_START( dealer_writeport, ADDRESS_SPACE_IO, 8 )
@@ -153,7 +153,7 @@ static const ppi8255_interface ppi8255_intf =
the processor if an unexpected value is read. */
static INPUT_PORTS_START( megadon )
- PORT_START_TAG("IN0")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) )
@@ -178,7 +178,7 @@ static INPUT_PORTS_START( megadon )
PORT_DIPSETTING( 0x00, "Arcade" )
PORT_DIPSETTING( 0x80, "Contest" )
- PORT_START_TAG("IN1")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -188,20 +188,20 @@ static INPUT_PORTS_START( megadon )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SPECIAL ) /* this has to be HI */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) /* this has to be HI */
- PORT_START_TAG("IN2")
+ PORT_START("INPUTS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3")
+ PORT_START("UNK")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( suprglob )
- PORT_START_TAG("IN0")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) )
@@ -226,7 +226,7 @@ static INPUT_PORTS_START( suprglob )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -236,7 +236,7 @@ static INPUT_PORTS_START( suprglob )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* this has to be LO */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) /* this has to be HI */
- PORT_START_TAG("IN2")
+ PORT_START("INPUTS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -246,13 +246,13 @@ static INPUT_PORTS_START( suprglob )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3")
+ PORT_START("UNK")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( igmo )
- PORT_START_TAG("IN0")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) )
@@ -276,7 +276,7 @@ static INPUT_PORTS_START( igmo )
PORT_DIPSETTING( 0x40, "5" )
PORT_DIPSETTING( 0x50, "6" )
- PORT_START_TAG("IN1")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -286,7 +286,7 @@ static INPUT_PORTS_START( igmo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SPECIAL ) /* this has to be HI */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) /* this has to be HI */
- PORT_START_TAG("IN2")
+ PORT_START("INPUTS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -295,13 +295,13 @@ static INPUT_PORTS_START( igmo )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3")
+ PORT_START("UNK")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( dealer )
- PORT_START_TAG("IN0")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -327,7 +327,7 @@ static INPUT_PORTS_START( dealer )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -337,7 +337,7 @@ static INPUT_PORTS_START( dealer )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("INPUTS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) //cancel
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) //draw
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) //stand
diff --git a/src/mame/drivers/eprom.c b/src/mame/drivers/eprom.c
index 5b20a8f29e5..8fc053b61cf 100644
--- a/src/mame/drivers/eprom.c
+++ b/src/mame/drivers/eprom.c
@@ -169,7 +169,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x16cc00, 0x16cc01) AM_RAM AM_SHARE(2)
AM_RANGE(0x160000, 0x16ffff) AM_RAM AM_SHARE(1)
AM_RANGE(0x1f0000, 0x1fffff) AM_WRITE(atarigen_eeprom_enable_w)
- AM_RANGE(0x260000, 0x26000f) AM_READ(input_port_0_word_r)
+ AM_RANGE(0x260000, 0x26000f) AM_READ_PORT("260000")
AM_RANGE(0x260010, 0x26001f) AM_READ(special_port1_r)
AM_RANGE(0x260020, 0x26002f) AM_READ(adc_r)
AM_RANGE(0x260030, 0x260031) AM_READ(atarigen_sound_r)
@@ -194,7 +194,7 @@ static ADDRESS_MAP_START( guts_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x16cc00, 0x16cc01) AM_RAM AM_SHARE(2)
AM_RANGE(0x160000, 0x16ffff) AM_RAM AM_SHARE(1)
AM_RANGE(0x1f0000, 0x1fffff) AM_WRITE(atarigen_eeprom_enable_w)
- AM_RANGE(0x260000, 0x26000f) AM_READ(input_port_0_word_r)
+ AM_RANGE(0x260000, 0x26000f) AM_READ_PORT("260000")
AM_RANGE(0x260010, 0x26001f) AM_READ(special_port1_r)
AM_RANGE(0x260020, 0x26002f) AM_READ(adc_r)
AM_RANGE(0x260030, 0x260031) AM_READ(atarigen_sound_r)
@@ -225,7 +225,7 @@ static ADDRESS_MAP_START( extra_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x16cc00, 0x16cc01) AM_READWRITE(sync_r, sync_w) AM_SHARE(2) AM_BASE(&sync_data)
AM_RANGE(0x160000, 0x16ffff) AM_RAM AM_SHARE(1)
- AM_RANGE(0x260000, 0x26000f) AM_READ(input_port_0_word_r)
+ AM_RANGE(0x260000, 0x26000f) AM_READ_PORT("260000")
AM_RANGE(0x260010, 0x26001f) AM_READ(special_port1_r)
AM_RANGE(0x260020, 0x26002f) AM_READ(adc_r)
AM_RANGE(0x260030, 0x260031) AM_READ(atarigen_sound_r)
@@ -244,7 +244,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( eprom )
- PORT_START_TAG("260000") /* 260000 */
+ PORT_START("260000")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
@@ -252,7 +252,7 @@ static INPUT_PORTS_START( eprom )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("260010") /* 260010 */
+ PORT_START("260010")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_SERVICE( 0x0002, IP_ACTIVE_LOW )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED ) /* Input buffer full (@260030) */
@@ -265,19 +265,19 @@ static INPUT_PORTS_START( eprom )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("ADC0") /* ADC0 @ 0x260020 */
+ PORT_START("ADC0") /* ADC0 @ 0x260020 */
PORT_BIT( 0x00ff, 0x0080, IPT_AD_STICK_Y ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("ADC1") /* ADC1 @ 0x260022 */
+ PORT_START("ADC1") /* ADC1 @ 0x260022 */
PORT_BIT( 0x00ff, 0x0080, IPT_AD_STICK_X ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("ADC2") /* ADC0 @ 0x260024 */
+ PORT_START("ADC2") /* ADC0 @ 0x260024 */
PORT_BIT( 0x00ff, 0x0080, IPT_AD_STICK_Y ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("ADC3") /* ADC1 @ 0x260026 */
+ PORT_START("ADC3") /* ADC1 @ 0x260026 */
PORT_BIT( 0x00ff, 0x0080, IPT_AD_STICK_X ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -286,7 +286,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( klaxp )
- PORT_START_TAG("260000") /* 260000 */
+ PORT_START("260000")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -297,7 +297,7 @@ static INPUT_PORTS_START( klaxp )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_START_TAG("260010") /* 260010 */
+ PORT_START("260010")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_SERVICE( 0x0002, IP_ACTIVE_LOW )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED ) /* Input buffer full (@260030) */
@@ -318,7 +318,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( guts )
- PORT_START_TAG("260000") /* 260000 */
+ PORT_START("260000") /* 260000 */
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
@@ -326,7 +326,7 @@ static INPUT_PORTS_START( guts )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("260010") /* 260010 */
+ PORT_START("260010") /* 260010 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_SERVICE( 0x0002, IP_ACTIVE_LOW )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED ) /* Input buffer full (@260030) */
@@ -339,19 +339,19 @@ static INPUT_PORTS_START( guts )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("ADC0") /* ADC0 @ 0x260020 */
+ PORT_START("ADC0") /* ADC0 @ 0x260020 */
PORT_BIT( 0x00ff, 0x0080, IPT_AD_STICK_Y ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("ADC1") /* ADC1 @ 0x260022 */
+ PORT_START("ADC1") /* ADC1 @ 0x260022 */
PORT_BIT( 0x00ff, 0x0080, IPT_AD_STICK_X ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1) PORT_REVERSE
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("ADC2") /* ADC0 @ 0x260024 */
+ PORT_START("ADC2") /* ADC0 @ 0x260024 */
PORT_BIT( 0x00ff, 0x0080, IPT_AD_STICK_Y ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("ADC3") /* ADC1 @ 0x260026 */
+ PORT_START("ADC3") /* ADC1 @ 0x260026 */
PORT_BIT( 0x00ff, 0x0080, IPT_AD_STICK_X ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2) PORT_REVERSE
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c
index abd4b01053f..c138c3aad93 100644
--- a/src/mame/drivers/equites.c
+++ b/src/mame/drivers/equites.c
@@ -713,14 +713,14 @@ static ADDRESS_MAP_START( equites_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x100000, 0x100001) AM_READ(equites_spriteram_kludge_r)
AM_RANGE(0x100000, 0x1001ff) AM_RAM AM_BASE(&spriteram16)
AM_RANGE(0x140000, 0x1407ff) AM_READWRITE(mcu_r, mcu_w) // 8-bit
- AM_RANGE(0x180000, 0x180001) AM_READWRITE(input_port_1_word_r, soundlatch_word_w) // LSB: sound latch
+ AM_RANGE(0x180000, 0x180001) AM_READ_PORT("IN1") AM_WRITE(soundlatch_word_w) // LSB: sound latch
AM_RANGE(0x184000, 0x184001) AM_WRITE(equites_flip0_w)
AM_RANGE(0x188000, 0x188001) AM_WRITE(mcu_halt_clear_w) // 8404 control port1
AM_RANGE(0x18c000, 0x18c001) AM_WRITENOP // 8404 control port2
AM_RANGE(0x1a4000, 0x1a4001) AM_WRITE(equites_flip1_w)
AM_RANGE(0x1a8000, 0x1a8001) AM_WRITE(mcu_halt_assert_w) // 8404 control port3
AM_RANGE(0x1ac000, 0x1ac001) AM_WRITENOP // 8404 control port4
- AM_RANGE(0x1c0000, 0x1c0001) AM_READWRITE(input_port_0_word_r, equites_scrollreg_w) // scroll register[XXYY]
+ AM_RANGE(0x1c0000, 0x1c0001) AM_READ_PORT("IN0") AM_WRITE(equites_scrollreg_w) // scroll register[XXYY]
AM_RANGE(0x380000, 0x380001) AM_WRITE(equites_bgcolor_w) // bg color register[CC--]
// 580000 unknown (protection?) (gekisou only, installed by DRIVER_INIT)
// 5a0000 unknown (protection?) (gekisou only, installed by DRIVER_INIT)
@@ -730,8 +730,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( splndrbt_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x040000, 0x040fff) AM_RAM AM_BASE(&equites_workram) // work RAM
- AM_RANGE(0x080000, 0x080001) AM_READ(input_port_0_word_r) // joyport [2211]
- AM_RANGE(0x0c0000, 0x0c0001) AM_READWRITE(input_port_1_word_r, splndrbt_flip0_w) // [MMLL] MM: bg color register, LL: normal screen
+ AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0") // joyport [2211]
+ AM_RANGE(0x0c0000, 0x0c0001) AM_READ_PORT("IN1") AM_WRITE(splndrbt_flip0_w) // [MMLL] MM: bg color register, LL: normal screen
AM_RANGE(0x0c4000, 0x0c4001) AM_WRITE(mcu_halt_clear_w) // 8404 control port1
AM_RANGE(0x0c8000, 0x0c8001) AM_WRITENOP // 8404 control port2
AM_RANGE(0x0cc000, 0x0cc001) AM_WRITE(splndrbt_selchar0_w) // select active char map
@@ -800,11 +800,11 @@ ADDRESS_MAP_END
// Equites Port Map
static INPUT_PORTS_START( equites )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
EQUITES_PLAYER_INPUT_LSB( IPT_BUTTON1, IPT_BUTTON2, IPT_BUTTON3, IPT_START1 )
EQUITES_PLAYER_INPUT_MSB( IPT_BUTTON1, IPT_BUTTON2, IPT_BUTTON3, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_COIN2 )
#if EASY_TEST_MODE
@@ -829,7 +829,7 @@ static INPUT_PORTS_START( equites )
PORT_DIPSETTING( 0x4000, "A 1C/3C B 1C/6C" )
/* this is actually a variable resistor */
- PORT_START_TAG(FRQ_ADJUSTER_TAG)
+ PORT_START(FRQ_ADJUSTER_TAG)
PORT_ADJUSTER(50, "MSM5232 Clock")
INPUT_PORTS_END
@@ -837,11 +837,11 @@ INPUT_PORTS_END
// Gekisou Port Map
static INPUT_PORTS_START( gekisou )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
EQUITES_PLAYER_INPUT_LSB( IPT_BUTTON1, IPT_BUTTON2, IPT_BUTTON3, IPT_START1 )
EQUITES_PLAYER_INPUT_MSB( IPT_BUTTON1, IPT_BUTTON2, IPT_BUTTON3, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_COIN2 )
#if EASY_TEST_MODE
@@ -855,7 +855,7 @@ static INPUT_PORTS_START( gekisou )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(gekisou_unknown_status, 0)
/* this is actually a variable resistor */
- PORT_START_TAG(FRQ_ADJUSTER_TAG)
+ PORT_START(FRQ_ADJUSTER_TAG)
PORT_ADJUSTER(50, "MSM5232 Clock")
INPUT_PORTS_END
@@ -863,11 +863,11 @@ INPUT_PORTS_END
// Bull Fighter Port Map
static INPUT_PORTS_START( bullfgtr )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
EQUITES_PLAYER_INPUT_LSB( IPT_BUTTON1, IPT_BUTTON2, IPT_BUTTON3, IPT_START1 )
EQUITES_PLAYER_INPUT_MSB( IPT_BUTTON1, IPT_BUTTON2, IPT_BUTTON3, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_COIN2 )
#if EASY_TEST_MODE
@@ -891,7 +891,7 @@ static INPUT_PORTS_START( bullfgtr )
PORT_DIPSETTING( 0x1000, "A 1C/2C B 1C/3C" )
/* this is actually a variable resistor */
- PORT_START_TAG(FRQ_ADJUSTER_TAG)
+ PORT_START(FRQ_ADJUSTER_TAG)
PORT_ADJUSTER(50, "MSM5232 Clock")
INPUT_PORTS_END
@@ -899,11 +899,11 @@ INPUT_PORTS_END
// Koukouyakyuh Port Map
static INPUT_PORTS_START( kouyakyu )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
EQUITES_PLAYER_INPUT_LSB( IPT_BUTTON1, IPT_BUTTON2, IPT_BUTTON3, IPT_START1 )
EQUITES_PLAYER_INPUT_MSB( IPT_BUTTON1, IPT_BUTTON2, IPT_BUTTON3, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
// PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_COIN1 )
// PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x0300, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -928,7 +928,7 @@ static INPUT_PORTS_START( kouyakyu )
PORT_DIPSETTING( 0x1000, "1C/3C (1C per player)" )
/* this is actually a variable resistor */
- PORT_START_TAG(FRQ_ADJUSTER_TAG)
+ PORT_START(FRQ_ADJUSTER_TAG)
PORT_ADJUSTER(50, "MSM5232 Clock")
INPUT_PORTS_END
@@ -936,11 +936,11 @@ INPUT_PORTS_END
// Splendor Blast Port Map
static INPUT_PORTS_START( splndrbt )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
EQUITES_PLAYER_INPUT_LSB( IPT_BUTTON1, IPT_BUTTON2, IPT_UNKNOWN, IPT_START1 )
EQUITES_PLAYER_INPUT_MSB( IPT_BUTTON1, IPT_BUTTON2, IPT_UNKNOWN, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_COIN2 )
#if EASY_TEST_MODE
@@ -964,7 +964,7 @@ static INPUT_PORTS_START( splndrbt )
PORT_DIPSETTING( 0x8000, "A 1C/3C B 1C/6C" )
/* this is actually a variable resistor */
- PORT_START_TAG(FRQ_ADJUSTER_TAG)
+ PORT_START(FRQ_ADJUSTER_TAG)
PORT_ADJUSTER(50, "MSM5232 Clock")
INPUT_PORTS_END
@@ -972,7 +972,7 @@ INPUT_PORTS_END
// High Voltage Port Map
static INPUT_PORTS_START( hvoltage )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
@@ -992,7 +992,7 @@ static INPUT_PORTS_START( hvoltage )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_COCKTAIL
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_COIN2 )
#if EASY_TEST_MODE
@@ -1026,14 +1026,14 @@ static INPUT_PORTS_START( hvoltage )
#if HVOLTAGE_DEBUG
/* Fake port to handle debug mode */
- PORT_START_TAG("FAKE")
+ PORT_START("FAKE")
PORT_DIPNAME( 0xffff, 0xffff, "Debug Mode" )
PORT_DIPSETTING( 0xffff, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
#endif
/* this is actually a variable resistor */
- PORT_START_TAG(FRQ_ADJUSTER_TAG)
+ PORT_START(FRQ_ADJUSTER_TAG)
PORT_ADJUSTER(50, "MSM5232 Clock")
INPUT_PORTS_END
diff --git a/src/mame/drivers/ertictac.c b/src/mame/drivers/ertictac.c
index 7c9cba3d105..53852a5155a 100644
--- a/src/mame/drivers/ertictac.c
+++ b/src/mame/drivers/ertictac.c
@@ -164,42 +164,42 @@ static ADDRESS_MAP_START( ertictac_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x03200058, 0x0320005b) AM_WRITE( T1GO_w )
AM_RANGE(0x03340000, 0x03340003) AM_NOP
- AM_RANGE(0x03340010, 0x03340013) AM_READ(input_port_0_dword_r)
- AM_RANGE(0x03340014, 0x03340017) AM_READ(input_port_2_dword_r)
- AM_RANGE(0x03340018, 0x0334001b) AM_READ(input_port_1_dword_r)
+ AM_RANGE(0x03340010, 0x03340013) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0x03340014, 0x03340017) AM_READ_PORT("P2")
+ AM_RANGE(0x03340018, 0x0334001b) AM_READ_PORT("P1")
- AM_RANGE(0x033c0004, 0x033c0007) AM_READ(input_port_3_dword_r)
- AM_RANGE(0x033c0008, 0x033c000b) AM_READ(input_port_4_dword_r)
- AM_RANGE(0x033c0010, 0x033c0013) AM_READ(input_port_0_dword_r)
- AM_RANGE(0x033c0014, 0x033c0017) AM_READ(input_port_2_dword_r)
- AM_RANGE(0x033c0018, 0x033c001b) AM_READ(input_port_1_dword_r)
+ AM_RANGE(0x033c0004, 0x033c0007) AM_READ_PORT("DSW1")
+ AM_RANGE(0x033c0008, 0x033c000b) AM_READ_PORT("DSW2")
+ AM_RANGE(0x033c0010, 0x033c0013) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0x033c0014, 0x033c0017) AM_READ_PORT("P2")
+ AM_RANGE(0x033c0018, 0x033c001b) AM_READ_PORT("P1")
AM_RANGE(0x03400000, 0x03400003) AM_WRITE(video_fifo_w)
AM_RANGE(0x03800000, 0x03ffffff) AM_ROM AM_REGION("user1", 0)
ADDRESS_MAP_END
static INPUT_PORTS_START( ertictac )
- PORT_START_TAG("IN0")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(1)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
- PORT_START_TAG("IN1")
+ PORT_START("P1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
+ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
+ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
+ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
- PORT_START_TAG("IN2")
+ PORT_START("P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
+ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
+ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
+ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Language ) )
PORT_DIPSETTING( 0x01, DEF_STR( French ) )
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
@@ -223,7 +223,7 @@ static INPUT_PORTS_START( ertictac )
PORT_DIPSETTING( 0x40, "Difficult" )
PORT_DIPSETTING( 0x00, "Very Difficult" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x05, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x05, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
@@ -244,32 +244,32 @@ static INPUT_PORTS_START( ertictac )
PORT_DIPSETTING( 0x20, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
- PORT_START_TAG("dummy")
+ PORT_START("dummy")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
INPUT_PORTS_END
static INPUT_PORTS_START( poizone )
- PORT_START_TAG("IN0")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(1)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
- PORT_START_TAG("IN1")
+ PORT_START("P1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
+ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
+ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
+ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
- PORT_START_TAG("IN2")
+ PORT_START("P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
+ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
+ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
+ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Language ) ) // 01
PORT_DIPSETTING( 0x01, DEF_STR( English ) )
PORT_DIPSETTING( 0x00, DEF_STR( French ) )
@@ -293,7 +293,7 @@ static INPUT_PORTS_START( poizone )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0xC0, DEF_STR( 1C_4C ) )
- PORT_START_TAG("DSW2") /* DSW 2 doesn't work, may not be hooked up properly */
+ PORT_START("DSW2") /* DSW 2 doesn't work, may not be hooked up properly */
// PORT_DIPNAME( 0x01, 0x01, "2-1" )
// PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
// PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -320,7 +320,7 @@ static INPUT_PORTS_START( poizone )
// PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("dummy")
+ PORT_START("dummy")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
INPUT_PORTS_END
diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c
index ee9c62c1428..3c5ab9972cf 100644
--- a/src/mame/drivers/esd16.c
+++ b/src/mame/drivers/esd16.c
@@ -104,9 +104,9 @@ static ADDRESS_MAP_START( multchmp_readmem, ADDRESS_SPACE_PROGRAM, 16 )
/**/AM_RANGE(0x500004, 0x500007) AM_READ(SMH_RAM ) //
/**/AM_RANGE(0x500008, 0x50000b) AM_READ(SMH_RAM ) //
/**/AM_RANGE(0x50000c, 0x50000f) AM_READ(SMH_RAM ) //
- AM_RANGE(0x600002, 0x600003) AM_READ(input_port_0_word_r ) // Inputs
- AM_RANGE(0x600004, 0x600005) AM_READ(input_port_1_word_r ) //
- AM_RANGE(0x600006, 0x600007) AM_READ(input_port_2_word_r ) //
+ AM_RANGE(0x600002, 0x600003) AM_READ_PORT("P1_P2")
+ AM_RANGE(0x600004, 0x600005) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0x600006, 0x600007) AM_READ_PORT("DSW")
AM_RANGE(0x700008, 0x70000b) AM_READ(SMH_NOP ) // ? Only read once
ADDRESS_MAP_END
@@ -170,8 +170,8 @@ static ADDRESS_MAP_START( hedpanic_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM
AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM)
AM_RANGE(0x800000, 0x800fff) AM_READ(SMH_RAM)
- AM_RANGE(0xc00002, 0xc00003) AM_READ(input_port_0_word_r ) // Inputs
- AM_RANGE(0xc00004, 0xc00005) AM_READ(input_port_1_word_r ) //
+ AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("P1_P2")
+ AM_RANGE(0xc00004, 0xc00005) AM_READ_PORT("SYSTEM")
AM_RANGE(0xc00006, 0xc00007) AM_READ(esd_eeprom_r )
ADDRESS_MAP_END
@@ -204,8 +204,8 @@ static ADDRESS_MAP_START( mchampdx_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM
AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM)
AM_RANGE(0x400000, 0x400fff) AM_READ(SMH_RAM)
- AM_RANGE(0x500002, 0x500003) AM_READ(input_port_0_word_r ) // Inputs
- AM_RANGE(0x500004, 0x500005) AM_READ(input_port_1_word_r ) //
+ AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P1_P2")
+ AM_RANGE(0x500004, 0x500005) AM_READ_PORT("SYSTEM")
AM_RANGE(0x500006, 0x500007) AM_READ(esd_eeprom_r )
ADDRESS_MAP_END
@@ -237,8 +237,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( tangtang_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM
AM_RANGE(0x100000, 0x100fff) AM_READ(SMH_RAM)
- AM_RANGE(0x500002, 0x500003) AM_READ(input_port_0_word_r ) // Inputs
- AM_RANGE(0x500004, 0x500005) AM_READ(input_port_1_word_r ) //
+ AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P1_P2")
+ AM_RANGE(0x500004, 0x500005) AM_READ_PORT("SYSTEM")
AM_RANGE(0x500006, 0x500007) AM_READ(esd_eeprom_r )
AM_RANGE(0x700000, 0x70ffff) AM_READ(SMH_RAM) // main ram
ADDRESS_MAP_END
@@ -329,7 +329,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( multchmp )
- PORT_START_TAG("IN0") // $600002.w
+ PORT_START("P1_P2") // $600002.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -348,7 +348,7 @@ static INPUT_PORTS_START( multchmp )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Resets the test mode
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") // $600005.b
+ PORT_START("SYSTEM") // $600005.b
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -359,7 +359,7 @@ static INPUT_PORTS_START( multchmp )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") // $600006.w
+ PORT_START("DSW") // $600006.w
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0002, 0x0002, "Coinage Type" ) // Not Supported
PORT_DIPSETTING( 0x0002, "1" )
@@ -408,7 +408,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( hedpanic )
- PORT_START_TAG("IN0") // $600002.w
+ PORT_START("P1_P2") // $600002.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -427,7 +427,7 @@ static INPUT_PORTS_START( hedpanic )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") // $600005.b
+ PORT_START("SYSTEM") // $600005.b
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -440,7 +440,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( swatpolc )
- PORT_START_TAG("IN0") // $600002.w
+ PORT_START("P1_P2") // $600002.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -459,7 +459,7 @@ static INPUT_PORTS_START( swatpolc )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") // $600005.b
+ PORT_START("SYSTEM") // $600005.b
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
diff --git a/src/mame/drivers/esh.c b/src/mame/drivers/esh.c
index 3ea16479547..44557dd54c7 100644
--- a/src/mame/drivers/esh.c
+++ b/src/mame/drivers/esh.c
@@ -168,7 +168,7 @@ ADDRESS_MAP_END /* (someday 0xf8-0xff will probably be a single handle
/* PORTS */
static INPUT_PORTS_START( esh )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -178,7 +178,7 @@ static INPUT_PORTS_START( esh )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -188,7 +188,7 @@ static INPUT_PORTS_START( esh )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -198,7 +198,7 @@ static INPUT_PORTS_START( esh )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/espial.c b/src/mame/drivers/espial.c
index 460e6664e02..3bb563e91bc 100644
--- a/src/mame/drivers/espial.c
+++ b/src/mame/drivers/espial.c
@@ -69,10 +69,10 @@ WRITE8_HANDLER( zodiac_master_soundlatch_w )
static ADDRESS_MAP_START( espial_readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x4fff) AM_READ(SMH_ROM)
AM_RANGE(0x5800, 0x5fff) AM_READ(SMH_RAM)
- AM_RANGE(0x6081, 0x6081) AM_READ(input_port_0_r)
- AM_RANGE(0x6082, 0x6082) AM_READ(input_port_1_r)
- AM_RANGE(0x6083, 0x6083) AM_READ(input_port_2_r)
- AM_RANGE(0x6084, 0x6084) AM_READ(input_port_3_r)
+ AM_RANGE(0x6081, 0x6081) AM_READ_PORT("IN0")
+ AM_RANGE(0x6082, 0x6082) AM_READ_PORT("DSW1")
+ AM_RANGE(0x6083, 0x6083) AM_READ_PORT("IN1")
+ AM_RANGE(0x6084, 0x6084) AM_READ_PORT("IN2")
AM_RANGE(0x6090, 0x6090) AM_READ(soundlatch_r) /* the main CPU reads the command back from the slave */
AM_RANGE(0x7000, 0x7000) AM_READ(watchdog_reset_r)
AM_RANGE(0x8000, 0x803f) AM_READ(SMH_RAM)
@@ -105,10 +105,10 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( netwars_readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM)
AM_RANGE(0x5800, 0x5fff) AM_READ(SMH_RAM)
- AM_RANGE(0x6081, 0x6081) AM_READ(input_port_0_r)
- AM_RANGE(0x6082, 0x6082) AM_READ(input_port_1_r)
- AM_RANGE(0x6083, 0x6083) AM_READ(input_port_2_r)
- AM_RANGE(0x6084, 0x6084) AM_READ(input_port_3_r)
+ AM_RANGE(0x6081, 0x6081) AM_READ_PORT("IN0")
+ AM_RANGE(0x6082, 0x6082) AM_READ_PORT("DSW1")
+ AM_RANGE(0x6083, 0x6083) AM_READ_PORT("IN1")
+ AM_RANGE(0x6084, 0x6084) AM_READ_PORT("IN2")
AM_RANGE(0x6090, 0x6090) AM_READ(soundlatch_r) /* the main CPU reads the command back from the slave */
AM_RANGE(0x7000, 0x7000) AM_READ(watchdog_reset_r)
AM_RANGE(0x8000, 0x97ff) AM_READ(SMH_RAM)
@@ -152,7 +152,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( espial )
- PORT_START /* IN0 */
+ PORT_START("IN0")
PORT_DIPNAME( 0x01, 0x00, "Number of Buttons" )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x00, "2" )
@@ -166,7 +166,7 @@ static INPUT_PORTS_START( espial )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -191,7 +191,7 @@ static INPUT_PORTS_START( espial )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* IN2 */
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -201,7 +201,7 @@ static INPUT_PORTS_START( espial )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START /* IN3 */
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -214,7 +214,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( netwars )
- PORT_START /* IN0 */
+ PORT_START("IN0")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) ) /* probably unused */
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -232,7 +232,7 @@ static INPUT_PORTS_START( netwars )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -257,7 +257,7 @@ static INPUT_PORTS_START( netwars )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* IN2 */
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
@@ -267,7 +267,7 @@ static INPUT_PORTS_START( netwars )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN3 */
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c
index a0529edba87..712e72443a8 100644
--- a/src/mame/drivers/ettrivia.c
+++ b/src/mame/drivers/ettrivia.c
@@ -132,7 +132,7 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
INPUT_PORTS_START( ettrivia )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -142,7 +142,7 @@ INPUT_PORTS_START( ettrivia )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -152,7 +152,7 @@ INPUT_PORTS_START( ettrivia )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
INPUT_PORTS_END
diff --git a/src/mame/drivers/exedexes.c b/src/mame/drivers/exedexes.c
index 87c961144ba..afd7bff7c09 100644
--- a/src/mame/drivers/exedexes.c
+++ b/src/mame/drivers/exedexes.c
@@ -43,11 +43,11 @@ static INTERRUPT_GEN( exedexes_interrupt )
static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM)
- AM_RANGE(0xc000, 0xc000) AM_READ(input_port_0_r)
- AM_RANGE(0xc001, 0xc001) AM_READ(input_port_1_r)
- AM_RANGE(0xc002, 0xc002) AM_READ(input_port_2_r)
- AM_RANGE(0xc003, 0xc003) AM_READ(input_port_3_r)
- AM_RANGE(0xc004, 0xc004) AM_READ(input_port_4_r)
+ AM_RANGE(0xc000, 0xc000) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0xc001, 0xc001) AM_READ_PORT("P1")
+ AM_RANGE(0xc002, 0xc002) AM_READ_PORT("P2")
+ AM_RANGE(0xc003, 0xc003) AM_READ_PORT("DSW0")
+ AM_RANGE(0xc004, 0xc004) AM_READ_PORT("DSW1")
AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM)
AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM) /* Work RAM */
AM_RANGE(0xf000, 0xffff) AM_READ(SMH_RAM) /* Sprite RAM */
@@ -88,7 +88,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( exedexes )
- PORT_START /* IN0 */
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
@@ -98,7 +98,7 @@ static INPUT_PORTS_START( exedexes )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START /* IN1 */
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -108,7 +108,7 @@ static INPUT_PORTS_START( exedexes )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_START /* IN2 */
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -118,7 +118,7 @@ static INPUT_PORTS_START( exedexes )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_START /* DSW0 */
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -140,7 +140,7 @@ static INPUT_PORTS_START( exedexes )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START /* DSW1 */
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ))
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/exerion.c b/src/mame/drivers/exerion.c
index 72213158201..a74bae136f6 100644
--- a/src/mame/drivers/exerion.c
+++ b/src/mame/drivers/exerion.c
@@ -131,7 +131,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( exerion )
- PORT_START_TAG("IN0") /* player 1 inputs (muxed on 0xa000) */
+ PORT_START("IN0") /* player 1 inputs (muxed on 0xa000) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -141,7 +141,7 @@ static INPUT_PORTS_START( exerion )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1") /* player 2 inputs (muxed on 0xa000) */
+ PORT_START("IN1") /* player 2 inputs (muxed on 0xa000) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
@@ -151,7 +151,7 @@ static INPUT_PORTS_START( exerion )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("DSW0") /* dip switches (0xa800) */
+ PORT_START("DSW0") /* dip switches (0xa800) */
PORT_DIPNAME( 0x07, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x01, "2" )
@@ -174,7 +174,7 @@ static INPUT_PORTS_START( exerion )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW1") /* dip switches/VBLANK (0xb000) */
+ PORT_START("DSW1") /* dip switches/VBLANK (0xb000) */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -186,7 +186,7 @@ static INPUT_PORTS_START( exerion )
PORT_DIPSETTING( 0x0c, DEF_STR( 1C_4C ) )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
INPUT_PORTS_END
diff --git a/src/mame/drivers/exidy.c b/src/mame/drivers/exidy.c
index 33632eb5dce..e3247ff5265 100644
--- a/src/mame/drivers/exidy.c
+++ b/src/mame/drivers/exidy.c
@@ -289,7 +289,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( sidetrac )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "3" )
@@ -305,7 +305,7 @@ static INPUT_PORTS_START( sidetrac )
PORT_DIPSETTING( 0x10, DEF_STR( On ) )
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -315,16 +315,16 @@ static INPUT_PORTS_START( sidetrac )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("INTSOURCE")
+ PORT_START("INTSOURCE")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( targ )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN2 ) /* upright/cocktail switch? */
PORT_DIPNAME( 0x02, 0x00, "Pence Coinage" )
PORT_DIPSETTING( 0x00, "10P/1P, 50P Coin/6P" )
@@ -346,7 +346,7 @@ static INPUT_PORTS_START( targ )
PORT_DIPSETTING( 0x80, "Quarters" )
PORT_DIPSETTING( 0x00, "Pence" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -356,13 +356,13 @@ static INPUT_PORTS_START( targ )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("INTSOURCE")
+ PORT_START("INTSOURCE")
PORT_BIT( 0x1f, IP_ACTIVE_HIGH, IPT_SPECIAL )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -438,7 +438,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mtrap )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_DIPNAME( 0x06, 0x06, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x06, "30000" )
@@ -460,7 +460,7 @@ static INPUT_PORTS_START( mtrap )
PORT_DIPSETTING( 0x20, "4" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -470,7 +470,7 @@ static INPUT_PORTS_START( mtrap )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("INTSOURCE")
+ PORT_START("INTSOURCE")
/*
The schematics claim these exist, but there's nothing in
the ROMs to support that claim (as far as I can see):
@@ -490,7 +490,7 @@ static INPUT_PORTS_START( mtrap )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Yellow Button")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Red Button")
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Free_Play ) )
@@ -502,7 +502,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( venture )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_DIPNAME( 0x06, 0x00, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x00, "20000" )
@@ -523,7 +523,7 @@ static INPUT_PORTS_START( venture )
PORT_DIPSETTING( 0x40, "4" )
PORT_DIPSETTING( 0x60, "5" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
@@ -533,7 +533,7 @@ static INPUT_PORTS_START( venture )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("INTSOURCE")
+ PORT_START("INTSOURCE")
/*
The schematics claim these exist, but there's nothing in
the ROMs to support that claim (as far as I can see):
@@ -552,13 +552,13 @@ static INPUT_PORTS_START( venture )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( teetert )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_DIPNAME( 0x06, 0x06, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x06, "20000" )
@@ -580,7 +580,7 @@ static INPUT_PORTS_START( teetert )
PORT_DIPSETTING( 0x40, "3" )
PORT_DIPSETTING( 0x60, "2" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x44, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(teetert_input_r, 0)
@@ -589,7 +589,7 @@ static INPUT_PORTS_START( teetert )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("INTSOURCE")
+ PORT_START("INTSOURCE")
/*
The schematics claim these exist, but there's nothing in
the ROMs to support that claim (as far as I can see):
@@ -608,16 +608,16 @@ static INPUT_PORTS_START( teetert )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DIAL")
+ PORT_START("DIAL")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(5) PORT_KEYDELTA(30) PORT_REVERSE
INPUT_PORTS_END
static INPUT_PORTS_START( pepper2 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT ( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_DIPNAME( 0x06, 0x06, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x06, "40000" )
@@ -639,7 +639,7 @@ static INPUT_PORTS_START( pepper2 )
PORT_DIPSETTING( 0x08, "1 Coin/3 Credits 2C/7C" )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_4C ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -649,7 +649,7 @@ static INPUT_PORTS_START( pepper2 )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("INTSOURCE")
+ PORT_START("INTSOURCE")
/*
The schematics claim these exist, but there's nothing in
the ROMs to support that claim (as far as I can see):
@@ -668,13 +668,13 @@ static INPUT_PORTS_START( pepper2 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( fax )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT ( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_DIPNAME( 0x06, 0x06, "Bonus Time" )
PORT_DIPSETTING( 0x06, "8000" )
@@ -696,11 +696,11 @@ static INPUT_PORTS_START( fax )
PORT_DIPSETTING( 0x08, "1 Coin/3 Credits 2C/7C" )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_4C ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT ( 0x7f, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("INTSOURCE")
+ PORT_START("INTSOURCE")
/*
The schematics claim these exist, but there's nothing in
the ROMs to support that claim (as far as I can see):
@@ -719,10 +719,10 @@ static INPUT_PORTS_START( fax )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -731,7 +731,7 @@ static INPUT_PORTS_START( fax )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
diff --git a/src/mame/drivers/exidy440.c b/src/mame/drivers/exidy440.c
index f2d85a226fe..bf2dc4c47e8 100644
--- a/src/mame/drivers/exidy440.c
+++ b/src/mame/drivers/exidy440.c
@@ -474,13 +474,13 @@ static ADDRESS_MAP_START( exidy440_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x2b00, 0x2b00) AM_READ(exidy440_vertical_pos_r)
AM_RANGE(0x2b01, 0x2b01) AM_READWRITE(exidy440_horizontal_pos_r, exidy440_interrupt_clear_w)
AM_RANGE(0x2b02, 0x2b02) AM_RAM AM_BASE(&exidy440_scanline)
- AM_RANGE(0x2b03, 0x2b03) AM_READWRITE(input_port_0_r, exidy440_control_w)
+ AM_RANGE(0x2b03, 0x2b03) AM_READ_PORT("IN0") AM_WRITE(exidy440_control_w)
AM_RANGE(0x2c00, 0x2dff) AM_READWRITE(exidy440_paletteram_r, exidy440_paletteram_w)
AM_RANGE(0x2e00, 0x2e1f) AM_RAM_WRITE(sound_command_w)
AM_RANGE(0x2e20, 0x2e3f) AM_READWRITE(exidy440_input_port_3_r, exidy440_input_port_3_w)
AM_RANGE(0x2e40, 0x2e5f) AM_READWRITE(SMH_NOP, exidy440_coin_counter_w) /* read: clear coin counters I/O2 */
- AM_RANGE(0x2e60, 0x2e7f) AM_READWRITE(input_port_1_r, SMH_NOP)
- AM_RANGE(0x2e80, 0x2e9f) AM_READWRITE(input_port_2_r, SMH_NOP)
+ AM_RANGE(0x2e60, 0x2e7f) AM_READ_PORT("IN1") AM_WRITENOP
+ AM_RANGE(0x2e80, 0x2e9f) AM_READ_PORT("IN2") AM_WRITENOP
AM_RANGE(0x2ea0, 0x2ebf) AM_READWRITE(sound_command_ack_r, SMH_NOP)
AM_RANGE(0x2ec0, 0x2eff) AM_NOP
AM_RANGE(0x3000, 0x3fff) AM_RAM
@@ -517,7 +517,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( crossbow )
- PORT_START_TAG("IN0") /* player inputs and logic board dips */
+ PORT_START("IN0") /* player inputs and logic board dips */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Lives ) )
@@ -533,32 +533,32 @@ static INPUT_PORTS_START( crossbow )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(firq_beam_r, 0)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(firq_vblank_r, 0)
- PORT_START_TAG("IN1") /* audio board dips */
+ PORT_START("IN1") /* audio board dips */
COINAGE
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Free_Play ) )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2") /* start button */
+ PORT_START("IN2") /* start button */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* coin counters */
+ PORT_START("IN3") /* coin counters */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("AN0") /* fake analog X */
+ PORT_START("AN0") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("AN1") /* fake analog Y */
+ PORT_START("AN1") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10)
INPUT_PORTS_END
static INPUT_PORTS_START( cheyenne )
- PORT_START_TAG("IN0") /* player inputs and logic board dips */
+ PORT_START("IN0") /* player inputs and logic board dips */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Lives ) )
@@ -574,32 +574,32 @@ static INPUT_PORTS_START( cheyenne )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(firq_beam_r, 0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(firq_vblank_r, 0)
- PORT_START_TAG("IN1") /* audio board dips */
+ PORT_START("IN1") /* audio board dips */
COINAGE
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Free_Play ) )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2") /* start button */
+ PORT_START("IN2") /* start button */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* coin counters */
+ PORT_START("IN3") /* coin counters */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("AN0") /* fake analog X */
+ PORT_START("AN0") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("AN1") /* fake analog Y */
+ PORT_START("AN1") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10)
INPUT_PORTS_END
static INPUT_PORTS_START( combat )
- PORT_START_TAG("IN0") /* player inputs and logic board dips */
+ PORT_START("IN0") /* player inputs and logic board dips */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Lives ) )
@@ -615,32 +615,32 @@ static INPUT_PORTS_START( combat )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(firq_beam_r, 0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(firq_vblank_r, 0)
- PORT_START_TAG("IN1") /* audio board dips */
+ PORT_START("IN1") /* audio board dips */
COINAGE
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Free_Play ) )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2") /* start button */
+ PORT_START("IN2") /* start button */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* coin counters */
+ PORT_START("IN3") /* coin counters */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("AN0") /* fake analog X */
+ PORT_START("AN0") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("AN1") /* fake analog Y */
+ PORT_START("AN1") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10)
INPUT_PORTS_END
static INPUT_PORTS_START( catch22 )
- PORT_START_TAG("IN0") /* player inputs and logic board dips */
+ PORT_START("IN0") /* player inputs and logic board dips */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Lives ) )
@@ -656,33 +656,33 @@ static INPUT_PORTS_START( catch22 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(firq_beam_r, 0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(firq_vblank_r, 0)
- PORT_START_TAG("IN1") /* audio board dips */
+ PORT_START("IN1") /* audio board dips */
COINAGE
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Free_Play ) )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2") /* start button */
+ PORT_START("IN2") /* start button */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* coin counters */
+ PORT_START("IN3") /* coin counters */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("AN0") /* fake analog X */
+ PORT_START("AN0") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("AN1") /* fake analog Y */
+ PORT_START("AN1") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10)
INPUT_PORTS_END
static INPUT_PORTS_START( cracksht )
- PORT_START_TAG("IN0") /* player inputs and logic board dips */
+ PORT_START("IN0") /* player inputs and logic board dips */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_DIPNAME( 0x0c, 0x00, "Seconds" )
@@ -698,33 +698,33 @@ static INPUT_PORTS_START( cracksht )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(firq_beam_r, 0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(firq_vblank_r, 0)
- PORT_START_TAG("IN1") /* audio board dips */
+ PORT_START("IN1") /* audio board dips */
COINAGE
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2") /* start button */
+ PORT_START("IN2") /* start button */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* coin counters */
+ PORT_START("IN3") /* coin counters */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("AN0") /* fake analog X */
+ PORT_START("AN0") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("AN1") /* fake analog Y */
+ PORT_START("AN1") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10)
INPUT_PORTS_END
static INPUT_PORTS_START( claypign )
- PORT_START_TAG("IN0") /* player inputs and logic board dips */
+ PORT_START("IN0") /* player inputs and logic board dips */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -736,33 +736,33 @@ static INPUT_PORTS_START( claypign )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(firq_beam_r, 0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(firq_vblank_r, 0)
- PORT_START_TAG("IN1") /* audio board dips */
+ PORT_START("IN1") /* audio board dips */
COINAGE
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2") /* start button */
+ PORT_START("IN2") /* start button */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* coin counters */
+ PORT_START("IN3") /* coin counters */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("AN0") /* fake analog X */
+ PORT_START("AN0") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("AN1") /* fake analog Y */
+ PORT_START("AN1") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10)
INPUT_PORTS_END
static INPUT_PORTS_START( chiller )
- PORT_START_TAG("IN0") /* player inputs and logic board dips */
+ PORT_START("IN0") /* player inputs and logic board dips */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_DIPNAME( 0x0c, 0x00, "Seconds" )
@@ -778,30 +778,30 @@ static INPUT_PORTS_START( chiller )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(firq_beam_r, 0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(firq_vblank_r, 0)
- PORT_START_TAG("IN1") /* audio board dips */
+ PORT_START("IN1") /* audio board dips */
COINAGE
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* start button */
+ PORT_START("IN2") /* start button */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* coin counters */
+ PORT_START("IN3") /* coin counters */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("AN0") /* fake analog X */
+ PORT_START("AN0") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("AN1") /* fake analog Y */
+ PORT_START("AN1") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10)
INPUT_PORTS_END
static INPUT_PORTS_START( topsecex )
- PORT_START_TAG("IN0") /* player inputs and logic board dips */
+ PORT_START("IN0") /* player inputs and logic board dips */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Lives ) )
@@ -817,27 +817,27 @@ static INPUT_PORTS_START( topsecex )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(firq_beam_r, 0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(firq_vblank_r, 0)
- PORT_START_TAG("IN1") /* audio board dips */
+ PORT_START("IN1") /* audio board dips */
COINAGE
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* start button */
+ PORT_START("IN2") /* start button */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* coin counters */
+ PORT_START("IN3") /* coin counters */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("AN0") /* fake analog X */
+ PORT_START("AN0") /* fake analog X */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE
- PORT_START_TAG("AN1") /* fake analog Y */
+ PORT_START("AN1") /* fake analog Y */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN4") /* start button */
+ PORT_START("IN4") /* start button */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Fireball")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Laser")
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Missile")
@@ -850,7 +850,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( hitnmiss )
- PORT_START_TAG("IN0") /* player inputs and logic board dips */
+ PORT_START("IN0") /* player inputs and logic board dips */
PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(hitnmiss_button1_r, 0)
PORT_DIPNAME( 0x0c, 0x00, "Seconds" )
PORT_DIPSETTING( 0x04, "20" )
@@ -865,36 +865,36 @@ static INPUT_PORTS_START( hitnmiss )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(firq_beam_r, 0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(firq_vblank_r, 0)
- PORT_START_TAG("IN1") /* audio board dips */
+ PORT_START("IN1") /* audio board dips */
COINAGE
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Free_Play ) )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2") /* start button */
+ PORT_START("IN2") /* start button */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* coin counters */
+ PORT_START("IN3") /* coin counters */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("AN0") /* fake analog X */
+ PORT_START("AN0") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("AN1") /* fake analog Y */
+ PORT_START("AN1") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10)
- PORT_START_TAG("HITNMISS_BUTTON1")
+ PORT_START("HITNMISS_BUTTON1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
INPUT_PORTS_END
static INPUT_PORTS_START( whodunit )
- PORT_START_TAG("IN0") /* player inputs and logic board dips */
+ PORT_START("IN0") /* player inputs and logic board dips */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(firq_vblank_r, 0)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Lives ) )
@@ -910,30 +910,30 @@ static INPUT_PORTS_START( whodunit )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(firq_beam_r, 0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(firq_vblank_r, 0)
- PORT_START_TAG("IN1") /* audio board dips */
+ PORT_START("IN1") /* audio board dips */
COINAGE
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* start button */
+ PORT_START("IN2") /* start button */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* coin counters */
+ PORT_START("IN3") /* coin counters */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("AN0") /* fake analog X */
+ PORT_START("AN0") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("AN1") /* fake analog Y */
+ PORT_START("AN1") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10)
INPUT_PORTS_END
static INPUT_PORTS_START( showdown )
- PORT_START_TAG("IN0") /* player inputs and logic board dips */
+ PORT_START("IN0") /* player inputs and logic board dips */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_DIPNAME( 0x0c, 0x00, "Hands" )
@@ -949,7 +949,7 @@ static INPUT_PORTS_START( showdown )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(firq_beam_r, 0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(firq_vblank_r, 0)
- PORT_START_TAG("IN1") /* audio board dips */
+ PORT_START("IN1") /* audio board dips */
COINAGE
PORT_DIPNAME( 0x70, 0x70, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x70, "1" )
@@ -964,7 +964,7 @@ static INPUT_PORTS_START( showdown )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2") /* start button */
+ PORT_START("IN2") /* start button */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Action")
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Bet-All")
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Gold")
@@ -974,16 +974,16 @@ static INPUT_PORTS_START( showdown )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* coin counters */
+ PORT_START("IN3") /* coin counters */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("AN0") /* fake analog X */
+ PORT_START("AN0") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("AN1") /* fake analog Y */
+ PORT_START("AN1") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10)
INPUT_PORTS_END
diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c
index 52a56bb9ebd..90616648d3a 100644
--- a/src/mame/drivers/expro02.c
+++ b/src/mame/drivers/expro02.c
@@ -124,7 +124,7 @@ U78 (22CV10)
#include "sound/okim6295.h"
static INPUT_PORTS_START( galsnew )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1/P1")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -163,11 +163,11 @@ static INPUT_PORTS_START( galsnew )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* "Shot2" in "test mode" */
+ PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) /* "Shot2" in "test mode" */
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("DSW2/P2")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
@@ -196,11 +196,11 @@ static INPUT_PORTS_START( galsnew )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* "Shot2" in "test mode" */
+ PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) /* "Shot2" in "test mode" */
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
@@ -251,9 +251,9 @@ static ADDRESS_MAP_START( galsnew, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x780000, 0x78001f) AM_READWRITE(SMH_RAM,kaneko16_sprites_regs_w) AM_BASE(&kaneko16_sprites_regs ) // sprite regs? tileregs?
- AM_RANGE(0x800000, 0x800001) AM_READ(input_port_0_word_r)
- AM_RANGE(0x800002, 0x800003) AM_READ(input_port_1_word_r)
- AM_RANGE(0x800004, 0x800005) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x800000, 0x800001) AM_READ_PORT("DSW1/P1")
+ AM_RANGE(0x800002, 0x800003) AM_READ_PORT("DSW2/P2")
+ AM_RANGE(0x800004, 0x800005) AM_READ_PORT("SYSTEM")
AM_RANGE(0x900000, 0x900001) AM_WRITE(galsnew_6295_bankswitch_w)
diff --git a/src/mame/drivers/exprraid.c b/src/mame/drivers/exprraid.c
index a16fd5283f0..48b5934a514 100644
--- a/src/mame/drivers/exprraid.c
+++ b/src/mame/drivers/exprraid.c
@@ -143,10 +143,10 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( exprraid )
- PORT_START_TAG("IN0") /* IN 0 - 0x3800 */
+ PORT_START("IN0") /* IN 0 - 0x3800 */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW0") /* DSW 0 - 0x1800 */
+ PORT_START("DSW0") /* DSW 0 - 0x1800 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -166,7 +166,7 @@ static INPUT_PORTS_START( exprraid )
PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* IN 1 - 0x1801 */
+ PORT_START("IN1") /* IN 1 - 0x1801 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -176,7 +176,7 @@ static INPUT_PORTS_START( exprraid )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN2") /* IN 2 - 0x1802 */
+ PORT_START("IN2") /* IN 2 - 0x1802 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -186,7 +186,7 @@ static INPUT_PORTS_START( exprraid )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("DSW1") /* IN 3 - 0x1803 */
+ PORT_START("DSW1") /* IN 3 - 0x1803 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x03, "3" )
diff --git a/src/mame/drivers/exterm.c b/src/mame/drivers/exterm.c
index 5f2cc4bab62..86d76fb8a59 100644
--- a/src/mame/drivers/exterm.c
+++ b/src/mame/drivers/exterm.c
@@ -155,7 +155,7 @@ static UINT16 exterm_trackball_port_r(running_machine *machine, int which, UINT1
aimpos[which] = (aimpos[which] + trackball_diff) & 0x3f;
/* Combine it with the standard input bits */
- port = which ? input_port_read(machine, "IN1") : input_port_read(machine, "IN0");
+ port = which ? input_port_read(machine, "P2") : input_port_read(machine, "P1");
return (port & 0xc0ff) | (aimpos[which] << 8);
}
@@ -319,7 +319,7 @@ static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x01000000, 0x013fffff) AM_MIRROR(0xfc000000) AM_READWRITE(exterm_host_data_r, exterm_host_data_w)
AM_RANGE(0x01400000, 0x0143ffff) AM_MIRROR(0xfc000000) AM_READ(exterm_input_port_0_r)
AM_RANGE(0x01440000, 0x0147ffff) AM_MIRROR(0xfc000000) AM_READ(exterm_input_port_1_r)
- AM_RANGE(0x01480000, 0x014bffff) AM_MIRROR(0xfc000000) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x01480000, 0x014bffff) AM_MIRROR(0xfc000000) AM_READ_PORT("DSW")
AM_RANGE(0x01500000, 0x0153ffff) AM_MIRROR(0xfc000000) AM_WRITE(exterm_output_port_0_w)
AM_RANGE(0x01580000, 0x015bffff) AM_MIRROR(0xfc000000) AM_WRITE(sound_latch_w)
AM_RANGE(0x015c0000, 0x015fffff) AM_MIRROR(0xfc000000) AM_WRITE(watchdog_reset16_w)
@@ -371,7 +371,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( exterm )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("P1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP) PORT_8WAY PORT_PLAYER(1)
@@ -384,7 +384,7 @@ static INPUT_PORTS_START( exterm )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE( 0x8000, IP_ACTIVE_LOW )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP) PORT_8WAY PORT_PLAYER(2)
@@ -396,7 +396,7 @@ static INPUT_PORTS_START( exterm )
PORT_BIT( 0x3f00, IP_ACTIVE_LOW, IPT_SPECIAL) /* trackball data */
PORT_BIT( 0xc000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW") /* DSW */
+ PORT_START("DSW")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unused ) ) /* According to the test screen */
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -425,10 +425,10 @@ static INPUT_PORTS_START( exterm )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DIAL0") /* IN3, fake trackball input port */
+ PORT_START("DIAL0") /* Fake trackball input port */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X)
- PORT_START_TAG("DIAL1") /* IN4, fake trackball input port. */
+ PORT_START("DIAL1") /* Fake trackball input port. */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M)
INPUT_PORTS_END
diff --git a/src/mame/drivers/exzisus.c b/src/mame/drivers/exzisus.c
index 51a6713c2f4..a237f19b898 100644
--- a/src/mame/drivers/exzisus.c
+++ b/src/mame/drivers/exzisus.c
@@ -183,11 +183,11 @@ static ADDRESS_MAP_START( cpub_readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xefff) AM_READ(SMH_RAM)
AM_RANGE(0xf000, 0xf000) AM_READ(SMH_NOP)
AM_RANGE(0xf001, 0xf001) AM_READ(taitosound_comm_r)
- AM_RANGE(0xf400, 0xf400) AM_READ(input_port_0_r)
- AM_RANGE(0xf401, 0xf401) AM_READ(input_port_1_r)
- AM_RANGE(0xf402, 0xf402) AM_READ(input_port_2_r)
- AM_RANGE(0xf404, 0xf404) AM_READ(input_port_3_r)
- AM_RANGE(0xf405, 0xf405) AM_READ(input_port_4_r)
+ AM_RANGE(0xf400, 0xf400) AM_READ_PORT("P1")
+ AM_RANGE(0xf401, 0xf401) AM_READ_PORT("P2")
+ AM_RANGE(0xf402, 0xf402) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0xf404, 0xf404) AM_READ_PORT("DSWA")
+ AM_RANGE(0xf405, 0xf405) AM_READ_PORT("DSWB")
AM_RANGE(0xf800, 0xffff) AM_READ(exzisus_sharedram_ab_r)
ADDRESS_MAP_END
@@ -246,13 +246,13 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( exzisus )
- PORT_START_TAG("IN0")
+ PORT_START("P1")
TAITO_JOY_UDRL_2_BUTTONS( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("P2")
TAITO_JOY_UDRL_2_BUTTONS( 2 )
- PORT_START_TAG("IN2")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -261,11 +261,11 @@ static INPUT_PORTS_START( exzisus )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_COCKTAIL
TAITO_COINAGE_JAPAN_OLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x08, "100k and every 150k" )
diff --git a/src/mame/drivers/f-32.c b/src/mame/drivers/f-32.c
index 5379686f6b3..afb78805c4e 100644
--- a/src/mame/drivers/f-32.c
+++ b/src/mame/drivers/f-32.c
@@ -118,7 +118,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mosaicf2 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0000ffff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -130,7 +130,7 @@ static INPUT_PORTS_START( mosaicf2 )
PORT_BIT( 0x00800000, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xff000000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x000000ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x00000100, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x00000200, IP_ACTIVE_LOW, IPT_COIN2 )
diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c
index 003139575ab..46beda24673 100644
--- a/src/mame/drivers/f1gp.c
+++ b/src/mame/drivers/f1gp.c
@@ -274,7 +274,7 @@ static ADDRESS_MAP_START( f1gpb_cpu2_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
static INPUT_PORTS_START( f1gp )
- PORT_START
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
@@ -292,7 +292,7 @@ static INPUT_PORTS_START( f1gp )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0100, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -341,7 +341,7 @@ static INPUT_PORTS_START( f1gp )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START
+ PORT_START("DSW2")
PORT_SERVICE( 0x0100, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0200, DEF_STR( Off ) )
@@ -365,7 +365,7 @@ static INPUT_PORTS_START( f1gp )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START
+ PORT_START("DSW3")
PORT_DIPNAME( 0x001f, 0x0010, "Country" )
PORT_DIPSETTING( 0x0010, DEF_STR( World ) )
PORT_DIPSETTING( 0x0001, "USA & Canada" )
@@ -379,7 +379,7 @@ INPUT_PORTS_END
/* the same as f1gp, but with an extra button */
static INPUT_PORTS_START( f1gp2 )
- PORT_START
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
@@ -397,7 +397,7 @@ static INPUT_PORTS_START( f1gp2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0100, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -446,7 +446,7 @@ static INPUT_PORTS_START( f1gp2 )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START
+ PORT_START("DSW2")
PORT_SERVICE( 0x0100, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0200, DEF_STR( Off ) )
@@ -470,7 +470,7 @@ static INPUT_PORTS_START( f1gp2 )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START
+ PORT_START("DSW3")
PORT_DIPNAME( 0x0001, 0x0001, "Country" )
PORT_DIPSETTING( 0x0001, DEF_STR( World ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Japan ) )
diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c
index f60a7e4f460..cd4f4dc0bff 100644
--- a/src/mame/drivers/fantland.c
+++ b/src/mame/drivers/fantland.c
@@ -405,7 +405,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( fantland )
- PORT_START_TAG("a3000") /* IN0 - a3000 */
+ PORT_START("a3000") /* IN0 - a3000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
@@ -425,7 +425,7 @@ static INPUT_PORTS_START( fantland )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_START_TAG("a3002") /* IN2 - a3002 */
+ PORT_START("a3002") /* IN2 - a3002 */
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 3C_1C ) )
@@ -479,7 +479,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( galaxygn )
- PORT_START /* IN0 - 53000 */
+ PORT_START("P1") /* IN0 - 53000 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
@@ -489,7 +489,7 @@ static INPUT_PORTS_START( galaxygn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_START /* IN1 - 53001 */
+ PORT_START("P2") /* IN1 - 53001 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
@@ -499,7 +499,7 @@ static INPUT_PORTS_START( galaxygn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_START /* IN2 - 53002 */
+ PORT_START("DSW1") /* IN2 - 53002 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
@@ -522,7 +522,7 @@ static INPUT_PORTS_START( galaxygn )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START /* IN3 - 53003 */
+ PORT_START("DSW2") /* IN3 - 53003 */
PORT_DIPNAME( 0x01, 0x01, "Test Sound" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -554,7 +554,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( borntofi )
- PORT_START_TAG("IN0") /* IN0 - 53000 (Lightgun) */
+ PORT_START("IN0") /* IN0 - 53000 (Lightgun) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -564,7 +564,7 @@ static INPUT_PORTS_START( borntofi )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 - 53001 (Lightgun) */
+ PORT_START("IN1") /* IN1 - 53001 (Lightgun) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
@@ -574,7 +574,7 @@ static INPUT_PORTS_START( borntofi )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2 - 53000 (Trackball) */
+ PORT_START("IN2") /* IN2 - 53000 (Trackball) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) // trackball x
@@ -584,7 +584,7 @@ static INPUT_PORTS_START( borntofi )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN3") /* IN3 - 53001 (Trackball) */
+ PORT_START("IN3") /* IN3 - 53001 (Trackball) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) // trackball x
@@ -594,7 +594,7 @@ static INPUT_PORTS_START( borntofi )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START_TAG("IN4") /* IN4 - 53000 (Joystick) */
+ PORT_START("IN4") /* IN4 - 53000 (Joystick) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
@@ -604,7 +604,7 @@ static INPUT_PORTS_START( borntofi )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN5") /* IN5 - 53001 (Joystick) */
+ PORT_START("IN5") /* IN5 - 53001 (Joystick) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
@@ -614,7 +614,7 @@ static INPUT_PORTS_START( borntofi )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START_TAG("IN6") /* IN6 - 53002 */
+ PORT_START("IN6") /* IN6 - 53002 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
@@ -637,7 +637,7 @@ static INPUT_PORTS_START( borntofi )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG( "Controls" ) /* IN7 - 53003 */
+ PORT_START( "Controls" ) /* IN7 - 53003 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Controls ) )
// PORT_DIPSETTING( 0x01, "Lightgun" )
PORT_DIPSETTING( 0x03, "Lightgun" )
@@ -662,28 +662,28 @@ static INPUT_PORTS_START( borntofi )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("P1 Lightgun Y") /* IN8 - 57000 */
+ PORT_START("P1 Lightgun Y") /* IN8 - 57000 */
PORT_BIT( 0xff, 0xb0, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, (352.0 - 12) / 352, 12.0 / 352, 0) PORT_MINMAX(0x80,0xfc) PORT_SENSITIVITY(100) PORT_KEYDELTA(5) PORT_PLAYER(1)
- PORT_START_TAG("P1 Lightgun X") /* IN9 - 57001 */
+ PORT_START("P1 Lightgun X") /* IN9 - 57001 */
PORT_BIT( 0xff, 0x60, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX(0x07,0xb7) PORT_SENSITIVITY(100) PORT_KEYDELTA(5) PORT_PLAYER(1)
- PORT_START_TAG("P2 Lightgun Y") /* IN10 - 57002 */
+ PORT_START("P2 Lightgun Y") /* IN10 - 57002 */
PORT_BIT( 0xff, 0xb0, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, (352.0 - 12) / 352, 12.0 / 352, 0) PORT_MINMAX(0x80,0xfc) PORT_SENSITIVITY(100) PORT_KEYDELTA(5) PORT_PLAYER(2)
- PORT_START_TAG("P2 Lightgun X") /* IN11 - 57003 */
+ PORT_START("P2 Lightgun X") /* IN11 - 57003 */
PORT_BIT( 0xff, 0x70, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX(0x07,0xb7) PORT_SENSITIVITY(100) PORT_KEYDELTA(5) PORT_PLAYER(2)
- PORT_START_TAG("P1 Trackball Y") /* IN12 - 53000 */
+ PORT_START("P1 Trackball Y") /* IN12 - 53000 */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(10) PORT_KEYDELTA(5) PORT_PLAYER(1) PORT_RESET
- PORT_START_TAG("P1 Trackball X") /* IN13 - 53000 */
+ PORT_START("P1 Trackball X") /* IN13 - 53000 */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(10) PORT_KEYDELTA(5) PORT_PLAYER(1) PORT_RESET
- PORT_START_TAG("P2 Trackball Y") /* IN14 - 53001 */
+ PORT_START("P2 Trackball Y") /* IN14 - 53001 */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(10) PORT_KEYDELTA(5) PORT_PLAYER(2)
- PORT_START_TAG("P2 Trackball X") /* IN15 - 53001 */
+ PORT_START("P2 Trackball X") /* IN15 - 53001 */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(10) PORT_KEYDELTA(5) PORT_PLAYER(2)
INPUT_PORTS_END
@@ -706,7 +706,7 @@ static CUSTOM_INPUT( wheelrun_wheel_r )
}
static INPUT_PORTS_START( wheelrun )
- PORT_START_TAG("53000") /* IN0 - 53000 */
+ PORT_START("53000") /* IN0 - 53000 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -714,7 +714,7 @@ static INPUT_PORTS_START( wheelrun )
PORT_BIT( 0x70, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(wheelrun_wheel_r, (void *)0)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("53001") /* IN1 - 53001 */
+ PORT_START("53001") /* IN1 - 53001 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -722,7 +722,7 @@ static INPUT_PORTS_START( wheelrun )
PORT_BIT( 0x70, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(wheelrun_wheel_r, (void *)1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("53002") /* IN2 - 53002 */
+ PORT_START("53002") /* IN2 - 53002 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
@@ -745,7 +745,7 @@ static INPUT_PORTS_START( wheelrun )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("53003") /* IN3 - 53003 */
+ PORT_START("53003") /* IN3 - 53003 */
PORT_DIPNAME( 0xff, 0xdf, "Wheel Sensitivity" )
PORT_DIPSETTING( 0x7f, "0" )
PORT_DIPSETTING( 0xbf, "1" )
@@ -756,9 +756,9 @@ static INPUT_PORTS_START( wheelrun )
PORT_DIPSETTING( 0xfd, "6" )
PORT_DIPSETTING( 0xfe, "7" )
- PORT_START_TAG("WHEEL0") /* IN4 */
+ PORT_START("WHEEL0") /* IN4 */
PORT_BIT( 0xff, 0, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_RESET PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("WHEEL1") /* IN5 */
+ PORT_START("WHEEL1") /* IN5 */
PORT_BIT( 0xff, 0, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_RESET PORT_REVERSE PORT_PLAYER(2)
INPUT_PORTS_END
diff --git a/src/mame/drivers/fastfred.c b/src/mame/drivers/fastfred.c
index 01ba4d30987..acc596dbe77 100644
--- a/src/mame/drivers/fastfred.c
+++ b/src/mame/drivers/fastfred.c
@@ -198,7 +198,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( fastfred )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_SERVICE( 0x04, IP_ACTIVE_HIGH )
@@ -208,7 +208,7 @@ static INPUT_PORTS_START( fastfred )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -218,7 +218,7 @@ static INPUT_PORTS_START( fastfred )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, "A 2/1 B 2/1" )
PORT_DIPSETTING( 0x02, "A 2/1 B 1/3" )
@@ -250,7 +250,7 @@ static INPUT_PORTS_START( fastfred )
INPUT_PORTS_END
static INPUT_PORTS_START( flyboy )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -260,7 +260,7 @@ static INPUT_PORTS_START( flyboy )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -270,7 +270,7 @@ static INPUT_PORTS_START( flyboy )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x03, DEF_STR( 6C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
@@ -295,7 +295,7 @@ static INPUT_PORTS_START( flyboy )
INPUT_PORTS_END
static INPUT_PORTS_START( jumpcoas )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x03, DEF_STR( 6C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
@@ -318,9 +318,9 @@ static INPUT_PORTS_START( jumpcoas )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -330,7 +330,7 @@ static INPUT_PORTS_START( jumpcoas )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -342,7 +342,7 @@ static INPUT_PORTS_START( jumpcoas )
INPUT_PORTS_END
static INPUT_PORTS_START( boggy84 )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x03, DEF_STR( 6C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
@@ -365,7 +365,7 @@ static INPUT_PORTS_START( boggy84 )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -391,7 +391,7 @@ static INPUT_PORTS_START( boggy84 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 )
@@ -401,7 +401,7 @@ static INPUT_PORTS_START( boggy84 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -413,7 +413,7 @@ static INPUT_PORTS_START( boggy84 )
INPUT_PORTS_END
static INPUT_PORTS_START( redrobin )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 )
@@ -423,12 +423,12 @@ static INPUT_PORTS_START( redrobin )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
@@ -453,7 +453,7 @@ static INPUT_PORTS_START( redrobin )
INPUT_PORTS_END
static INPUT_PORTS_START( imago )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -463,7 +463,7 @@ static INPUT_PORTS_START( imago )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -473,7 +473,7 @@ static INPUT_PORTS_START( imago )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "3" )
diff --git a/src/mame/drivers/fastlane.c b/src/mame/drivers/fastlane.c
index 80a31025ee8..a3842b17643 100644
--- a/src/mame/drivers/fastlane.c
+++ b/src/mame/drivers/fastlane.c
@@ -127,7 +127,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( fastlane )
- PORT_START /* DSW #1 */
+ PORT_START("DSW1") /* DSW #1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -163,7 +163,7 @@ static INPUT_PORTS_START( fastlane )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START /* DSW #2 */
+ PORT_START("DSW2") /* DSW #2 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -187,7 +187,7 @@ static INPUT_PORTS_START( fastlane )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW #3 */
+ PORT_START("DSW3") /* DSW #3 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -200,7 +200,7 @@ static INPUT_PORTS_START( fastlane )
PORT_DIPSETTING( 0x00, DEF_STR( Infinite ) )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* COINSW */
+ PORT_START("SYSTEM") /* COINSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) /* service */
@@ -209,7 +209,7 @@ static INPUT_PORTS_START( fastlane )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* PLAYER 1 INPUTS */
+ PORT_START("P1") /* PLAYER 1 INPUTS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -218,7 +218,7 @@ static INPUT_PORTS_START( fastlane )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* PLAYER 2 INPUTS */
+ PORT_START("P2") /* PLAYER 2 INPUTS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/fcombat.c b/src/mame/drivers/fcombat.c
index d3c64ca45ff..78bee84a870 100644
--- a/src/mame/drivers/fcombat.c
+++ b/src/mame/drivers/fcombat.c
@@ -66,7 +66,7 @@ static INPUT_CHANGED( coin_inserted )
static INPUT_PORTS_START( fcombat )
- PORT_START_TAG("IN0") /* player 1 inputs (muxed on 0xe000) */
+ PORT_START("IN0") /* player 1 inputs (muxed on 0xe000) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -76,7 +76,7 @@ static INPUT_PORTS_START( fcombat )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1") /* player 2 inputs (muxed on 0xe000) */
+ PORT_START("IN1") /* player 2 inputs (muxed on 0xe000) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
@@ -86,7 +86,7 @@ static INPUT_PORTS_START( fcombat )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("DSW0") /* dip switches (0xe100) */
+ PORT_START("DSW0") /* dip switches (0xe100) */
PORT_DIPNAME( 0x07, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x01, "2" )
@@ -109,7 +109,7 @@ static INPUT_PORTS_START( fcombat )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW1") /* dip switches/VBLANK (0xe200) */
+ PORT_START("DSW1") /* dip switches/VBLANK (0xe200) */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) ) // related to vblank
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -121,7 +121,7 @@ static INPUT_PORTS_START( fcombat )
PORT_DIPSETTING( 0x0c, DEF_STR( 1C_4C ) )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
INPUT_PORTS_END
diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c
index c3341201778..e255fd67ef6 100644
--- a/src/mame/drivers/fcrash.c
+++ b/src/mame/drivers/fcrash.c
@@ -351,9 +351,9 @@ static ADDRESS_MAP_START( fcrash_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x800030, 0x800031) AM_WRITE(cps1_coinctrl_w)
AM_RANGE(0x800100, 0x80013f) AM_RAM AM_BASE(&cps1_cps_a_regs) /* CPS-A custom */
AM_RANGE(0x800140, 0x80017f) AM_RAM AM_BASE(&cps1_cps_b_regs) /* CPS-B custom */
- AM_RANGE(0x880000, 0x880001) AM_READ(cps1_in1_r) /* Player input ports */
- AM_RANGE(0x880006, 0x880007) AM_WRITE(fcrash_soundlatch_w) /* Sound command */
- AM_RANGE(0x880008, 0x88000f) AM_READ(cps1_dsw_r) /* System input ports / Dip Switches */
+ AM_RANGE(0x880000, 0x880001) AM_READ_PORT("IN1") /* Player input ports */
+ AM_RANGE(0x880006, 0x880007) AM_WRITE(fcrash_soundlatch_w) /* Sound command */
+ AM_RANGE(0x880008, 0x88000f) AM_READ(cps1_dsw_r) /* System input ports / Dip Switches */
AM_RANGE(0x890000, 0x890001) AM_WRITENOP // palette related?
AM_RANGE(0x900000, 0x92ffff) AM_RAM_WRITE(cps1_gfxram_w) AM_BASE(&cps1_gfxram) AM_SIZE(&cps1_gfxram_size)
AM_RANGE(0xff0000, 0xffffff) AM_RAM
@@ -376,16 +376,16 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( kodb_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x3fffff) AM_ROM
- AM_RANGE(0x800000, 0x800007) AM_READ(cps1_in1_r) /* Player input ports */
+ AM_RANGE(0x800000, 0x800007) AM_READ_PORT("IN1") /* Player input ports */
/* forgottn, willow, cawing, nemo, varth read from 800010. Probably debug input leftover from development */
- AM_RANGE(0x800018, 0x80001f) AM_READ(cps1_dsw_r) /* System input ports / Dip Switches */
- AM_RANGE(0x800020, 0x800021) AM_READNOP /* ? Used by Rockman ? not mapped according to PAL */
+ AM_RANGE(0x800018, 0x80001f) AM_READ(cps1_dsw_r) /* System input ports / Dip Switches */
+ AM_RANGE(0x800020, 0x800021) AM_READNOP /* ? Used by Rockman ? not mapped according to PAL */
AM_RANGE(0x800030, 0x800037) AM_WRITE(cps1_coinctrl_w)
/* Forgotten Worlds has dial controls on B-board mapped at 800040-80005f. See DRIVER_INIT */
AM_RANGE(0x800100, 0x80013f) AM_WRITE(cps1_cps_a_w) AM_BASE(&cps1_cps_a_regs) /* CPS-A custom */
AM_RANGE(0x800140, 0x80017f) AM_READWRITE(cps1_cps_b_r, cps1_cps_b_w) AM_BASE(&cps1_cps_b_regs) /* CPS-B custom */
-// AM_RANGE(0x800180, 0x800187) AM_WRITE(cps1_soundlatch_w) /* Sound command */
-// AM_RANGE(0x800188, 0x80018f) AM_WRITE(cps1_soundlatch2_w) /* Sound timer fade */
+// AM_RANGE(0x800180, 0x800187) AM_WRITE(cps1_soundlatch_w) /* Sound command */
+// AM_RANGE(0x800188, 0x80018f) AM_WRITE(cps1_soundlatch2_w) /* Sound timer fade */
AM_RANGE(0x8001c0, 0x8001ff) AM_READWRITE(cps1_cps_b_r, cps1_cps_b_w) /* mirror (SF2 revision "E" US 910228) */
AM_RANGE(0x900000, 0x92ffff) AM_RAM_WRITE(cps1_gfxram_w) AM_BASE(&cps1_gfxram) AM_SIZE(&cps1_gfxram_size) /* SF2CE executes code from here */
AM_RANGE(0xff0000, 0xffffff) AM_RAM
@@ -468,7 +468,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( fcrash )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -478,14 +478,14 @@ static INPUT_PORTS_START( fcrash )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_1
PORT_DIPNAME( 0x40, 0x40, "2 Coins to Start, 1 to Continue" )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x07, 0x04, "Difficulty Level 1" )
PORT_DIPSETTING( 0x07, DEF_STR( Easiest ) ) // "01"
PORT_DIPSETTING( 0x06, DEF_STR( Easier ) ) // "02"
@@ -507,7 +507,7 @@ static INPUT_PORTS_START( fcrash )
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x03, "2" )
@@ -532,7 +532,7 @@ static INPUT_PORTS_START( fcrash )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -553,7 +553,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( kodb )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -563,7 +563,7 @@ static INPUT_PORTS_START( kodb )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
CPS1_COINAGE_2( "SW(A)" )
PORT_DIPNAME( 0x08, 0x08, "Coin Slots" ) PORT_DIPLOCATION("SW(A):4")
PORT_DIPSETTING( 0x00, "1" )
@@ -577,7 +577,7 @@ static INPUT_PORTS_START( kodb )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW(A):8" )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
CPS1_DIFFICULTY_1( "SW(B)" )
PORT_DIPNAME( 0x38, 0x38, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW(B):4,5,6")
PORT_DIPSETTING( 0x30, "1" )
@@ -594,7 +594,7 @@ static INPUT_PORTS_START( kodb )
PORT_DIPSETTING( 0x40, "160k and every 450k" )
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW(C):1" )
PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "SW(C):2" )
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW(C):3")
@@ -616,7 +616,7 @@ static INPUT_PORTS_START( kodb )
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -634,7 +634,7 @@ static INPUT_PORTS_START( kodb )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* Player 3 */
+ PORT_START("IN2") /* Player 3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
diff --git a/src/mame/drivers/fgoal.c b/src/mame/drivers/fgoal.c
index e0426b275ea..943cdbb750f 100644
--- a/src/mame/drivers/fgoal.c
+++ b/src/mame/drivers/fgoal.c
@@ -255,7 +255,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( fgoal )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_TILT )
PORT_DIPNAME( 0x40, 0x40, "Display Coinage Settings" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
@@ -280,7 +280,7 @@ static INPUT_PORTS_START( fgoal )
/* extra credit score changes depending on player's performance */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* 128V */
PORT_DIPNAME( 0x40, 0x00, DEF_STR( Cabinet ))
PORT_DIPSETTING( 0x00, DEF_STR( Upright ))
@@ -300,10 +300,10 @@ static INPUT_PORTS_START( fgoal )
/* game freezes when analog controls read $00 or $ff */
- PORT_START_TAG("PADDLE0")
+ PORT_START("PADDLE0")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(1, 254) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("PADDLE1")
+ PORT_START("PADDLE1")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(1, 254) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_REVERSE PORT_PLAYER(2)
INPUT_PORTS_END
diff --git a/src/mame/drivers/filetto.c b/src/mame/drivers/filetto.c
index 38c0c777c63..266fd05db52 100644
--- a/src/mame/drivers/filetto.c
+++ b/src/mame/drivers/filetto.c
@@ -579,7 +579,7 @@ static ADDRESS_MAP_START( filetto_io, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( filetto )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) //START1
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1)
@@ -599,7 +599,7 @@ static INPUT_PORTS_START( filetto )
DSW2
<unused>
*/
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/finalizr.c b/src/mame/drivers/finalizr.c
index 11f82f5b9b4..3f4827338e7 100644
--- a/src/mame/drivers/finalizr.c
+++ b/src/mame/drivers/finalizr.c
@@ -155,7 +155,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( finalizr )
- PORT_START /* IN2 */
+ PORT_START("SYSTEM") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -165,7 +165,7 @@ static INPUT_PORTS_START( finalizr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -175,7 +175,7 @@ static INPUT_PORTS_START( finalizr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -185,7 +185,7 @@ static INPUT_PORTS_START( finalizr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* DSW */
+ PORT_START("DSW1") /* DSW */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -221,7 +221,7 @@ static INPUT_PORTS_START( finalizr )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START /* DSW */
+ PORT_START("DSW2") /* DSW */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -244,7 +244,7 @@ static INPUT_PORTS_START( finalizr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW */
+ PORT_START("DSW3") /* DSW */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -261,7 +261,7 @@ static INPUT_PORTS_START( finalizr )
INPUT_PORTS_END
static INPUT_PORTS_START( finalizb )
- PORT_START /* IN2 */
+ PORT_START("SYSTEM") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -271,7 +271,7 @@ static INPUT_PORTS_START( finalizb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -281,7 +281,7 @@ static INPUT_PORTS_START( finalizb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -291,7 +291,7 @@ static INPUT_PORTS_START( finalizb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* DSW */
+ PORT_START("DSW1") /* DSW */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -327,7 +327,7 @@ static INPUT_PORTS_START( finalizb )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
/* PORT_DIPSETTING( 0x00, "Invalid" ) */
- PORT_START /* DSW */
+ PORT_START("DSW2") /* DSW */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -351,7 +351,7 @@ static INPUT_PORTS_START( finalizb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW */
+ PORT_START("DSW3") /* DSW */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
diff --git a/src/mame/drivers/findout.c b/src/mame/drivers/findout.c
index 9fdddc76bdd..fcc2ecf30a7 100644
--- a/src/mame/drivers/findout.c
+++ b/src/mame/drivers/findout.c
@@ -220,7 +220,7 @@ ADDRESS_MAP_END
#define REELFUN_STANDARD_INPUT \
- PORT_START_TAG("IN0") \
+ PORT_START("IN0") \
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2) \
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(2) \
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
@@ -230,7 +230,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
\
- PORT_START_TAG("IN1") /* IN1 */\
+ PORT_START("IN1") /* IN1 */\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("1 Left A-Z") \
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("2 Right A-Z") \
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("3 Select Letter") \
@@ -241,7 +241,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
#define TRIVIA_STANDARD_INPUT \
- PORT_START_TAG("IN0") \
+ PORT_START("IN0") \
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2) \
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(2) \
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* ticket status */ \
@@ -251,7 +251,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
\
- PORT_START_TAG("IN1") /* IN1 */\
+ PORT_START("IN1") /* IN1 */\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) \
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) \
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) \
@@ -262,7 +262,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
static INPUT_PORTS_START( reelfun )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x07, 0x01, "Coinage Multiplier" )
PORT_DIPSETTING( 0x07, "7" )
PORT_DIPSETTING( 0x06, "6" )
@@ -292,7 +292,7 @@ static INPUT_PORTS_START( reelfun )
INPUT_PORTS_END
static INPUT_PORTS_START( findout )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0x07, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x07, DEF_STR( 7C_1C ) )
PORT_DIPSETTING( 0x06, DEF_STR( 6C_1C ) )
@@ -322,7 +322,7 @@ static INPUT_PORTS_START( findout )
INPUT_PORTS_END
static INPUT_PORTS_START( gt103 )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0x07, 0x01, "Coinage Multiplier" )
PORT_DIPSETTING( 0x07, "7" )
PORT_DIPSETTING( 0x06, "6" )
@@ -352,7 +352,7 @@ static INPUT_PORTS_START( gt103 )
INPUT_PORTS_END
static INPUT_PORTS_START( gt103a )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x03, 0x01, "Questions" )
PORT_DIPSETTING( 0x00, "4" )
PORT_DIPSETTING( 0x01, "5" )
@@ -377,7 +377,7 @@ static INPUT_PORTS_START( gt103a )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2) PORT_CONDITION("DSWA", 0x40, PORTCOND_EQUALS, 0x40)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_IMPULSE(2) PORT_CONDITION("DSWA", 0x40, PORTCOND_EQUALS, 0x00) PORT_NAME ("Start in no coins mode")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(2) PORT_CONDITION("DSWA", 0x40, PORTCOND_EQUALS, 0x40)
@@ -389,7 +389,7 @@ static INPUT_PORTS_START( gt103a )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 )
@@ -414,7 +414,7 @@ static INPUT_PORTS_START( quiz )
INPUT_PORTS_END
static INPUT_PORTS_START( gt507uk )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0x01, 0x00, "If Ram Error" )
PORT_DIPSETTING( 0x01, "Freeze" )
PORT_DIPSETTING( 0x00, "Play" )
diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c
index 82d22f75435..41685e1d6a6 100644
--- a/src/mame/drivers/firebeat.c
+++ b/src/mame/drivers/firebeat.c
@@ -1853,7 +1853,7 @@ static NVRAM_HANDLER(firebeat)
}
static INPUT_PORTS_START(ppp)
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) // Left
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) // Right
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW) // Test
@@ -1862,22 +1862,22 @@ static INPUT_PORTS_START(ppp)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 ) // Start / Ok
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Dip switches */
// ParaParaParadise has 24 sensors, grouped into groups of 3 for each sensor bar
// Sensors 15...23 are only used by the Korean version of PPP, which has 8 sensor bars
- PORT_START_TAG("SENSOR1")
+ PORT_START("SENSOR1")
PORT_BIT( 0x00070000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) // Sensor 0, 1, 2 (Sensor bar 1)
PORT_BIT( 0x00380000, IP_ACTIVE_HIGH, IPT_BUTTON4 ) // Sensor 3, 4, 5 (Sensor bar 2)
PORT_BIT( 0x00c00001, IP_ACTIVE_HIGH, IPT_BUTTON5 ) // Sensor 6, 7, 8 (Sensor bar 3)
PORT_BIT( 0x0000000e, IP_ACTIVE_HIGH, IPT_BUTTON6 ) // Sensor 9, 10,11 (Sensor bar 4)
- PORT_START_TAG("SENSOR2")
+ PORT_START("SENSOR2")
PORT_BIT( 0x00070000, IP_ACTIVE_HIGH, IPT_BUTTON7 ) // Sensor 12,13,14 (Sensor bar 5)
PORT_BIT( 0x00380000, IP_ACTIVE_HIGH, IPT_BUTTON8 ) // Sensor 15,16,17 (Sensor bar 6) (unused by PPP)
PORT_BIT( 0x00c00001, IP_ACTIVE_HIGH, IPT_BUTTON9 ) // Sensor 18,19,20 (Sensor bar 7) (unused by PPP)
@@ -1886,7 +1886,7 @@ static INPUT_PORTS_START(ppp)
INPUT_PORTS_END
static INPUT_PORTS_START(kbm)
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) // Start P1
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) // Start P2
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW) // Test
@@ -1894,20 +1894,20 @@ static INPUT_PORTS_START(kbm)
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 ) // Coin
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // e-Amusement
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Dip switches */
- PORT_START_TAG("WHEEL_P1") // Keyboard modulation wheel (P1)
+ PORT_START("WHEEL_P1") // Keyboard modulation wheel (P1)
PORT_BIT( 0xff, 0x80, IPT_PADDLE_V ) PORT_MINMAX(0xff, 0x00) PORT_SENSITIVITY(30) PORT_KEYDELTA(10)
- PORT_START_TAG("WHEEL_P2") // Keyboard modulation wheel (P2)
+ PORT_START("WHEEL_P2") // Keyboard modulation wheel (P2)
PORT_BIT( 0xff, 0x80, IPT_PADDLE_V ) PORT_MINMAX(0xff, 0x00) PORT_SENSITIVITY(30) PORT_KEYDELTA(10)
- PORT_START_TAG("KEYBOARD_P1")
+ PORT_START("KEYBOARD_P1")
PORT_BIT( 0x000001, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 C1") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x000002, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 C1#") PORT_CODE(KEYCODE_W)
PORT_BIT( 0x000004, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 D1") PORT_CODE(KEYCODE_E)
@@ -1933,7 +1933,7 @@ static INPUT_PORTS_START(kbm)
PORT_BIT( 0x400000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 A2#") PORT_CODE(KEYCODE_B)
PORT_BIT( 0x800000, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 B2") PORT_CODE(KEYCODE_N)
- PORT_START_TAG("KEYBOARD_P2")
+ PORT_START("KEYBOARD_P2")
PORT_BIT( 0x000001, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 C1") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x000002, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 C1#") PORT_CODE(KEYCODE_W)
PORT_BIT( 0x000004, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P2 D1") PORT_CODE(KEYCODE_E)
@@ -1962,7 +1962,7 @@ static INPUT_PORTS_START(kbm)
INPUT_PORTS_END
static INPUT_PORTS_START(popn)
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) // Switch 1
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) // Switch 2
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) // Switch 3
@@ -1972,7 +1972,7 @@ static INPUT_PORTS_START(popn)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON7 ) // Switch 7
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON8 ) // Switch 8
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON9 ) // Switch 9
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) // Coin
@@ -1982,7 +1982,7 @@ static INPUT_PORTS_START(popn)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service") PORT_CODE(KEYCODE_7) // Service
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Dip switches */
INPUT_PORTS_END
diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c
index 9e280b38cd6..c173e21e61b 100644
--- a/src/mame/drivers/firetrap.c
+++ b/src/mame/drivers/firetrap.c
@@ -327,7 +327,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( firetrap )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_4WAY
@@ -337,7 +337,7 @@ static INPUT_PORTS_START( firetrap )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT ) PORT_4WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_4WAY
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_4WAY PORT_COCKTAIL
@@ -347,7 +347,7 @@ static INPUT_PORTS_START( firetrap )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_4WAY PORT_COCKTAIL
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -357,7 +357,7 @@ static INPUT_PORTS_START( firetrap )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
// PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
// PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -382,7 +382,7 @@ static INPUT_PORTS_START( firetrap )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -403,14 +403,14 @@ static INPUT_PORTS_START( firetrap )
PORT_DIPSETTING( 0x40, DEF_STR( Yes ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("COIN") /* Connected to i8751 directly */
+ PORT_START("COIN") /* Connected to i8751 directly */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
INPUT_PORTS_END
static INPUT_PORTS_START( firetpbl )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_4WAY
@@ -420,7 +420,7 @@ static INPUT_PORTS_START( firetpbl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT ) PORT_4WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_4WAY
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_4WAY PORT_COCKTAIL
@@ -430,7 +430,7 @@ static INPUT_PORTS_START( firetpbl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_4WAY PORT_COCKTAIL
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -440,7 +440,7 @@ static INPUT_PORTS_START( firetpbl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) /* bootleg only */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
// PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
// PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -465,7 +465,7 @@ static INPUT_PORTS_START( firetpbl )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
diff --git a/src/mame/drivers/firetrk.c b/src/mame/drivers/firetrk.c
index 114b63dde5d..8a6146821a5 100644
--- a/src/mame/drivers/firetrk.c
+++ b/src/mame/drivers/firetrk.c
@@ -388,13 +388,13 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( firetrk )
- PORT_START_TAG("STEER_1")
+ PORT_START("STEER_1")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("STEER_2")
+ PORT_START("STEER_2")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("DIP_0")
+ PORT_START("DIP_0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) /* other DIPs connect here */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED ) /* other DIPs connect here */
PORT_DIPNAME( 0x0c, 0x08, DEF_STR( Coinage ))
@@ -409,7 +409,7 @@ static INPUT_PORTS_START( firetrk )
PORT_DIPSETTING( 0x20, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ))
- PORT_START_TAG("DIP_1")
+ PORT_START("DIP_1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Language ) )
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
PORT_DIPSETTING( 0x01, DEF_STR( French ) )
@@ -426,7 +426,7 @@ static INPUT_PORTS_START( firetrk )
PORT_DIPSETTING( 0x30, "Conservative" )
PORT_DIPSETTING( 0x00, "Never" )
- PORT_START_TAG("BIT_0")
+ PORT_START("BIT_0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Gas") PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(steer_dir_r, (void *)0)
@@ -438,7 +438,7 @@ static INPUT_PORTS_START( firetrk )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("BIT_6")
+ PORT_START("BIT_6")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Front Player Start")
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 ) PORT_NAME("Back Player Start")
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START3 ) PORT_NAME("Both Players Start")
@@ -450,7 +450,7 @@ static INPUT_PORTS_START( firetrk )
PORT_DIPSETTING( 0x40, "Fire Truck (2 Players)" )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Diag Hold") PORT_CODE(KEYCODE_F6)
- PORT_START_TAG("BIT_7")
+ PORT_START("BIT_7")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(steer_flag_r, (void *)0)
@@ -460,23 +460,23 @@ static INPUT_PORTS_START( firetrk )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(crash_r, (void *)2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Diag Step") PORT_CODE(KEYCODE_F1)
- PORT_START_TAG("HORN")
+ PORT_START("HORN")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Horn") PORT_PLAYER(1) PORT_CHANGED(firetrk_horn_changed, 0)
- PORT_START_TAG("R27")
+ PORT_START("R27")
PORT_ADJUSTER( 20, "R27 - Motor Frequency" )
INPUT_PORTS_END
static INPUT_PORTS_START( superbug )
- PORT_START_TAG("STEER_1")
+ PORT_START("STEER_1")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10)
- PORT_START_TAG("DIP_0")
+ PORT_START("DIP_0")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) /* other DIPs connect here */
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED ) /* other DIPs connect here */
- PORT_START_TAG("DIP_1")
+ PORT_START("DIP_1")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Coinage ))
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ))
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ))
@@ -498,7 +498,7 @@ static INPUT_PORTS_START( superbug )
PORT_DIPSETTING( 0x80, DEF_STR( Spanish ) )
PORT_DIPSETTING( 0xc0, DEF_STR( German ) )
- PORT_START_TAG("BIT_0")
+ PORT_START("BIT_0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(gear_r, (void *)1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Gas")
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(steer_dir_r, (void *)0)
@@ -508,7 +508,7 @@ static INPUT_PORTS_START( superbug )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(skid_r, (void *)0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_TILT )
- PORT_START_TAG("BIT_7")
+ PORT_START("BIT_7")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(gear_r, (void *)2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(gear_r, (void *)0)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(steer_flag_r, (void *)0)
@@ -518,22 +518,22 @@ static INPUT_PORTS_START( superbug )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(crash_r, (void *)0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("Track Select") PORT_CODE(KEYCODE_SPACE)
- PORT_START_TAG("GEAR")
+ PORT_START("GEAR")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Gear 1") PORT_CODE(KEYCODE_Z) PORT_CHANGED(gear_changed, (void *)0)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Gear 2") PORT_CODE(KEYCODE_X) PORT_CHANGED(gear_changed, (void *)1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Gear 3") PORT_CODE(KEYCODE_C) PORT_CHANGED(gear_changed, (void *)2)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Gear 4") PORT_CODE(KEYCODE_V) PORT_CHANGED(gear_changed, (void *)3)
- PORT_START_TAG("R62")
+ PORT_START("R62")
PORT_ADJUSTER( 20, "R62 - Motor Frequency" )
INPUT_PORTS_END
static INPUT_PORTS_START( montecar )
- PORT_START_TAG("STEER_1")
+ PORT_START("STEER_1")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("DIP_0")
+ PORT_START("DIP_0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) /* other DIPs connect here */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED ) /* other DIPs connect here */
PORT_DIPNAME( 0x0c, 0x0c, "Coin 3 Multiplier" )
@@ -548,7 +548,7 @@ static INPUT_PORTS_START( montecar )
PORT_DIPSETTING( 0x20, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ))
- PORT_START_TAG("DIP_1")
+ PORT_START("DIP_1")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Coinage ))
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ))
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ))
@@ -570,7 +570,7 @@ static INPUT_PORTS_START( montecar )
PORT_DIPSETTING( 0x40, DEF_STR( French ) )
PORT_DIPSETTING( 0x00, DEF_STR( German ) )
- PORT_START_TAG("BIT_6")
+ PORT_START("BIT_6")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(gear_r, (void *)0)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(gear_r, (void *)1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(gear_r, (void *)2)
@@ -580,7 +580,7 @@ static INPUT_PORTS_START( montecar )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(steer_dir_r, (void *)0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(skid_r, (void *)1)
- PORT_START_TAG("BIT_7")
+ PORT_START("BIT_7")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_TILT )
PORT_SERVICE( 0x04, IP_ACTIVE_HIGH ) PORT_CHANGED(service_mode_switch_changed, 0)
@@ -590,16 +590,16 @@ static INPUT_PORTS_START( montecar )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(steer_flag_r, (void *)0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(skid_r, (void *)0)
- PORT_START_TAG("GEAR")
+ PORT_START("GEAR")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Gear 1") PORT_CODE(KEYCODE_Z) PORT_CHANGED(gear_changed, (void *)0)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Gear 2") PORT_CODE(KEYCODE_X) PORT_CHANGED(gear_changed, (void *)1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Gear 3") PORT_CODE(KEYCODE_C) PORT_CHANGED(gear_changed, (void *)2)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Gear 4") PORT_CODE(KEYCODE_V) PORT_CHANGED(gear_changed, (void *)3)
- PORT_START_TAG("R89")
+ PORT_START("R89")
PORT_ADJUSTER( 20, "R89 - Motor Frequency" )
- PORT_START_TAG("R88")
+ PORT_START("R88")
PORT_ADJUSTER( 25, "R88 - Drone Motor Frequency" )
INPUT_PORTS_END
diff --git a/src/mame/drivers/fitfight.c b/src/mame/drivers/fitfight.c
index b1ac7cd9f32..f923566472b 100644
--- a/src/mame/drivers/fitfight.c
+++ b/src/mame/drivers/fitfight.c
@@ -284,7 +284,7 @@ static const UPD7810_CONFIG sound_cpu_config =
/* I've put the inputs the same way they can be read in the "test mode" */
static INPUT_PORTS_START( fitfight )
- PORT_START // 0x200000.w
+ PORT_START("IN0") // 0x200000.w
/* players inputs -> 0xe022cc.w */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -303,10 +303,10 @@ static INPUT_PORTS_START( fitfight )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START // 0x300000.w (unused)
+ PORT_START("IN1") // 0x300000.w (unused)
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START // 0x400000.w
+ PORT_START("IN2") // 0x400000.w
/* LSB : system inputs -> 0xe022cf.b */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -360,7 +360,7 @@ static INPUT_PORTS_START( fitfight )
PORT_DIPSETTING( 0x0600, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x0700, DEF_STR( 1C_1C ) )
- PORT_START // 0x500000.w
+ PORT_START("IN3") // 0x500000.w
/* MSB : SW3 -> 0xe04c24.b (cpl) */
PORT_DIPNAME( 0xe000, 0xe000, "Next Credit" )
PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) )
@@ -412,7 +412,7 @@ static INPUT_PORTS_START( fitfight )
INPUT_PORTS_END
static INPUT_PORTS_START( histryma )
- PORT_START // 0x200000.w
+ PORT_START("IN0") // 0x200000.w
/* players inputs -> 0xe02cf2.w and 0xe02cf8.w */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -431,7 +431,7 @@ static INPUT_PORTS_START( histryma )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START // 0x300000.w
+ PORT_START("IN1") // 0x300000.w
/* LSB : players extra inputs -> 0xe02cf5.b and 0xe02cfb.b */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1)
@@ -444,7 +444,7 @@ static INPUT_PORTS_START( histryma )
/* MSB : unused */
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START // 0x400000.w
+ PORT_START("IN2") // 0x400000.w
/* LSB : system inputs -> 0xe02cf7.b and 0xe02cfd.b */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -498,7 +498,7 @@ static INPUT_PORTS_START( histryma )
PORT_DIPSETTING( 0x0000, DEF_STR( 4C_3C ) )
PORT_DIPSETTING( 0x0700, DEF_STR( 1C_1C ) )
- PORT_START // 0x500000.w
+ PORT_START("IN3") // 0x500000.w
/* MSB : SW3 -> 0xe05872.b (cpl) */
PORT_DIPNAME( 0xe000, 0xe000, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0xe000, DEF_STR( 1C_1C ) )
@@ -554,7 +554,7 @@ INPUT_PORTS_END
(the only difference being that there is no "Needed Points/Maximum Points"
Dip Switch, the value always being set to "2/3") */
static INPUT_PORTS_START( bbprot )
- PORT_START // 0x300000.w
+ PORT_START("IN0") // 0x300000.w
/* players inputs -> 0xe0545e.w and 0xe05464.w */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -573,7 +573,7 @@ static INPUT_PORTS_START( bbprot )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START // 0x380000.w
+ PORT_START("IN1") // 0x380000.w
/* LSB : players extra inputs -> 0xe05461.b and 0xe05467.b */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1)
@@ -586,7 +586,7 @@ static INPUT_PORTS_START( bbprot )
/* MSB : unused */
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START // 0x400000.w
+ PORT_START("IN2") // 0x400000.w
/* LSB : system inputs -> 0xe05463.b and 0xe05469.b */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -640,7 +640,7 @@ static INPUT_PORTS_START( bbprot )
PORT_DIPSETTING( 0x0000, DEF_STR( 4C_3C ) )
PORT_DIPSETTING( 0x0700, DEF_STR( 1C_1C ) )
- PORT_START // 0x480000.w
+ PORT_START("IN3") // 0x480000.w
/* MSB : SW3 -> 0xe07e82.b (cpl) */
PORT_DIPNAME( 0xe000, 0xe000, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0xe000, DEF_STR( 1C_1C ) )
diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c
index 5c6bd372565..75d48924e5d 100644
--- a/src/mame/drivers/flkatck.c
+++ b/src/mame/drivers/flkatck.c
@@ -150,7 +150,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( flkatck )
- PORT_START_TAG("DSW1") /* DSW #1 */
+ PORT_START("DSW1") /* DSW #1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -186,7 +186,7 @@ static INPUT_PORTS_START( flkatck )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
//PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START_TAG("DSW2") /* DSW #2 */
+ PORT_START("DSW2") /* DSW #2 */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -209,7 +209,7 @@ static INPUT_PORTS_START( flkatck )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* DSW #3 */
+ PORT_START("DSW3") /* DSW #3 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -222,7 +222,7 @@ static INPUT_PORTS_START( flkatck )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("COIN") /* COINSW & START */
+ PORT_START("COIN") /* COINSW & START */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) /* service */
@@ -232,7 +232,7 @@ static INPUT_PORTS_START( flkatck )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P1") /* PLAYER 1 INPUTS */
+ PORT_START("P1") /* PLAYER 1 INPUTS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -242,7 +242,7 @@ static INPUT_PORTS_START( flkatck )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2") /* PLAYER 2 INPUTS */
+ PORT_START("P2") /* PLAYER 2 INPUTS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/flower.c b/src/mame/drivers/flower.c
index 38040053111..be51789b7c6 100644
--- a/src/mame/drivers/flower.c
+++ b/src/mame/drivers/flower.c
@@ -152,7 +152,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( flower )
- PORT_START_TAG("IN0CPU0")
+ PORT_START("IN0CPU0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
@@ -172,7 +172,7 @@ static INPUT_PORTS_START( flower )
PORT_DIPSETTING( 0x80, "Short" )
PORT_DIPSETTING( 0x00, "Long" )
- PORT_START_TAG("IN1CPU0")
+ PORT_START("IN1CPU0")
PORT_DIPNAME( 0x07, 0x05, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2,3") /* what should be the default value ? */
PORT_DIPSETTING( 0x07, "1" )
PORT_DIPSETTING( 0x06, "2" )
@@ -197,7 +197,7 @@ static INPUT_PORTS_START( flower )
PORT_DIPSETTING( 0x80, "30k, then every 50k" )
PORT_DIPSETTING( 0x00, "50k, then every 80k" )
- PORT_START_TAG("IN0CPU1")
+ PORT_START("IN0CPU1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
@@ -207,7 +207,7 @@ static INPUT_PORTS_START( flower )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("P1 Cutter")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1CPU1")
+ PORT_START("IN1CPU1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c
index 3cdc9ea401c..6819abe2ab9 100644
--- a/src/mame/drivers/flstory.c
+++ b/src/mame/drivers/flstory.c
@@ -265,7 +265,7 @@ ADDRESS_MAP_END
*/
static INPUT_PORTS_START( flstory )
- PORT_START_TAG("DSW0") /*D800*/
+ PORT_START("DSW0") /*D800*/
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x00, "30000 100000" )
PORT_DIPSETTING( 0x01, "30000 150000" )
@@ -289,7 +289,7 @@ static INPUT_PORTS_START( flstory )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW1") /*D801*/
+ PORT_START("DSW1") /*D801*/
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0f, DEF_STR( 9C_1C ) )
PORT_DIPSETTING( 0x0e, DEF_STR( 8C_1C ) )
@@ -325,7 +325,7 @@ static INPUT_PORTS_START( flstory )
PORT_DIPSETTING( 0x60, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x70, DEF_STR( 1C_8C ) )
- PORT_START_TAG("IN0") /* D802 */
+ PORT_START("IN0") /* D802 */
PORT_BIT( 0x07, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_DIPNAME( 0x08, 0x08, DEF_STR( Allow_Continue ) )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
@@ -343,7 +343,7 @@ static INPUT_PORTS_START( flstory )
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x80, "2" )
- PORT_START_TAG("IN1") /* D803 */
+ PORT_START("IN1") /* D803 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -353,14 +353,14 @@ static INPUT_PORTS_START( flstory )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* "BAD IO" if low */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* "BAD IO" if low */
- PORT_START_TAG("IN2") /* D804:P1 */
+ PORT_START("IN2") /* D804:P1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* D806:P2 */
+ PORT_START("IN3") /* D806:P2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
@@ -369,7 +369,7 @@ static INPUT_PORTS_START( flstory )
INPUT_PORTS_END
static INPUT_PORTS_START( onna34ro )
- PORT_START_TAG("DSW0") /* D800*/
+ PORT_START("DSW0") /* D800*/
PORT_DIPNAME(0x03, 0x00, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x00, "200000 200000" )
PORT_DIPSETTING( 0x01, "200000 300000" )
@@ -393,7 +393,7 @@ static INPUT_PORTS_START( onna34ro )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW1") /* D801 */
+ PORT_START("DSW1") /* D801 */
PORT_DIPNAME(0x0f, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0f, DEF_STR( 9C_1C ) )
PORT_DIPSETTING( 0x0e, DEF_STR( 8C_1C ) )
@@ -429,7 +429,7 @@ static INPUT_PORTS_START( onna34ro )
PORT_DIPSETTING( 0x60, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x70, DEF_STR( 1C_8C ) )
- PORT_START_TAG("DSW2") /* D802 */
+ PORT_START("DSW2") /* D802 */
PORT_DIPNAME(0x01, 0x00, "Invulnerability (Cheat)")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -454,7 +454,7 @@ static INPUT_PORTS_START( onna34ro )
PORT_DIPSETTING( 0x80, "A and B" )
PORT_DIPSETTING( 0x00, "A only" )
- PORT_START_TAG("IN0") /* D803: START BUTTONS */
+ PORT_START("IN0") /* D803: START BUTTONS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -464,7 +464,7 @@ static INPUT_PORTS_START( onna34ro )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* "BAD IO" if low */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* "BAD IO" if low */
- PORT_START_TAG("IN1") /* D804: P1 */
+ PORT_START("IN1") /* D804: P1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -474,7 +474,7 @@ static INPUT_PORTS_START( onna34ro )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* D806: P2 */
+ PORT_START("IN2") /* D806: P2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -486,7 +486,7 @@ static INPUT_PORTS_START( onna34ro )
INPUT_PORTS_END
static INPUT_PORTS_START( victnine )
- PORT_START_TAG("DSW0") /* D800 */
+ PORT_START("DSW0") /* D800 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME(0x04, 0x04, DEF_STR( Free_Play ) )
@@ -500,7 +500,7 @@ static INPUT_PORTS_START( victnine )
PORT_DIPSETTING( 0xa0, DEF_STR( Cocktail ) )
PORT_DIPSETTING( 0x00, "MA / MB" )
- PORT_START_TAG("DSW1") /* D801 */
+ PORT_START("DSW1") /* D801 */
PORT_DIPNAME(0x0f, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0f, DEF_STR( 9C_1C ) )
PORT_DIPSETTING( 0x0e, DEF_STR( 8C_1C ) )
@@ -536,7 +536,7 @@ static INPUT_PORTS_START( victnine )
PORT_DIPSETTING( 0x60, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x70, DEF_STR( 1C_8C ) )
- PORT_START_TAG("DSW2") /* D802 */
+ PORT_START("DSW2") /* D802 */
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME(0x10, 0x10, "Coinage Display" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -551,7 +551,7 @@ static INPUT_PORTS_START( victnine )
PORT_DIPSETTING( 0x80, "A and B" )
PORT_DIPSETTING( 0x00, "A only" )
- PORT_START_TAG("IN0") /* D803: START BUTTONS */
+ PORT_START("IN0") /* D803: START BUTTONS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -561,7 +561,7 @@ static INPUT_PORTS_START( victnine )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* D804: P1 */
+ PORT_START("IN1") /* D804: P1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) // A
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) // C
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -571,7 +571,7 @@ static INPUT_PORTS_START( victnine )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* D805: 1P a/b/c/d BUTTONS */
+ PORT_START("IN2") /* D805: 1P a/b/c/d BUTTONS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SPECIAL ) // mcu is ready to receive data from main cpu
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) // mcu has sent data to the main cpu
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 )
@@ -581,7 +581,7 @@ static INPUT_PORTS_START( victnine )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* D806: P2 */
+ PORT_START("IN3") /* D806: P2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL // A
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL // C
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -591,7 +591,7 @@ static INPUT_PORTS_START( victnine )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN4") /* D807: 2P a/b/c/d BUTTONS */
+ PORT_START("IN4") /* D807: 2P a/b/c/d BUTTONS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c
index 13b9bf9620e..6f323834ee8 100644
--- a/src/mame/drivers/flyball.c
+++ b/src/mame/drivers/flyball.c
@@ -170,7 +170,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( flyball )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -186,19 +186,19 @@ static INPUT_PORTS_START( flyball )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("STICK1_Y") /* IN1 */
+ PORT_START("STICK1_Y") /* IN1 */
PORT_BIT( 0x3f, 0x20, IPT_AD_STICK_Y ) PORT_MINMAX(1,63) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("STICK1_X") /* IN2 */
+ PORT_START("STICK1_X") /* IN2 */
PORT_BIT( 0x3f, 0x20, IPT_AD_STICK_X ) PORT_MINMAX(1,63) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("STICK0_Y") /* IN3 */
+ PORT_START("STICK0_Y") /* IN3 */
PORT_BIT( 0x3f, 0x20, IPT_AD_STICK_Y ) PORT_MINMAX(1,63) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("STICK0_X") /* IN4 */
+ PORT_START("STICK0_X") /* IN4 */
PORT_BIT( 0x3f, 0x20, IPT_AD_STICK_X ) PORT_MINMAX(1,63) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("IN1") /* IN5 */
+ PORT_START("IN1") /* IN5 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xFE, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/foodf.c b/src/mame/drivers/foodf.c
index 830f2ef6f46..c85f3ec12dd 100644
--- a/src/mame/drivers/foodf.c
+++ b/src/mame/drivers/foodf.c
@@ -264,19 +264,19 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( foodf )
- PORT_START_TAG("STICK0_X") /* IN0 */
+ PORT_START("STICK0_X") /* IN0 */
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("STICK1_X") /* IN1 */
+ PORT_START("STICK1_X") /* IN1 */
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE PORT_COCKTAIL PORT_PLAYER(2)
- PORT_START_TAG("STICK0_Y") /* IN2 */
+ PORT_START("STICK0_Y") /* IN2 */
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("STICK1_Y") /* IN3 */
+ PORT_START("STICK1_Y") /* IN3 */
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE PORT_COCKTAIL PORT_PLAYER(2)
- PORT_START_TAG("IN0") /* IN4 */
+ PORT_START("IN0") /* IN4 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -286,7 +286,7 @@ static INPUT_PORTS_START( foodf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW") /* SW1 */
+ PORT_START("DSW") /* SW1 */
PORT_DIPNAME( 0x07, 0x00, "Bonus Coins" )
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
PORT_DIPSETTING( 0x05, "1 for every 2" )
diff --git a/src/mame/drivers/fortecar.c b/src/mame/drivers/fortecar.c
index ea03b057253..1f9ebdd9fe2 100644
--- a/src/mame/drivers/fortecar.c
+++ b/src/mame/drivers/fortecar.c
@@ -46,7 +46,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( fortecar )
- PORT_START /* 8bit */
+ PORT_START("IN0") /* 8bit */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -72,7 +72,7 @@ static INPUT_PORTS_START( fortecar )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* 8bit */
+ PORT_START("IN1") /* 8bit */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/freekick.c b/src/mame/drivers/freekick.c
index 553f46b3248..0fbd8cde0e9 100644
--- a/src/mame/drivers/freekick.c
+++ b/src/mame/drivers/freekick.c
@@ -313,7 +313,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( pbillrd )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
@@ -323,7 +323,7 @@ static INPUT_PORTS_START( pbillrd )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
@@ -333,7 +333,7 @@ static INPUT_PORTS_START( pbillrd )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "Balls" )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
@@ -358,7 +358,7 @@ static INPUT_PORTS_START( pbillrd )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0c, DEF_STR( 4C_1C ) )
@@ -397,10 +397,10 @@ INPUT_PORTS_END
static INPUT_PORTS_START( gigas )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15) PORT_REVERSE
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15) PORT_REVERSE PORT_COCKTAIL
PORT_INCLUDE( pbillrd )
@@ -437,7 +437,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( freekck )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
@@ -461,7 +461,7 @@ static INPUT_PORTS_START( freekck )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0c, DEF_STR( 4C_1C ) )
@@ -497,7 +497,7 @@ static INPUT_PORTS_START( freekck )
PORT_DIPSETTING( 0x40, "1 Coin/25 Credits" )
PORT_DIPSETTING( 0x80, "1 Coin/50 Credits" )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x00, "Manufacturer" )
PORT_DIPSETTING( 0x00, "Nihon System" )
PORT_DIPSETTING( 0x01, "Sega/Nihon System" )
@@ -523,7 +523,7 @@ static INPUT_PORTS_START( freekck )
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x80, "2" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
@@ -533,7 +533,7 @@ static INPUT_PORTS_START( freekck )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
@@ -543,10 +543,10 @@ static INPUT_PORTS_START( freekck )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15) PORT_REVERSE
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15) PORT_REVERSE PORT_COCKTAIL
INPUT_PORTS_END
diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c
index a7aa89188fc..5fb5e08711a 100644
--- a/src/mame/drivers/fromanc2.c
+++ b/src/mame/drivers/fromanc2.c
@@ -512,7 +512,7 @@ ADDRESS_MAP_END
// ----------------------------------------------------------------------------
#define VSYSMJCTRL_PORT1 \
- PORT_START_TAG("IN1")\
+ PORT_START("IN1")\
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_A )\
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_E )\
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_I )\
@@ -531,7 +531,7 @@ ADDRESS_MAP_END
PORT_BIT ( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
#define VSYSMJCTRL_PORT2 \
- PORT_START_TAG("IN2")\
+ PORT_START("IN2")\
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_B )\
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_F )\
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_J )\
@@ -550,7 +550,7 @@ ADDRESS_MAP_END
PORT_BIT ( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
#define VSYSMJCTRL_PORT3 \
- PORT_START_TAG("IN3")\
+ PORT_START("IN3")\
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_C )\
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_G )\
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_K )\
@@ -569,7 +569,7 @@ ADDRESS_MAP_END
PORT_BIT ( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
#define VSYSMJCTRL_PORT4 \
- PORT_START_TAG("IN4") \
+ PORT_START("IN4") \
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_D )\
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_H )\
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_L )\
@@ -588,7 +588,7 @@ ADDRESS_MAP_END
PORT_BIT ( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
static INPUT_PORTS_START( fromanc2 )
- PORT_START_TAG("IN0") /* (0) COIN SW, TEST SW, EEPROM DATA, etc */
+ PORT_START("IN0") /* (0) COIN SW, TEST SW, EEPROM DATA, etc */
PORT_BIT ( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1 (1P)
PORT_BIT ( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2 (1P)
PORT_BIT ( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 ) // COIN1 (2P)
@@ -613,7 +613,7 @@ static INPUT_PORTS_START( fromanc2 )
INPUT_PORTS_END
static INPUT_PORTS_START( fromanc4 )
- PORT_START_TAG("IN0") /* (0) COIN SW, TEST SW, EEPROM DATA, etc */
+ PORT_START("IN0") /* (0) COIN SW, TEST SW, EEPROM DATA, etc */
PORT_SERVICE_NO_TOGGLE( 0x0001, IP_ACTIVE_LOW) // TEST (1P)
PORT_BIT ( 0x0002, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1 (1P)
PORT_BIT ( 0x0004, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2 (1P)
diff --git a/src/mame/drivers/fromance.c b/src/mame/drivers/fromance.c
index f0abcd77f4b..7b7c20c34c8 100644
--- a/src/mame/drivers/fromance.c
+++ b/src/mame/drivers/fromance.c
@@ -391,7 +391,7 @@ ADDRESS_MAP_END
*************************************/
#define FROMANCE_KEYMATRIX1 \
- PORT_START_TAG("KEY1") \
+ PORT_START("KEY1") \
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) \
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) \
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) \
@@ -402,7 +402,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
#define FROMANCE_KEYMATRIX2 \
- PORT_START_TAG("KEY2") \
+ PORT_START("KEY2") \
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) \
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) \
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) \
@@ -413,7 +413,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
#define FROMANCE_KEYMATRIX3 \
- PORT_START_TAG("KEY3") \
+ PORT_START("KEY3") \
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) \
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) \
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) \
@@ -424,7 +424,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
#define FROMANCE_KEYMATRIX4 \
- PORT_START_TAG("KEY4") \
+ PORT_START("KEY4") \
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) \
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) \
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) \
@@ -435,7 +435,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
#define FROMANCE_KEYMATRIX5 \
- PORT_START_TAG("KEY5") \
+ PORT_START("KEY5") \
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) \
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) \
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) \
@@ -447,7 +447,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( nekkyoku )
- PORT_START_TAG("IN0") /* (0) TEST SW */
+ PORT_START("IN0") /* (0) TEST SW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -457,7 +457,7 @@ static INPUT_PORTS_START( nekkyoku )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* (1) COIN SW */
+ PORT_START("IN1") /* (1) COIN SW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -467,7 +467,7 @@ static INPUT_PORTS_START( nekkyoku )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1") /* (2) DIPSW-1 */
+ PORT_START("DSW1") /* (2) DIPSW-1 */
PORT_DIPNAME( 0x01, 0x00, "DIPSW 1-1" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -493,7 +493,7 @@ static INPUT_PORTS_START( nekkyoku )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, "DIPSW 2-1" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -528,7 +528,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( idolmj )
- PORT_START_TAG("IN0") /* (0) TEST SW */
+ PORT_START("IN0") /* (0) TEST SW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -538,7 +538,7 @@ static INPUT_PORTS_START( idolmj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* (1) COIN SW */
+ PORT_START("IN1") /* (1) COIN SW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -548,7 +548,7 @@ static INPUT_PORTS_START( idolmj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1") /* (2) DIPSW-1 */
+ PORT_START("DSW1") /* (2) DIPSW-1 */
PORT_DIPNAME( 0x01, 0x00, "DIPSW 1-1" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -574,7 +574,7 @@ static INPUT_PORTS_START( idolmj )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* (3) DIPSW-2 */
+ PORT_START("DSW2") /* (3) DIPSW-2 */
PORT_DIPNAME( 0x01, 0x00, "DIPSW 2-1" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -609,7 +609,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( fromance )
- PORT_START_TAG("IN0") /* (0) TEST SW */
+ PORT_START("IN0") /* (0) TEST SW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -619,7 +619,7 @@ static INPUT_PORTS_START( fromance )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* (1) COIN SW */
+ PORT_START("IN1") /* (1) COIN SW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -629,7 +629,7 @@ static INPUT_PORTS_START( fromance )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1") /* (2) DIPSW-1 */
+ PORT_START("DSW1") /* (2) DIPSW-1 */
PORT_DIPNAME( 0x01, 0x00, "DIPSW 1-1" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -653,7 +653,7 @@ static INPUT_PORTS_START( fromance )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_HIGH )
- PORT_START_TAG("DSW2") /* (3) DIPSW-2 */
+ PORT_START("DSW2") /* (3) DIPSW-2 */
PORT_DIPNAME( 0x01, 0x00, "DIPSW 2-1" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -688,7 +688,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( nmsengen )
- PORT_START_TAG("IN0") /* (0) TEST SW */
+ PORT_START("IN0") /* (0) TEST SW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -698,7 +698,7 @@ static INPUT_PORTS_START( nmsengen )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* (1) COIN SW */
+ PORT_START("IN1") /* (1) COIN SW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -708,7 +708,7 @@ static INPUT_PORTS_START( nmsengen )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1") /* (2) DIPSW-1 */
+ PORT_START("DSW1") /* (2) DIPSW-1 */
PORT_DIPNAME( 0x01, 0x00, "DIPSW 1-1" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -732,7 +732,7 @@ static INPUT_PORTS_START( nmsengen )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_HIGH )
- PORT_START_TAG("DSW2") /* (3) DIPSW-2 */
+ PORT_START("DSW2") /* (3) DIPSW-2 */
PORT_DIPNAME( 0x01, 0x00, "DIPSW 2-1" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -767,7 +767,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( daiyogen )
- PORT_START_TAG("IN0") /* (0) TEST SW */
+ PORT_START("IN0") /* (0) TEST SW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -777,7 +777,7 @@ static INPUT_PORTS_START( daiyogen )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* (1) COIN SW */
+ PORT_START("IN1") /* (1) COIN SW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -787,7 +787,7 @@ static INPUT_PORTS_START( daiyogen )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1") /* (2) DIPSW-1 */
+ PORT_START("DSW1") /* (2) DIPSW-1 */
PORT_DIPNAME( 0x01, 0x00, "DIPSW 1-1" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -813,7 +813,7 @@ static INPUT_PORTS_START( daiyogen )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* (3) DIPSW-2 */
+ PORT_START("DSW2") /* (3) DIPSW-2 */
PORT_DIPNAME( 0x01, 0x00, "DIPSW 2-1" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -848,7 +848,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mfunclub )
- PORT_START_TAG("IN0") /* (0) TEST SW */
+ PORT_START("IN0") /* (0) TEST SW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -858,7 +858,7 @@ static INPUT_PORTS_START( mfunclub )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* (1) COIN SW */
+ PORT_START("IN1") /* (1) COIN SW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -868,7 +868,7 @@ static INPUT_PORTS_START( mfunclub )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1") /* (2) DIPSW-1 */
+ PORT_START("DSW1") /* (2) DIPSW-1 */
PORT_DIPNAME( 0x01, 0x00, "DIPSW 1-1" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -894,7 +894,7 @@ static INPUT_PORTS_START( mfunclub )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* (3) DIPSW-2 */
+ PORT_START("DSW2") /* (3) DIPSW-2 */
PORT_DIPNAME( 0x01, 0x00, "DIPSW 2-1" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -929,7 +929,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mjnatsu )
- PORT_START_TAG("IN0") /* (0) TEST SW */
+ PORT_START("IN0") /* (0) TEST SW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -939,7 +939,7 @@ static INPUT_PORTS_START( mjnatsu )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* (1) COIN SW */
+ PORT_START("IN1") /* (1) COIN SW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -949,7 +949,7 @@ static INPUT_PORTS_START( mjnatsu )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1") /* (2) DIPSW-1 */
+ PORT_START("DSW1") /* (2) DIPSW-1 */
PORT_DIPNAME( 0x01, 0x00, "DIPSW 1-1" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -975,7 +975,7 @@ static INPUT_PORTS_START( mjnatsu )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* (3) DIPSW-2 */
+ PORT_START("DSW2") /* (3) DIPSW-2 */
PORT_DIPNAME( 0x01, 0x00, "DIPSW 2-1" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
diff --git a/src/mame/drivers/funkybee.c b/src/mame/drivers/funkybee.c
index c0576c885d0..1774f4f2ba1 100644
--- a/src/mame/drivers/funkybee.c
+++ b/src/mame/drivers/funkybee.c
@@ -133,7 +133,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( funkybee )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START1 )
@@ -142,7 +142,7 @@ static INPUT_PORTS_START( funkybee )
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -150,7 +150,7 @@ static INPUT_PORTS_START( funkybee )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -158,7 +158,7 @@ static INPUT_PORTS_START( funkybee )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
@@ -194,7 +194,7 @@ static INPUT_PORTS_START( funkbeeb )
INPUT_PORTS_END
static INPUT_PORTS_START( skylancr )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START1 )
@@ -203,7 +203,7 @@ static INPUT_PORTS_START( skylancr )
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -211,7 +211,7 @@ static INPUT_PORTS_START( skylancr )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -219,7 +219,7 @@ static INPUT_PORTS_START( skylancr )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c
index 4c2efae3b5e..bddad41d4c3 100644
--- a/src/mame/drivers/funkyjet.c
+++ b/src/mame/drivers/funkyjet.c
@@ -155,7 +155,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( funkyjet )
- PORT_START_TAG("P1") /* Player 1 controls */
+ PORT_START("P1") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -165,7 +165,7 @@ static INPUT_PORTS_START( funkyjet )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* Button 3 only in "test mode" */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 controls */
+ PORT_START("P2") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -175,7 +175,7 @@ static INPUT_PORTS_START( funkyjet )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* Button 3 only in "test mode" */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN0") /* System Inputs */
+ PORT_START("IN0") /* System Inputs */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -183,7 +183,7 @@ static INPUT_PORTS_START( funkyjet )
/* Dips seem inverted with respect to other Deco games */
- PORT_START_TAG("DSWA") /* Dip switch bank 1 */
+ PORT_START("DSWA") /* Dip switch bank 1 */
PORT_DIPNAME( 0xe0, 0xe0, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ) )
@@ -207,7 +207,7 @@ static INPUT_PORTS_START( funkyjet )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
- PORT_START_TAG("DSWB") /* Dip switch bank 2 */
+ PORT_START("DSWB") /* Dip switch bank 2 */
PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x80, "1" )
PORT_DIPSETTING( 0xc0, "2" )
@@ -243,7 +243,7 @@ static INPUT_PORTS_START( funkyjej )
INPUT_PORTS_END
static INPUT_PORTS_START( sotsugyo )
- PORT_START_TAG("P1") /* Player 1 controls */
+ PORT_START("P1") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -253,7 +253,7 @@ static INPUT_PORTS_START( sotsugyo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) /* only in "test mode" */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 controls */
+ PORT_START("P2") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -263,7 +263,7 @@ static INPUT_PORTS_START( sotsugyo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) /* only in "test mode" */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN0") /* System Inputs */
+ PORT_START("IN0") /* System Inputs */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) // Not working - see notes
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) // See notes
@@ -271,7 +271,7 @@ static INPUT_PORTS_START( sotsugyo )
/* Dips seem inverted with respect to other Deco games */
- PORT_START_TAG("DSWA") /* Dip switch bank 1 */
+ PORT_START("DSWA") /* Dip switch bank 1 */
PORT_DIPNAME( 0xe0, 0xe0, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ) )
@@ -295,7 +295,7 @@ static INPUT_PORTS_START( sotsugyo )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
- PORT_START_TAG("DSWB") /* Dip switch bank 2 */
+ PORT_START("DSWB") /* Dip switch bank 2 */
PORT_DIPNAME( 0x80, 0x80, "Freeze" )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c
index 67bfe6123cb..4e092c0d558 100644
--- a/src/mame/drivers/funworld.c
+++ b/src/mame/drivers/funworld.c
@@ -999,7 +999,7 @@ ADDRESS_MAP_END
*************************/
static INPUT_PORTS_START( funworld )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Remote") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Halten (Hold) 1") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Loeschen (Cancel) / Kassieren (Take)") PORT_CODE(KEYCODE_N)
@@ -1009,7 +1009,7 @@ static INPUT_PORTS_START( funworld )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Einstellen (Service2)")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Halten (Hold) 4 / Hoch (High)") PORT_CODE(KEYCODE_V)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Halten (Hold) 2 / Tief (Low)") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Halten (Hold) 3") PORT_CODE(KEYCODE_C)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1019,7 +1019,7 @@ static INPUT_PORTS_START( funworld )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Abschreib (Payout)") PORT_CODE(KEYCODE_M)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1029,7 +1029,7 @@ static INPUT_PORTS_START( funworld )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, "State" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x00, "Keyboard Test" )
PORT_DIPSETTING( 0x01, "Play" )
@@ -1060,7 +1060,7 @@ static INPUT_PORTS_START( funworld )
INPUT_PORTS_END
static INPUT_PORTS_START( jolycdcr )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Navijanje (Remote)") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Stop (Hold) 1") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Ponistavange (Cancel) / Kasiranje (Take) / Autohold") PORT_CODE(KEYCODE_N)
@@ -1070,7 +1070,7 @@ static INPUT_PORTS_START( jolycdcr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Namjestit (Service2)")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Stop (Hold) 4 / Veca (High)") PORT_CODE(KEYCODE_V)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Stop (Hold) 2 / Manja (Low)") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Stop (Hold) 3") PORT_CODE(KEYCODE_C)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1080,7 +1080,7 @@ static INPUT_PORTS_START( jolycdcr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Vratiti Nazad (Payout)") PORT_CODE(KEYCODE_M)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1090,7 +1090,7 @@ static INPUT_PORTS_START( jolycdcr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, "State" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x00, "Keyboard Test" )
PORT_DIPSETTING( 0x01, "Play" )
@@ -1121,7 +1121,7 @@ static INPUT_PORTS_START( jolycdcr )
INPUT_PORTS_END
static INPUT_PORTS_START( jolycdit )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Remote") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Stop (Hold) 1 / Alta (High)") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Clear / Doppio (Double) / Autohold") PORT_CODE(KEYCODE_N)
@@ -1131,7 +1131,7 @@ static INPUT_PORTS_START( jolycdit )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Stop (Hold) 4 / Accredito (Take)") PORT_CODE(KEYCODE_V)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Stop (Hold) 2") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Stop (Hold) 3 / Bassa (Low)") PORT_CODE(KEYCODE_C)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1141,7 +1141,7 @@ static INPUT_PORTS_START( jolycdit )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Payout") PORT_CODE(KEYCODE_M)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1151,7 +1151,7 @@ static INPUT_PORTS_START( jolycdit )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, "State" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x00, "Keyboard Test" )
PORT_DIPSETTING( 0x01, "Play" )
@@ -1181,7 +1181,7 @@ static INPUT_PORTS_START( jolycdit )
INPUT_PORTS_END
static INPUT_PORTS_START( jolyc980 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Navijanje (Remote)") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Stop (Hold) 1") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Ponistavange (Cancel) / Kasiranje (Take) / Autohold") PORT_CODE(KEYCODE_N)
@@ -1191,7 +1191,7 @@ static INPUT_PORTS_START( jolyc980 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Namjestit (Service2)")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Stop (Hold) 4 / Veca (High)") PORT_CODE(KEYCODE_V)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Stop (Hold) 2 / Manja (Low)") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Stop (Hold) 3") PORT_CODE(KEYCODE_C)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1201,7 +1201,7 @@ static INPUT_PORTS_START( jolyc980 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Vratiti Nazad (Payout)") PORT_CODE(KEYCODE_M)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1211,7 +1211,7 @@ static INPUT_PORTS_START( jolyc980 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, "State" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x01, "Play" )
PORT_DIPSETTING( 0x00, "Keyboard Test" )
@@ -1239,7 +1239,7 @@ static INPUT_PORTS_START( jolyc980 )
INPUT_PORTS_END
static INPUT_PORTS_START( bigdeal )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Remote") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Hold 1") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Clear / Take") PORT_CODE(KEYCODE_N)
@@ -1249,7 +1249,7 @@ static INPUT_PORTS_START( bigdeal )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Hold 4 / Nagy (High)") PORT_CODE(KEYCODE_V)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Hold 2 / Icsi (Low)") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Hold 3 / Half Gamble") PORT_CODE(KEYCODE_C)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1259,7 +1259,7 @@ static INPUT_PORTS_START( bigdeal )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Payout") PORT_CODE(KEYCODE_M)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1269,7 +1269,7 @@ static INPUT_PORTS_START( bigdeal )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
/* the following one should be left ON by default to allow initialization */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -1301,7 +1301,7 @@ static INPUT_PORTS_START( bigdeal )
INPUT_PORTS_END
static INPUT_PORTS_START( magiccrd )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Remote") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Hold 1") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Clear / Take") PORT_CODE(KEYCODE_N)
@@ -1311,7 +1311,7 @@ static INPUT_PORTS_START( magiccrd )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Hold 4 / High") PORT_CODE(KEYCODE_V)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Hold 2 / Low") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Hold 3") PORT_CODE(KEYCODE_C)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1321,7 +1321,7 @@ static INPUT_PORTS_START( magiccrd )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Payout") PORT_CODE(KEYCODE_M)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1331,7 +1331,7 @@ static INPUT_PORTS_START( magiccrd )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, "State" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x00, "Keyboard Test" )
PORT_DIPSETTING( 0x01, "Play" )
@@ -1362,7 +1362,7 @@ static INPUT_PORTS_START( magiccrd )
INPUT_PORTS_END
static INPUT_PORTS_START( royalcrd )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Remote") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Halten (Hold) 1 / Hoch (High)") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Loeschen/Gamble (Cancel/Play)") PORT_CODE(KEYCODE_N)
@@ -1372,7 +1372,7 @@ static INPUT_PORTS_START( royalcrd )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Einstellen (Service2)")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Halten (Hold) 4 / Kassieren (Take)") PORT_CODE(KEYCODE_V)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Halten (Hold) 2") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Halten (Hold) 3 / Tief (Low)") PORT_CODE(KEYCODE_C)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1382,7 +1382,7 @@ static INPUT_PORTS_START( royalcrd )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Abschreib (Payout)") PORT_CODE(KEYCODE_M)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1392,7 +1392,7 @@ static INPUT_PORTS_START( royalcrd )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, "State" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x00, "Keyboard Test" )
PORT_DIPSETTING( 0x01, "Play" )
@@ -1423,7 +1423,7 @@ static INPUT_PORTS_START( royalcrd )
INPUT_PORTS_END
static INPUT_PORTS_START( cuoreuno )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* no remote credits */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Stop 1 / Switch Bet (1-Max)") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Clear / Bet / Prendi (Take)") PORT_CODE(KEYCODE_N)
@@ -1433,7 +1433,7 @@ static INPUT_PORTS_START( cuoreuno )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Stop 4 / Alta (High)") PORT_CODE(KEYCODE_V)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Stop 2 / Bassa (Low)") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Stop 3") PORT_CODE(KEYCODE_C)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Ticket") PORT_CODE(KEYCODE_T)
@@ -1443,7 +1443,7 @@ static INPUT_PORTS_START( cuoreuno )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Payout") PORT_CODE(KEYCODE_M)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1453,7 +1453,7 @@ static INPUT_PORTS_START( cuoreuno )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, "Test Mode" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1483,7 +1483,7 @@ static INPUT_PORTS_START( cuoreuno )
INPUT_PORTS_END
static INPUT_PORTS_START( pool10 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* no remote credits */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Stop 1 / Switch Bet (1-Max)") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Clear / Bet / Prendi (Take)") PORT_CODE(KEYCODE_N)
@@ -1493,7 +1493,7 @@ static INPUT_PORTS_START( pool10 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Stop 4 / Alta (High)") PORT_CODE(KEYCODE_V)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Stop 2 / Bassa (Low)") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Stop 3") PORT_CODE(KEYCODE_C)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Ticket") PORT_CODE(KEYCODE_T)
@@ -1503,7 +1503,7 @@ static INPUT_PORTS_START( pool10 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Payout") PORT_CODE(KEYCODE_M)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1513,7 +1513,7 @@ static INPUT_PORTS_START( pool10 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, "Test Mode" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1542,7 +1542,7 @@ static INPUT_PORTS_START( pool10 )
INPUT_PORTS_END
static INPUT_PORTS_START( jolyjkra )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Remote") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Halten (Hold) 1") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Loeschen (Cancel) / Kassieren (Take)") PORT_CODE(KEYCODE_N)
@@ -1552,7 +1552,7 @@ static INPUT_PORTS_START( jolyjkra )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Einstellen (Service2)")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Halten (Hold) 4 / Hoch (High)") PORT_CODE(KEYCODE_V)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Halten (Hold) 2 / Tief (Low)") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Halten (Hold) 3") PORT_CODE(KEYCODE_C)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1562,7 +1562,7 @@ static INPUT_PORTS_START( jolyjkra )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Abschreib (Payout)") PORT_CODE(KEYCODE_M)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1572,7 +1572,7 @@ static INPUT_PORTS_START( jolyjkra )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, "State" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x00, "Keyboard Test" )
PORT_DIPSETTING( 0x01, "Play" )
diff --git a/src/mame/drivers/funybubl.c b/src/mame/drivers/funybubl.c
index f3becc7ba3f..1362e18d408 100644
--- a/src/mame/drivers/funybubl.c
+++ b/src/mame/drivers/funybubl.c
@@ -144,7 +144,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( funybubl )
- PORT_START /* System inputs */
+ PORT_START("SYSTEM") /* System inputs */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -154,7 +154,7 @@ static INPUT_PORTS_START( funybubl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Maybe unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Maybe unused */
- PORT_START /* Player 1 controls */
+ PORT_START("P1") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -164,7 +164,7 @@ static INPUT_PORTS_START( funybubl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Maybe unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Maybe unused */
- PORT_START /* Player 2 controls */
+ PORT_START("P2") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -174,7 +174,7 @@ static INPUT_PORTS_START( funybubl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Maybe unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Maybe unused */
- PORT_START /* DSW 1 */
+ PORT_START("DSW") /* DSW 1 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
diff --git a/src/mame/drivers/fuukifg2.c b/src/mame/drivers/fuukifg2.c
index 8cf7f09c574..d59784a3f9c 100644
--- a/src/mame/drivers/fuukifg2.c
+++ b/src/mame/drivers/fuukifg2.c
@@ -186,38 +186,38 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( gogomile )
- PORT_START // IN0 - $800000.w
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0xfe00, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START // IN1 - $810000.w
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) // There's code that uses
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) // these unknown bits
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START // IN2 - $880000.w
+ PORT_START("SYSTEM") // IN0 - $800000.w
+ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
+ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE1 )
+ PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_START2 )
+ PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN2 )
+ PORT_BIT( 0xfe00, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START("P1_P2") // IN1 - $810000.w
+ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
+ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
+ PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
+ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
+ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) // There's code that uses
+ PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) // these unknown bits
+ PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
+ PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
+ PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
+ PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
+ PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
+ PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START("DSW") // IN2 - $880000.w
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -270,38 +270,38 @@ INPUT_PORTS_END
the coinage settings too. */
static INPUT_PORTS_START( gogomilj )
- PORT_START // IN0 - $800000.w
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0xfe00, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START // IN1 - $810000.w
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) // There's code that uses
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) // these unknown bits
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START // IN2 - $880000.w
+ PORT_START("SYSTEM") // IN0 - $800000.w
+ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
+ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE1 )
+ PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_START2 )
+ PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN2 )
+ PORT_BIT( 0xfe00, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START("P1_P2") // IN1 - $810000.w
+ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
+ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
+ PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
+ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
+ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) // There's code that uses
+ PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) // these unknown bits
+ PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
+ PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
+ PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
+ PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
+ PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
+ PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START("DSW") // IN2 - $880000.w
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -353,38 +353,38 @@ INPUT_PORTS_END
static INPUT_PORTS_START( pbancho )
- PORT_START // IN0 - $800000.w
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_BIT( 0xfe00, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START // IN1 - $810000.w
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) // There's code that uses
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) // these unknown bits
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START // IN2 - $880000.w
+ PORT_START("SYSTEM") // IN0 - $800000.w
+ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
+ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
+ PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_START2 )
+ PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_SERVICE1 )
+ PORT_BIT( 0xfe00, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START("P1_P2") // IN1 - $810000.w
+ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
+ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
+ PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
+ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
+ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) // There's code that uses
+ PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) // these unknown bits
+ PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
+ PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
+ PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
+ PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
+ PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
+ PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START("DSW") // IN2 - $880000.w
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c
index 175a7b5003b..1ac022756ea 100644
--- a/src/mame/drivers/fuukifg3.c
+++ b/src/mame/drivers/fuukifg3.c
@@ -388,7 +388,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( asurabld )
- PORT_START_TAG("IN0") // IN0 - $800000.w/$800002.w
+ PORT_START("IN0") // IN0 - $800000.w/$800002.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -400,7 +400,7 @@ static INPUT_PORTS_START( asurabld )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0xfe00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") // IN1 - $810000.w/$810002.w
+ PORT_START("IN1") // IN1 - $810000.w/$810002.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -418,7 +418,7 @@ static INPUT_PORTS_START( asurabld )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0") // IN2 - $880000.w/$880002.w
+ PORT_START("DSW0") // IN2 - $880000.w/$880002.w
PORT_SERVICE( 0x0001, 0x0001 )
PORT_DIPNAME( 0x0002, 0x0002, "Blood Colour" ) // Any other censorship? (Tested in 3 locations)
PORT_DIPSETTING( 0x0002, "Red" )
@@ -439,7 +439,7 @@ static INPUT_PORTS_START( asurabld )
PORT_DIPSETTING( 0x0000, "Joint" )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1") // IN3 - $890000.w/$890002.w
+ PORT_START("DSW1") // IN3 - $890000.w/$890002.w
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c
index 474fdcd93c8..0e88cba0d46 100644
--- a/src/mame/drivers/gaelco.c
+++ b/src/mame/drivers/gaelco.c
@@ -130,7 +130,7 @@ static ADDRESS_MAP_START( bigkarnk_writemem_snd, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( bigkarnk )
- PORT_START /* DSW #1 */
+ PORT_START("DSW1") /* DSW #1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -156,7 +156,7 @@ static INPUT_PORTS_START( bigkarnk )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x00, "Free Play (if Coin A too)" )
- PORT_START /* DSW #2 */
+ PORT_START("DSW2") /* DSW #2 */
PORT_DIPNAME( 0x07, 0x06, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "0" )
PORT_DIPSETTING( 0x06, "1" )
@@ -179,7 +179,7 @@ static INPUT_PORTS_START( bigkarnk )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START /* 1P INPUTS & COINSW */
+ PORT_START("P1") /* 1P INPUTS & COINSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -189,7 +189,7 @@ static INPUT_PORTS_START( bigkarnk )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START /* 2P INPUTS & STARTSW */
+ PORT_START("P2") /* 2P INPUTS & STARTSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
@@ -199,7 +199,7 @@ static INPUT_PORTS_START( bigkarnk )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START /* Service + Test */
+ PORT_START("SERVICE") /* Service + Test */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_DIPNAME( 0x02, 0x02, "Go to test mode now" )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -322,7 +322,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( maniacsq )
-PORT_START /* DSW #2 */
+ PORT_START("DSW2") /* DSW #2 */
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -345,7 +345,7 @@ PORT_START /* DSW #2 */
PORT_DIPSETTING( 0x80, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_START /* DSW #1 */
+ PORT_START("DSW1") /* DSW #1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x0e, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
@@ -373,7 +373,7 @@ PORT_START /* DSW #2 */
PORT_DIPSETTING( 0x50, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x00, "1C/1C or Free Play (if Coin B too)" )
- PORT_START /* 1P INPUTS & COINSW */
+ PORT_START("P1") /* 1P INPUTS & COINSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -383,7 +383,7 @@ PORT_START /* DSW #2 */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START /* 2P INPUTS & STARTSW */
+ PORT_START("P2") /* 2P INPUTS & STARTSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
@@ -396,7 +396,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( biomtoy )
- PORT_START /* DSW #2 */
+ PORT_START("DSW2") /* DSW #2 */
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) /* Not Listed/shown in test mode */
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -418,7 +418,7 @@ static INPUT_PORTS_START( biomtoy )
PORT_DIPSETTING( 0x80, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_START /* DSW #1 */
+ PORT_START("DSW1") /* DSW #1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x0e, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
@@ -446,7 +446,7 @@ static INPUT_PORTS_START( biomtoy )
PORT_DIPSETTING( 0x50, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
- PORT_START /* 1P INPUTS & COINSW */
+ PORT_START("P1") /* 1P INPUTS & COINSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -456,7 +456,7 @@ static INPUT_PORTS_START( biomtoy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START /* 2P INPUTS & STARTSW */
+ PORT_START("P2") /* 2P INPUTS & STARTSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
@@ -559,7 +559,7 @@ ROM_END
/*********** Squash Encryption Related Code ******************/
static INPUT_PORTS_START( squash )
- PORT_START /* DSW2 8bit */
+ PORT_START("DSW2") /* DSW2 8bit */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -581,7 +581,7 @@ static INPUT_PORTS_START( squash )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START /* DSW1 8bit */
+ PORT_START("DSW1") /* DSW1 8bit */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 6C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 5C_1C ) )
@@ -607,7 +607,7 @@ static INPUT_PORTS_START( squash )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* 1P INPUTS & COINSW */
+ PORT_START("P1") /* 1P INPUTS & COINSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -617,7 +617,7 @@ static INPUT_PORTS_START( squash )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START /* 2P INPUTS & STARTSW */
+ PORT_START("P2") /* 2P INPUTS & STARTSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
@@ -627,7 +627,7 @@ static INPUT_PORTS_START( squash )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START /* 8bit */
+ PORT_START("UNK") /* 8bit */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -778,7 +778,7 @@ ROM_END
/*********** Thunder Hoop Encryption Related Code ******************/
static INPUT_PORTS_START( thoop )
- PORT_START /* DSW2 8bit */
+ PORT_START("DSW2") /* DSW2 8bit */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -800,7 +800,7 @@ static INPUT_PORTS_START( thoop )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START /* DSW1 8bit */
+ PORT_START("DSW1") /* DSW1 8bit */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_4C ) )
@@ -827,7 +827,7 @@ static INPUT_PORTS_START( thoop )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* 1P INPUTS & COINSW */
+ PORT_START("P1") /* 1P INPUTS & COINSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -837,7 +837,7 @@ static INPUT_PORTS_START( thoop )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START /* 2P INPUTS & STARTSW */
+ PORT_START("P2") /* 2P INPUTS & STARTSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
@@ -847,7 +847,7 @@ static INPUT_PORTS_START( thoop )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START /* 8bit */
+ PORT_START("UNK") /* 8bit */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/gaelco2.c b/src/mame/drivers/gaelco2.c
index 16338eaad04..25bf641a441 100644
--- a/src/mame/drivers/gaelco2.c
+++ b/src/mame/drivers/gaelco2.c
@@ -80,7 +80,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( maniacsq )
-PORT_START_TAG("IN0") /* DSW #1 + 1P INPUTS */
+PORT_START("IN0") /* DSW #1 + 1P INPUTS */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -116,7 +116,7 @@ PORT_START_TAG("IN0") /* DSW #1 + 1P INPUTS */
PORT_DIPSETTING( 0xa000, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x0000, "Disabled or Free Play (if Coin A too)" )
-PORT_START_TAG("IN1") /* DSW #2 + 2P INPUTS */
+PORT_START("IN1") /* DSW #2 + 2P INPUTS */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
@@ -147,7 +147,7 @@ PORT_START_TAG("IN1") /* DSW #2 + 2P INPUTS */
PORT_DIPSETTING( 0x4000, DEF_STR( On ) )
PORT_SERVICE( 0x8000, IP_ACTIVE_LOW )
-PORT_START_TAG("COIN") /* COINSW & SERVICESW */
+PORT_START("COIN") /* COINSW & SERVICESW */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -256,13 +256,13 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( bang )
-PORT_START_TAG("P1") /* 1P INPUTS */
+PORT_START("P1") /* 1P INPUTS */
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_IMPULSE(1) PORT_PLAYER(1)
-PORT_START_TAG("P2") /* 2P INPUTS */
+PORT_START("P2") /* 2P INPUTS */
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
-PORT_START_TAG("COIN") /* COINSW & Service */
+PORT_START("COIN") /* COINSW & Service */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE( 0x0004, IP_ACTIVE_LOW) /* go to service mode NOW */
@@ -271,16 +271,16 @@ PORT_START_TAG("COIN") /* COINSW & Service */
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_START2 )
/* bits 6 & 7 are used for accessing the NVRAM */
- PORT_START_TAG("LIGHT0_X") /* Gun 1 X */
+ PORT_START("LIGHT0_X") /* Gun 1 X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("LIGHT1_X") /* Gun 2 X */
+ PORT_START("LIGHT1_X") /* Gun 2 X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(15) PORT_PLAYER(2)
- PORT_START_TAG("LIGHT0_Y") /* Gun 1 Y */
+ PORT_START("LIGHT0_Y") /* Gun 1 Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, -6.0 / 240, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("LIGHT1_Y") /* Gun 2 Y */
+ PORT_START("LIGHT1_Y") /* Gun 2 Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, -6.0 / 240, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(15) PORT_PLAYER(2)
INPUT_PORTS_END
@@ -413,7 +413,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( alighunt )
-PORT_START_TAG("IN0") /* DSW #1 */
+PORT_START("IN0") /* DSW #1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -449,7 +449,7 @@ PORT_START_TAG("IN0") /* DSW #1 */
PORT_DIPSETTING( 0xa000, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x0000, "Disabled or Free Play (if Coin A too)" )
-PORT_START_TAG("IN1") /* DSW #2 */
+PORT_START("IN1") /* DSW #2 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
@@ -479,7 +479,7 @@ PORT_START_TAG("IN1") /* DSW #2 */
PORT_DIPSETTING( 0x4000, DEF_STR( Standard ) )
PORT_SERVICE( 0x8000, IP_ACTIVE_LOW )
-PORT_START_TAG("COIN") /* COINSW & Service */
+PORT_START("COIN") /* COINSW & Service */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -636,7 +636,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( touchgo )
-PORT_START_TAG("IN0") /* DSW #2 + 1P INPUTS */
+PORT_START("IN0") /* DSW #2 + 1P INPUTS */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -665,7 +665,7 @@ PORT_START_TAG("IN0") /* DSW #2 + 1P INPUTS */
PORT_DIPSETTING( 0x4000, DEF_STR( On ) )
PORT_SERVICE( 0x8000, IP_ACTIVE_LOW )
-PORT_START_TAG("IN1") /* DSW #1 + 2P INPUTS */
+PORT_START("IN1") /* DSW #1 + 2P INPUTS */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
@@ -709,7 +709,7 @@ PORT_START_TAG("IN1") /* DSW #1 + 2P INPUTS */
PORT_DIPSETTING( 0xb000, DEF_STR( 1C_5C ) )
PORT_DIPSETTING( 0xa000, DEF_STR( 1C_6C ) )
-PORT_START_TAG("IN2") /* COINSW + 3P */
+PORT_START("IN2") /* COINSW + 3P */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
@@ -724,7 +724,7 @@ PORT_START_TAG("IN2") /* COINSW + 3P */
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNKNOWN )
-PORT_START_TAG("IN3") /* SERVICESW + 4P INPUTS */
+PORT_START("IN3") /* SERVICESW + 4P INPUTS */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
@@ -738,7 +738,7 @@ PORT_START_TAG("IN3") /* SERVICESW + 4P INPUTS */
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_SERVICE2 )
PORT_BIT( 0xf800, IP_ACTIVE_LOW, IPT_UNKNOWN )
-PORT_START_TAG("FAKE") /* Fake: To switch between monitors at run time */
+PORT_START("FAKE") /* Fake: To switch between monitors at run time */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE4 ) PORT_TOGGLE
INPUT_PORTS_END
@@ -915,7 +915,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( snowboar )
-PORT_START_TAG("P1") /* 1P INPUTS */
+PORT_START("P1") /* 1P INPUTS */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -925,7 +925,7 @@ PORT_START_TAG("P1") /* 1P INPUTS */
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0xff80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-PORT_START_TAG("P2") /* 2P INPUTS */
+PORT_START("P2") /* 2P INPUTS */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
@@ -935,7 +935,7 @@ PORT_START_TAG("P2") /* 2P INPUTS */
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0xff80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-PORT_START_TAG("COIN") /* COINSW & Service */
+PORT_START("COIN") /* COINSW & Service */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW) /* go to service mode NOW */
@@ -1109,7 +1109,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( wrally2 )
-PORT_START_TAG("IN0") /* DIPSW #2 + 1P INPUTS */
+PORT_START("IN0") /* DIPSW #2 + 1P INPUTS */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -1140,7 +1140,7 @@ PORT_START_TAG("IN0") /* DIPSW #2 + 1P INPUTS */
PORT_DIPSETTING( 0x8000, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Hardest ) )
-PORT_START_TAG("IN1") /* DIPSW #1 */
+PORT_START("IN1") /* DIPSW #1 */
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Free_Play ) )
PORT_DIPSETTING( 0x0100, DEF_STR( Off ) )
@@ -1167,7 +1167,7 @@ PORT_START_TAG("IN1") /* DIPSW #1 */
PORT_DIPSETTING( 0xa000, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x2000, DEF_STR( 1C_4C ) )
-PORT_START_TAG("IN2") /* 2P INPUTS */
+PORT_START("IN2") /* 2P INPUTS */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
@@ -1180,20 +1180,20 @@ PORT_START_TAG("IN2") /* 2P INPUTS */
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0xfa00, IP_ACTIVE_LOW, IPT_UNKNOWN )
-PORT_START_TAG("IN3") /* SERVICESW */
+PORT_START("IN3") /* SERVICESW */
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_SERVICE3 ) /* go to test mode NOW */
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_SERVICE2 )
PORT_BIT( 0xf800, IP_ACTIVE_LOW, IPT_UNKNOWN )
-PORT_START_TAG("FAKE") /* Fake: To switch between monitors at run time */
+PORT_START("FAKE") /* Fake: To switch between monitors at run time */
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_SERVICE4 ) PORT_TOGGLE
-PORT_START_TAG("ANALOG0") /* steering wheel player 1 */
+PORT_START("ANALOG0") /* steering wheel player 1 */
PORT_BIT( 0xff, 0x8A, IPT_PADDLE ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(25) PORT_KEYDELTA(25) PORT_REVERSE PORT_NAME("P1 Wheel")
-PORT_START_TAG("ANALOG1") /* steering wheel player 2 */
+PORT_START("ANALOG1") /* steering wheel player 2 */
PORT_BIT( 0xff, 0x8A, IPT_PADDLE_V ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(25) PORT_KEYDELTA(25) PORT_REVERSE PORT_NAME("P2 Wheel")
INPUT_PORTS_END
diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c
index 1cc6cb9c288..cd723fbe620 100644
--- a/src/mame/drivers/gaelco3d.c
+++ b/src/mame/drivers/gaelco3d.c
@@ -791,7 +791,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( speedup )
- PORT_START /* DIPs */
+ PORT_START("IN0") /* DIPs */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_VOLUME_UP )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_VOLUME_DOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON5 )
@@ -802,10 +802,10 @@ static INPUT_PORTS_START( speedup )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) // start
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("IN1")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("IN2")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 ) // verified
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) // checked after reading analog from port 1
@@ -816,21 +816,21 @@ static INPUT_PORTS_START( speedup )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_SPECIAL) PORT_CUSTOM(analog_bit_r, (void *)2)
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_SPECIAL) PORT_CUSTOM(analog_bit_r, (void *)3)
- PORT_START
+ PORT_START("IN3")
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 ) // verified
PORT_SERVICE_NO_TOGGLE( 0x0200, IP_ACTIVE_LOW ) // verified
PORT_BIT( 0xfc00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("ANALOG0")
+ PORT_START("ANALOG0")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(25)
- PORT_START_TAG("ANALOG1")
+ PORT_START("ANALOG1")
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
INPUT_PORTS_END
static INPUT_PORTS_START( surfplnt )
- PORT_START /* DIPs */
+ PORT_START("IN0") /* DIPs */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_VOLUME_UP ) // low two bits read, compared against 3
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_VOLUME_DOWN ) // low four bits read, compared against f
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -841,10 +841,10 @@ static INPUT_PORTS_START( surfplnt )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) // start
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("IN1")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("IN2")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 ) // coin
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -855,16 +855,16 @@ static INPUT_PORTS_START( surfplnt )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_SPECIAL) PORT_CUSTOM(analog_bit_r, (void *)2)
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_SPECIAL) PORT_CUSTOM(analog_bit_r, (void *)3)
- PORT_START
+ PORT_START("IN3")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("ANALOG0")
+ PORT_START("ANALOG0")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(25)
INPUT_PORTS_END
static INPUT_PORTS_START( radikalb )
- PORT_START /* DIPs */
+ PORT_START("IN0") /* DIPs */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_VOLUME_UP )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_VOLUME_DOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -875,10 +875,10 @@ static INPUT_PORTS_START( radikalb )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) // start
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("IN1")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("IN2")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 ) // coin
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -889,10 +889,10 @@ static INPUT_PORTS_START( radikalb )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_SPECIAL) PORT_CUSTOM(analog_bit_r, (void *)2)
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_SPECIAL) PORT_CUSTOM(analog_bit_r, (void *)3)
- PORT_START
+ PORT_START("IN3")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("ANALOG0")
+ PORT_START("ANALOG0")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(25)
INPUT_PORTS_END
diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c
index 2ba30b3bea0..0d776ec87ce 100644
--- a/src/mame/drivers/gaiden.c
+++ b/src/mame/drivers/gaiden.c
@@ -465,7 +465,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( shadoww )
- PORT_START /* System Inputs */
+ PORT_START("SYSTEM") /* System Inputs */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -475,7 +475,7 @@ static INPUT_PORTS_START( shadoww )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START /* Players Inputs */
+ PORT_START("P1_P2") /* Players Inputs */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -495,7 +495,7 @@ static INPUT_PORTS_START( shadoww )
/* Dip Switches order fits the first screen */
- PORT_START /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_DIPNAME( 0x00e0, 0x00e0, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0080, DEF_STR( 4C_1C ) )
@@ -545,7 +545,7 @@ static INPUT_PORTS_START( shadoww )
INPUT_PORTS_END
static INPUT_PORTS_START( wildfang )
- PORT_START /* System Inputs */
+ PORT_START("SYSTEM") /* System Inputs */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -555,7 +555,7 @@ static INPUT_PORTS_START( wildfang )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START /* Players Inputs */
+ PORT_START("P1_P2") /* Players Inputs */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -575,7 +575,7 @@ static INPUT_PORTS_START( wildfang )
/* Dip Switches order fits the first screen */
- PORT_START /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_DIPNAME( 0x00e0, 0x00e0, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0080, DEF_STR( 4C_1C ) )
@@ -626,7 +626,7 @@ static INPUT_PORTS_START( wildfang )
INPUT_PORTS_END
static INPUT_PORTS_START( tknight )
- PORT_START /* System Inputs */
+ PORT_START("SYSTEM") /* System Inputs */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -636,7 +636,7 @@ static INPUT_PORTS_START( tknight )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START /* Players Inputs */
+ PORT_START("P1_P2") /* Players Inputs */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -656,7 +656,7 @@ static INPUT_PORTS_START( tknight )
/* Dip Switches order fits the first screen */
- PORT_START /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_DIPNAME( 0x00e0, 0x00e0, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0080, DEF_STR( 4C_1C ) )
@@ -706,7 +706,7 @@ static INPUT_PORTS_START( tknight )
INPUT_PORTS_END
static INPUT_PORTS_START( raiga )
- PORT_START /* System Inputs */
+ PORT_START("SYSTEM") /* System Inputs */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -716,7 +716,7 @@ static INPUT_PORTS_START( raiga )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START /* Players Inputs */
+ PORT_START("P1_P2") /* Players Inputs */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -736,7 +736,7 @@ static INPUT_PORTS_START( raiga )
/* Dip Switches order fits the first screen */
- PORT_START /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_DIPNAME( 0x00f0, 0x00f0, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0040, DEF_STR( 4C_1C ) )
@@ -795,7 +795,7 @@ static INPUT_PORTS_START( raiga )
INPUT_PORTS_END
static INPUT_PORTS_START( drgnbowl )
- PORT_START /* System Inputs */
+ PORT_START("SYSTEM") /* System Inputs */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -805,7 +805,7 @@ static INPUT_PORTS_START( drgnbowl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START /* Players Inputs */
+ PORT_START("P1_P2") /* Players Inputs */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -825,7 +825,7 @@ static INPUT_PORTS_START( drgnbowl )
/* Dip Switches order fits the first screen */
- PORT_START /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_DIPNAME( 0x00e0, 0x00e0, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0080, DEF_STR( 4C_1C ) )
diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c
index e52f5e4402d..a763f76d778 100644
--- a/src/mame/drivers/galaga.c
+++ b/src/mame/drivers/galaga.c
@@ -1038,7 +1038,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( bosco )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1048,7 +1048,7 @@ static INPUT_PORTS_START( bosco )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -1058,7 +1058,7 @@ static INPUT_PORTS_START( bosco )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Medium ) )
@@ -1083,7 +1083,7 @@ static INPUT_PORTS_START( bosco )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
@@ -1141,7 +1141,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( galaga )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1151,7 +1151,7 @@ static INPUT_PORTS_START( galaga )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1161,7 +1161,7 @@ static INPUT_PORTS_START( galaga )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x00, DEF_STR( Medium ) )
@@ -1186,7 +1186,7 @@ static INPUT_PORTS_START( galaga )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
@@ -1259,7 +1259,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( xevious )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1269,7 +1269,7 @@ static INPUT_PORTS_START( xevious )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -1279,7 +1279,7 @@ static INPUT_PORTS_START( xevious )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -1311,7 +1311,7 @@ static INPUT_PORTS_START( xevious )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_DIPNAME( 0x02, 0x02, "Flags Award Bonus Life" )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
@@ -1411,7 +1411,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( digdug )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1421,7 +1421,7 @@ static INPUT_PORTS_START( digdug )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
@@ -1431,7 +1431,7 @@ static INPUT_PORTS_START( digdug )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x07, 0x01, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x07, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
@@ -1464,7 +1464,7 @@ static INPUT_PORTS_START( digdug )
PORT_DIPSETTING( 0x80, "3" )
PORT_DIPSETTING( 0xc0, "5" )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0xc0, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
diff --git a/src/mame/drivers/galastrm.c b/src/mame/drivers/galastrm.c
index 63091e1d0e9..4e453807d9c 100644
--- a/src/mame/drivers/galastrm.c
+++ b/src/mame/drivers/galastrm.c
@@ -221,10 +221,10 @@ ADDRESS_MAP_END
***********************************************************/
static INPUT_PORTS_START( galastrm )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0xFFFF, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) /* Freeze input */
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -242,7 +242,7 @@ static INPUT_PORTS_START( galastrm )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_SERVICE_NO_TOGGLE( 0x0001, IP_ACTIVE_LOW )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -260,10 +260,10 @@ static INPUT_PORTS_START( galastrm )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("STICKX")
+ PORT_START("STICKX")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(60) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("STICKY")
+ PORT_START("STICKY")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(60) PORT_KEYDELTA(15) PORT_REVERSE PORT_PLAYER(1)
INPUT_PORTS_END
diff --git a/src/mame/drivers/galaxi.c b/src/mame/drivers/galaxi.c
index 37797bd6a45..57c23accd5c 100644
--- a/src/mame/drivers/galaxi.c
+++ b/src/mame/drivers/galaxi.c
@@ -227,7 +227,7 @@ ADDRESS_MAP_END
INPUT_PORTS_START( galaxi )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Hold 1")
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Hold 2")
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Hold 3")
diff --git a/src/mame/drivers/galaxia.c b/src/mame/drivers/galaxia.c
index ca3846609ae..cd85f96884f 100644
--- a/src/mame/drivers/galaxia.c
+++ b/src/mame/drivers/galaxia.c
@@ -87,7 +87,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( galaxia )
- PORT_START /* */
+ PORT_START("IN0")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
diff --git a/src/mame/drivers/galaxold.c b/src/mame/drivers/galaxold.c
index d5d3a3bccea..49ead0cae76 100644
--- a/src/mame/drivers/galaxold.c
+++ b/src/mame/drivers/galaxold.c
@@ -975,7 +975,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( scramblb )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -985,7 +985,7 @@ static INPUT_PORTS_START( scramblb )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -997,7 +997,7 @@ static INPUT_PORTS_START( scramblb )
PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) )
@@ -1014,7 +1014,7 @@ INPUT_PORTS_END
/* the cocktail controls only seem to be used in upright mode, is the flip flag wrong for this bootleg? */
static INPUT_PORTS_START( scramb2 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -1026,7 +1026,7 @@ static INPUT_PORTS_START( scramb2 )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -1039,7 +1039,7 @@ static INPUT_PORTS_START( scramb2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_DIPNAME( 0x06, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -1060,7 +1060,7 @@ static INPUT_PORTS_START( scramb2 )
INPUT_PORTS_END
static INPUT_PORTS_START( 4in1 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -1072,7 +1072,7 @@ static INPUT_PORTS_START( 4in1 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -1081,14 +1081,14 @@ static INPUT_PORTS_START( 4in1 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_SPECIAL ) // See fake ports
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_BIT( 0x3b, IP_ACTIVE_HIGH, IPT_SPECIAL ) // See fake ports
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" ) // 2 when continue (Scramble PT2)
PORT_DIPSETTING( 0x04, "5" ) // 2 when continue (Scramble PT2)
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("FAKE1") /* The Ghost Muncher PT3 - FAKE DSW0 (bits 0 to 5) and IN1 (bits 6 and 7) */
+ PORT_START("FAKE1") /* The Ghost Muncher PT3 - FAKE DSW0 (bits 0 to 5) and IN1 (bits 6 and 7) */
PORT_DIPNAME( 0x03, 0x00, "Bonus Life (GM PT3)" )
PORT_DIPSETTING( 0x01, "10000" )
PORT_DIPSETTING( 0x02, "15000" )
@@ -1110,7 +1110,7 @@ static INPUT_PORTS_START( 4in1 )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Free_Play ) )
- PORT_START_TAG("FAKE2") /* Scramble PT2 - FAKE DSW0 (bits 0 to 5) and IN1 (bits 6 and 7) */
+ PORT_START("FAKE2") /* Scramble PT2 - FAKE DSW0 (bits 0 to 5) and IN1 (bits 6 and 7) */
// PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unused ) )
// PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
// PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1133,7 +1133,7 @@ static INPUT_PORTS_START( 4in1 )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Free_Play ) )
- PORT_START_TAG("FAKE3") /* Galaxian PT5 - FAKE DSW0 (bits 0 to 5) and IN1 (bits 6 and 7) */
+ PORT_START("FAKE3") /* Galaxian PT5 - FAKE DSW0 (bits 0 to 5) and IN1 (bits 6 and 7) */
PORT_DIPNAME( 0x03, 0x00, "Bonus Life (G PT5)" )
PORT_DIPSETTING( 0x01, "4000" )
PORT_DIPSETTING( 0x02, "5000" )
@@ -1155,7 +1155,7 @@ static INPUT_PORTS_START( 4in1 )
// PORT_DIPSETTING( 0x80, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Free_Play ) )
- PORT_START_TAG("FAKE4") /* Galactic Convoy - FAKE DSW0 (bits 0 to 5) and IN1 (bits 6 and 7) */
+ PORT_START("FAKE4") /* Galactic Convoy - FAKE DSW0 (bits 0 to 5) and IN1 (bits 6 and 7) */
PORT_DIPNAME( 0x01, 0x00, "Bonus Life (GC)" )
PORT_DIPSETTING( 0x00, "50000" )
PORT_DIPSETTING( 0x01, "80000" )
@@ -1180,7 +1180,7 @@ static INPUT_PORTS_START( 4in1 )
INPUT_PORTS_END
static INPUT_PORTS_START( bagmanmc )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -1190,7 +1190,7 @@ static INPUT_PORTS_START( bagmanmc )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
@@ -1202,7 +1202,7 @@ static INPUT_PORTS_START( bagmanmc )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -1228,7 +1228,7 @@ static INPUT_PORTS_START( bagmanmc )
INPUT_PORTS_END
static INPUT_PORTS_START( dkongjrm )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
@@ -1238,7 +1238,7 @@ static INPUT_PORTS_START( dkongjrm )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
@@ -1251,7 +1251,7 @@ static INPUT_PORTS_START( dkongjrm )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x01, 0x00, "Coin Multiplier" )
PORT_DIPSETTING( 0x00, "*1" )
PORT_DIPSETTING( 0x01, "*2" )
@@ -1268,7 +1268,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( rockclim )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_LEFT ) PORT_8WAY
@@ -1279,7 +1279,7 @@ static INPUT_PORTS_START( rockclim )
PORT_DIPSETTING( 0x00, "0" )
PORT_DIPSETTING( 0x40, "1" )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_LEFT ) PORT_8WAY
@@ -1293,14 +1293,14 @@ static INPUT_PORTS_START( rockclim )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x80, "1" )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
PORT_DIPSETTING( 0x02, "5" )
PORT_DIPSETTING( 0x03, "6" )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 9C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 8C_1C ) )
@@ -1345,7 +1345,7 @@ Game bug:
*/
static INPUT_PORTS_START( ozon1 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1355,7 +1355,7 @@ static INPUT_PORTS_START( ozon1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -1368,7 +1368,7 @@ static INPUT_PORTS_START( ozon1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1395,7 +1395,7 @@ static INPUT_PORTS_START( ozon1 )
INPUT_PORTS_END
static INPUT_PORTS_START( ladybugg )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
@@ -1405,7 +1405,7 @@ static INPUT_PORTS_START( ladybugg )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
@@ -1419,7 +1419,7 @@ static INPUT_PORTS_START( ladybugg )
PORT_DIPSETTING( 0x80, "A 1C/1C B 1C/5C" )
PORT_DIPSETTING( 0x00, "A 2C/1C B 1C/3C" )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x00, DEF_STR( Easiest ) )
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
@@ -1436,7 +1436,7 @@ static INPUT_PORTS_START( ladybugg )
INPUT_PORTS_END
static INPUT_PORTS_START( vpool )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
@@ -1448,7 +1448,7 @@ static INPUT_PORTS_START( vpool )
PORT_SERVICE( 0x40, IP_ACTIVE_HIGH )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SERVICE1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
@@ -1464,7 +1464,7 @@ static INPUT_PORTS_START( vpool )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1492,7 +1492,7 @@ static INPUT_PORTS_START( vpool )
INPUT_PORTS_END
static INPUT_PORTS_START( drivfrcg )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
@@ -1502,7 +1502,7 @@ static INPUT_PORTS_START( drivfrcg )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -1514,7 +1514,7 @@ static INPUT_PORTS_START( drivfrcg )
PORT_DIPSETTING( 0x00, "A 1C/1C B 1C/5C" )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1540,7 +1540,7 @@ static INPUT_PORTS_START( drivfrcg )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1566,12 +1566,12 @@ static INPUT_PORTS_START( drivfrcg )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("SENSE")
+ PORT_START("SENSE")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
INPUT_PORTS_END
static INPUT_PORTS_START( bongo )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // coin? it jumps to an unmapped area at $C003
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
@@ -1581,7 +1581,7 @@ static INPUT_PORTS_START( bongo )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
@@ -1591,7 +1591,7 @@ static INPUT_PORTS_START( bongo )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1617,7 +1617,7 @@ static INPUT_PORTS_START( bongo )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1644,7 +1644,7 @@ static INPUT_PORTS_START( bongo )
INPUT_PORTS_END
static INPUT_PORTS_START( hunchbkg )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
@@ -1654,7 +1654,7 @@ static INPUT_PORTS_START( hunchbkg )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Start 1 / P1 Button 1") PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Start 2 / P1 Button 1") PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
@@ -1664,7 +1664,7 @@ static INPUT_PORTS_START( hunchbkg )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1690,12 +1690,12 @@ static INPUT_PORTS_START( hunchbkg )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("SENSE")
+ PORT_START("SENSE")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
INPUT_PORTS_END
static INPUT_PORTS_START( harem )
- PORT_START_TAG("IN0")//Change tag when major usage uncovered.
+ PORT_START("IN0")//Change tag when major usage uncovered.
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1721,7 +1721,7 @@ static INPUT_PORTS_START( harem )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1749,7 +1749,7 @@ static INPUT_PORTS_START( harem )
INPUT_PORTS_END
static INPUT_PORTS_START( tazzmang )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -1759,7 +1759,7 @@ static INPUT_PORTS_START( tazzmang )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
- PORT_START
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start 1 / P1 and P2 Button 2")
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -1769,7 +1769,7 @@ static INPUT_PORTS_START( tazzmang )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
- PORT_START
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1796,7 +1796,7 @@ static INPUT_PORTS_START( tazzmang )
INPUT_PORTS_END
static INPUT_PORTS_START( racknrol )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -1806,7 +1806,7 @@ static INPUT_PORTS_START( racknrol )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) )
@@ -1828,7 +1828,7 @@ static INPUT_PORTS_START( racknrol )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1854,12 +1854,12 @@ static INPUT_PORTS_START( racknrol )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("SENSE")
+ PORT_START("SENSE")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
INPUT_PORTS_END
static INPUT_PORTS_START( trvchlng )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 )
@@ -1869,7 +1869,7 @@ static INPUT_PORTS_START( trvchlng )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON3 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) )
@@ -1891,7 +1891,7 @@ static INPUT_PORTS_START( trvchlng )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1917,12 +1917,12 @@ static INPUT_PORTS_START( trvchlng )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("SENSE")
+ PORT_START("SENSE")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
INPUT_PORTS_END
static INPUT_PORTS_START( catacomb )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
@@ -1938,7 +1938,7 @@ static INPUT_PORTS_START( catacomb )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
@@ -1954,7 +1954,7 @@ static INPUT_PORTS_START( catacomb )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_5C ) )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1980,12 +1980,12 @@ static INPUT_PORTS_START( catacomb )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("SENSE")
+ PORT_START("SENSE")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
INPUT_PORTS_END
static INPUT_PORTS_START( luctoday )
- PORT_START_TAG("IN0") //These inputs are clearly wrong, they need a full test
+ PORT_START("IN0") //These inputs are clearly wrong, they need a full test
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )PORT_2WAY PORT_NAME("Add Credit to Bet")
@@ -1995,7 +1995,7 @@ static INPUT_PORTS_START( luctoday )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BILL1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -2005,7 +2005,7 @@ static INPUT_PORTS_START( luctoday )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -2014,7 +2014,7 @@ static INPUT_PORTS_START( luctoday )
INPUT_PORTS_END
static INPUT_PORTS_START( ckongg )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
@@ -2024,7 +2024,7 @@ static INPUT_PORTS_START( ckongg )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
@@ -2037,7 +2037,7 @@ static INPUT_PORTS_START( ckongg )
// PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Free_Play ) )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x01, "2" )
@@ -2054,7 +2054,7 @@ INPUT_PORTS_END
/* not correct */
static INPUT_PORTS_START( kkgalax )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
@@ -2064,7 +2064,7 @@ static INPUT_PORTS_START( kkgalax )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) // button 1 and start 1
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL // button 1 and start 2?
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
@@ -2077,7 +2077,7 @@ static INPUT_PORTS_START( kkgalax )
// PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Free_Play ) )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x01, "2" )
@@ -2093,7 +2093,7 @@ static INPUT_PORTS_START( kkgalax )
INPUT_PORTS_END
static INPUT_PORTS_START( porter )
- PORT_START_TAG("IN0")\
+ PORT_START("IN0")\
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
@@ -2107,7 +2107,7 @@ static INPUT_PORTS_START( porter )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) // and START
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) // and START2
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -2123,7 +2123,7 @@ static INPUT_PORTS_START( porter )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/galdrvr.c b/src/mame/drivers/galdrvr.c
index 902a5c8726e..1554f8f81b0 100644
--- a/src/mame/drivers/galdrvr.c
+++ b/src/mame/drivers/galdrvr.c
@@ -6,7 +6,7 @@
*************************************/
INPUT_PORTS_START( galaxian )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
@@ -18,7 +18,7 @@ INPUT_PORTS_START( galaxian )
PORT_SERVICE( 0x40, IP_ACTIVE_HIGH )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SERVICE1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
@@ -31,7 +31,7 @@ INPUT_PORTS_START( galaxian )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Free_Play ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x00, "7000" )
PORT_DIPSETTING( 0x01, "10000" )
@@ -183,7 +183,7 @@ INPUT_PORTS_END
/* These inputs are clearly wrong, they need a full test */
INPUT_PORTS_START( luctoday )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_NAME("Add Credit to Bet")
@@ -193,7 +193,7 @@ INPUT_PORTS_START( luctoday )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BILL1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -203,7 +203,7 @@ INPUT_PORTS_START( luctoday )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -351,7 +351,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( azurian )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
@@ -361,7 +361,7 @@ INPUT_PORTS_START( azurian )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -373,7 +373,7 @@ INPUT_PORTS_START( azurian )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x80, "5" )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -386,7 +386,7 @@ INPUT_PORTS_START( azurian )
PORT_DIPSETTING( 0x08, DEF_STR( Cocktail ) )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("FAKE") /* fake port to handle routine at 0x05b3 that stores value at 0x40f4 */
+ PORT_START("FAKE") /* fake port to handle routine at 0x05b3 that stores value at 0x40f4 */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x01, DEF_STR( Normal ) )
@@ -527,7 +527,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( streakng )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
@@ -539,7 +539,7 @@ INPUT_PORTS_START( streakng )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
@@ -552,7 +552,7 @@ INPUT_PORTS_START( streakng )
PORT_DIPSETTING( 0xc0, "20000" )
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) )
@@ -568,7 +568,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( pacmanbl )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
@@ -578,7 +578,7 @@ INPUT_PORTS_START( pacmanbl )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
@@ -592,7 +592,7 @@ INPUT_PORTS_START( pacmanbl )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_5C ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x00, "15000" )
PORT_DIPSETTING( 0x01, "20000" )
@@ -630,7 +630,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( zigzag )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
@@ -640,7 +640,7 @@ INPUT_PORTS_START( zigzag )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
@@ -653,7 +653,7 @@ INPUT_PORTS_START( zigzag )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Free_Play ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -670,16 +670,16 @@ INPUT_PORTS_END
INPUT_PORTS_START( gmgalax )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_SPECIAL) PORT_CUSTOM(gmgalax_port_r, "GMIN0\0GLIN0")
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_SPECIAL) PORT_CUSTOM(gmgalax_port_r, "GMIN1\0GLIN1")
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_SPECIAL) PORT_CUSTOM(gmgalax_port_r, "GMIN2\0GLIN2")
- PORT_START_TAG("GMIN0") /* Ghost Muncher - IN0 */
+ PORT_START("GMIN0") /* Ghost Muncher - IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CONDITION("GAMESEL",0x01,PORTCOND_NOTEQUALS,0x01)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP) PORT_4WAY PORT_COCKTAIL PORT_CONDITION("GAMESEL",0x01,PORTCOND_NOTEQUALS,0x01)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_CONDITION("GAMESEL",0x01,PORTCOND_NOTEQUALS,0x01)
@@ -691,7 +691,7 @@ INPUT_PORTS_START( gmgalax )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_CONDITION("GAMESEL",0x01,PORTCOND_NOTEQUALS,0x01)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_CONDITION("GAMESEL",0x01,PORTCOND_NOTEQUALS,0x01)
- PORT_START_TAG("GMIN1") /* Ghost Muncher - IN1 */
+ PORT_START("GMIN1") /* Ghost Muncher - IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 ) PORT_CONDITION("GAMESEL",0x01,PORTCOND_NOTEQUALS,0x01)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 ) PORT_CONDITION("GAMESEL",0x01,PORTCOND_NOTEQUALS,0x01)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL PORT_CONDITION("GAMESEL",0x01,PORTCOND_NOTEQUALS,0x01)
@@ -704,7 +704,7 @@ INPUT_PORTS_START( gmgalax )
PORT_DIPSETTING( 0xc0, "20000" )
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
- PORT_START_TAG("GMIN2") /* Ghost Muncher - IN2 */
+ PORT_START("GMIN2") /* Ghost Muncher - IN2 */
PORT_DIPNAME( 0x03, 0x02, "Ghost Muncher - Coinage" ) PORT_CONDITION("GAMESEL",0x01,PORTCOND_NOTEQUALS,0x01)
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) )
@@ -717,7 +717,7 @@ INPUT_PORTS_START( gmgalax )
PORT_DIPSETTING( 0x00, "5" )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("GLIN0") /* Galaxian - IN0 */
+ PORT_START("GLIN0") /* Galaxian - IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CONDITION("GAMESEL",0x01,PORTCOND_EQUALS,0x01)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_CONDITION("GAMESEL",0x01,PORTCOND_EQUALS,0x01)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_CONDITION("GAMESEL",0x01,PORTCOND_EQUALS,0x01)
@@ -729,7 +729,7 @@ INPUT_PORTS_START( gmgalax )
PORT_SERVICE( 0x40, IP_ACTIVE_HIGH ) PORT_CONDITION("GAMESEL",0x01,PORTCOND_EQUALS,0x01)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CONDITION("GAMESEL",0x01,PORTCOND_EQUALS,0x01)
- PORT_START_TAG("GLIN1") /* Galaxian - IN1 */
+ PORT_START("GLIN1") /* Galaxian - IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 ) PORT_CONDITION("GAMESEL",0x01,PORTCOND_EQUALS,0x01)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 ) PORT_CONDITION("GAMESEL",0x01,PORTCOND_EQUALS,0x01)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL PORT_CONDITION("GAMESEL",0x01,PORTCOND_EQUALS,0x01)
@@ -742,7 +742,7 @@ INPUT_PORTS_START( gmgalax )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Free_Play ) )
- PORT_START_TAG("GLIN2") /* Galaxian - IN2 */
+ PORT_START("GLIN2") /* Galaxian - IN2 */
PORT_DIPNAME( 0x03, 0x01, "Galaxian - Bonus Life" ) PORT_CONDITION("GAMESEL",0x01,PORTCOND_EQUALS,0x01)
PORT_DIPSETTING( 0x01, "4000" )
PORT_DIPSETTING( 0x02, "5000" )
@@ -754,7 +754,7 @@ INPUT_PORTS_START( gmgalax )
PORT_DIPUNUSED( 0x08, 0x00 )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("GAMESEL") /* fake - game select */
+ PORT_START("GAMESEL") /* fake - game select */
PORT_DIPNAME( 0x01, 0x00, "Game Select") PORT_CODE(KEYCODE_F1) PORT_TOGGLE PORT_CHANGED(gmgalax_game_changed, NULL)
PORT_DIPSETTING( 0x00, "Ghost Muncher" )
PORT_DIPSETTING( 0x01, "Galaxian" )
@@ -770,7 +770,7 @@ INPUT_PORTS_END
*************************************/
static INPUT_PORTS_START( mooncrst )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
@@ -782,7 +782,7 @@ static INPUT_PORTS_START( mooncrst )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* "reset" on schematics */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
@@ -796,7 +796,7 @@ static INPUT_PORTS_START( mooncrst )
PORT_DIPSETTING( 0x80, DEF_STR( English ) )
PORT_DIPSETTING( 0x00, DEF_STR( Japanese ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
@@ -970,7 +970,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( jumpbug )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -982,7 +982,7 @@ INPUT_PORTS_START( jumpbug )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -994,7 +994,7 @@ INPUT_PORTS_START( jumpbug )
PORT_DIPSETTING( 0x40, DEF_STR( Easy ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -1010,7 +1010,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( levers )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1020,7 +1020,7 @@ INPUT_PORTS_START( levers )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1030,7 +1030,7 @@ INPUT_PORTS_START( levers )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPUNKNOWN( 0x01, 0x01 ) /* probably unused */
PORT_DIPUNKNOWN( 0x02, 0x02 ) /* probably unused */
PORT_DIPNAME( 0x04, 0x00, "Leave On" ) /* used - MUST be ON */
@@ -1044,7 +1044,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( checkman )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
@@ -1054,7 +1054,7 @@ INPUT_PORTS_START( checkman )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start 1 / P1 Tiles Left")/* also p1 tiles left */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 ) PORT_NAME("Start 2 / P1 Tiles Right")/* also p1 tiles right */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
@@ -1068,7 +1068,7 @@ INPUT_PORTS_START( checkman )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -1113,7 +1113,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( dingo )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
@@ -1123,7 +1123,7 @@ INPUT_PORTS_START( dingo )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
@@ -1137,7 +1137,7 @@ INPUT_PORTS_START( dingo )
PORT_DIPSETTING( 0x80, "A 1C/1C B 1C/5C" )
PORT_DIPSETTING( 0x00, "A 2C/1C B 1C/3C" )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x00, DEF_STR( Easiest ) )
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
@@ -1155,7 +1155,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( mshuttle )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
@@ -1165,7 +1165,7 @@ INPUT_PORTS_START( mshuttle )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_COCKTAIL
@@ -1177,7 +1177,7 @@ INPUT_PORTS_START( mshuttle )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -1222,7 +1222,7 @@ INPUT_PORTS_START( kingball )
PORT_DIPSETTING( 0x02, "15000" )
PORT_DIPSETTING( 0x03, DEF_STR( None ) )
- PORT_START_TAG("FAKE")
+ PORT_START("FAKE")
PORT_SERVICE( 0x01, IP_ACTIVE_HIGH )
PORT_DIPNAME( 0x02, 0x02, "Speech" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -1239,7 +1239,7 @@ INPUT_PORTS_END
*************************************/
INPUT_PORTS_START( frogger )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* 1P shoot2 - unused */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1249,7 +1249,7 @@ INPUT_PORTS_START( frogger )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "5" )
@@ -1262,7 +1262,7 @@ INPUT_PORTS_START( frogger )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_DIPNAME( 0x06, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, "A 2/1 B 2/1 C 2/1" )
@@ -1280,7 +1280,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( froggrmc )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
@@ -1290,7 +1290,7 @@ INPUT_PORTS_START( froggrmc )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SERVICE1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
@@ -1303,7 +1303,7 @@ INPUT_PORTS_START( froggrmc )
PORT_DIPSETTING( 0x40, "7" )
PORT_DIPSETTING( 0x00, "256 (Cheat)")
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -1337,7 +1337,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( turtles )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1347,7 +1347,7 @@ INPUT_PORTS_START( turtles )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -1360,7 +1360,7 @@ INPUT_PORTS_START( turtles )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_DIPNAME( 0x06, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, "A 1/1 B 2/1 C 1/1" )
@@ -1394,7 +1394,7 @@ INPUT_PORTS_START( turpin )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 1C_2C ) )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0xff, 0x00, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -1417,7 +1417,7 @@ INPUT_PORTS_START( amidar )
PORT_DIPSETTING( 0x00, "30000 50000" )
PORT_DIPSETTING( 0x04, "50000 50000" )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0a, DEF_STR( 3C_1C ) )
@@ -1504,7 +1504,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( theend )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1514,7 +1514,7 @@ INPUT_PORTS_START( theend )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -1527,7 +1527,7 @@ INPUT_PORTS_START( theend )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x06, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x04, DEF_STR( 3C_1C ) )
@@ -1542,7 +1542,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( scramble )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1552,7 +1552,7 @@ INPUT_PORTS_START( scramble )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -1565,7 +1565,7 @@ INPUT_PORTS_START( scramble )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_DIPNAME( 0x06, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, "A 1/1 B 2/1 C 1/1" )
@@ -1595,7 +1595,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( explorer )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -1605,7 +1605,7 @@ INPUT_PORTS_START( explorer )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPUNKNOWN( 0x01, 0x00 )
PORT_DIPUNKNOWN( 0x02, 0x00 )
PORT_DIPUNKNOWN( 0x04, 0x00 )
@@ -1615,7 +1615,7 @@ INPUT_PORTS_START( explorer )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x08, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x09, DEF_STR( 2C_2C ) )
@@ -1651,7 +1651,7 @@ INPUT_PORTS_START( explorer )
PORT_DIPSETTING( 0x60, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x70, DEF_STR( 1C_8C ) )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "3" )
@@ -1673,7 +1673,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( atlantis )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
@@ -1683,7 +1683,7 @@ INPUT_PORTS_START( atlantis )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1697,7 +1697,7 @@ INPUT_PORTS_START( atlantis )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_DIPNAME( 0x0e, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, "A 1/3 B 2/1" )
@@ -1712,7 +1712,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( scorpion )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1722,7 +1722,7 @@ INPUT_PORTS_START( scorpion )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3")
PORT_DIPSETTING( 0x02, "4" )
@@ -1735,7 +1735,7 @@ INPUT_PORTS_START( scorpion )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -1757,7 +1757,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( scorpnmc )
- PORT_START_TAG("IN0") /* 0xa000 */
+ PORT_START("IN0") /* 0xa000 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) // COIN2? (it ALWAYS adds 1 credit)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -1767,7 +1767,7 @@ INPUT_PORTS_START( scorpnmc )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
- PORT_START_TAG("IN1") /* 0xa800 */
+ PORT_START("IN1") /* 0xa800 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start 1 / P1 Button 1") /* also P1 Button 1 */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 ) PORT_NAME("Start 2 / P1 Button 2") /* also P1 Button 2 */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -1780,7 +1780,7 @@ INPUT_PORTS_START( scorpnmc )
PORT_DIPSETTING( 0x80, DEF_STR( Hard ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Hardest ) )
- PORT_START_TAG("IN2") /* 0xb001 */
+ PORT_START("IN2") /* 0xb001 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_DIPNAME( 0x0c, 0x04, DEF_STR( Lives ) ) // Check code at 0x00eb
@@ -1790,7 +1790,7 @@ INPUT_PORTS_START( scorpnmc )
PORT_DIPSETTING( 0x0c, "5" )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN3") /* 0xb002 */
+ PORT_START("IN3") /* 0xb002 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) // Check code at 0x00fe
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1804,7 +1804,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( sfx )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) // "Fire" left
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1814,7 +1814,7 @@ INPUT_PORTS_START( sfx )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x02, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -1827,7 +1827,7 @@ INPUT_PORTS_START( sfx )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_DIPNAME( 0x06, 0x06, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
@@ -1845,7 +1845,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( scobra )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1855,7 +1855,7 @@ INPUT_PORTS_START( scobra )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Allow_Continue ) )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x01, DEF_STR( Yes ) )
@@ -1869,7 +1869,7 @@ INPUT_PORTS_START( scobra )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_DIPNAME( 0x06, 0x02, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x04, DEF_STR( 2C_1C ) )
@@ -1896,7 +1896,7 @@ INPUT_PORTS_START( scobras )
INPUT_PORTS_END
static INPUT_PORTS_START( spdcoin )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1906,7 +1906,7 @@ static INPUT_PORTS_START( spdcoin )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x00, "Freeze" ) /* Dip Sw #2 */
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1915,7 +1915,7 @@ static INPUT_PORTS_START( spdcoin )
PORT_DIPSETTING( 0x02, DEF_STR( On ) )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) ) /* Dip Sw #5 - Check code at 0x0569 */
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -1931,7 +1931,7 @@ INPUT_PORTS_END
/* cocktail mode is N/A */
static INPUT_PORTS_START( superbon )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -1941,7 +1941,7 @@ static INPUT_PORTS_START( superbon )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x02, "5" )
@@ -1962,7 +1962,7 @@ static INPUT_PORTS_START( superbon )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1991,7 +1991,7 @@ INPUT_PORTS_END
/* cocktail mode is N/A */
INPUT_PORTS_START( losttomb )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_8WAY
@@ -2001,7 +2001,7 @@ INPUT_PORTS_START( losttomb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x02, "5" )
@@ -2014,7 +2014,7 @@ INPUT_PORTS_START( losttomb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_DIPUNKNOWN( 0x80, 0x00 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPUNKNOWN( 0x01, 0x00 )
PORT_DIPNAME( 0x06, 0x02, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) )
@@ -2027,7 +2027,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( armorcar )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2037,7 +2037,7 @@ INPUT_PORTS_START( armorcar )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
@@ -2051,7 +2051,7 @@ INPUT_PORTS_START( armorcar )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_DIPNAME( 0x06, 0x02, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) )
@@ -2069,7 +2069,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( tazmania )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -2079,7 +2079,7 @@ INPUT_PORTS_START( tazmania )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
@@ -2093,7 +2093,7 @@ INPUT_PORTS_START( tazmania )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_DIPNAME( 0x06, 0x02, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) )
@@ -2112,7 +2112,7 @@ INPUT_PORTS_END
/* cocktail mode not working due to bug in game code */
INPUT_PORTS_START( anteater )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -2122,7 +2122,7 @@ INPUT_PORTS_START( anteater )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
@@ -2136,7 +2136,7 @@ INPUT_PORTS_START( anteater )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_DIPNAME( 0x06, 0x02, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) )
@@ -2155,7 +2155,7 @@ INPUT_PORTS_END
/* cocktail mode is N/A */
static INPUT_PORTS_START( calipso )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -2165,7 +2165,7 @@ static INPUT_PORTS_START( calipso )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
@@ -2179,7 +2179,7 @@ static INPUT_PORTS_START( calipso )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_DIPNAME( 0x06, 0x02, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) )
@@ -2197,13 +2197,13 @@ INPUT_PORTS_END
static INPUT_PORTS_START( moonwar_common )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x1f, IP_ACTIVE_LOW, IPT_SPECIAL ) /* the spinner */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -2221,7 +2221,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( moonwar )
PORT_INCLUDE( moonwar_common )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_DIPNAME( 0x06, 0x02, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) )
@@ -2233,10 +2233,10 @@ static INPUT_PORTS_START( moonwar )
PORT_DIPSETTING( 0x08, DEF_STR( Cocktail ) )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) /* output bits */
- PORT_START_TAG("IN3") /* IN3/4 - dummy ports for the dial */
+ PORT_START("IN3") /* IN3/4 - dummy ports for the dial */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_RESET
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_RESET PORT_COCKTAIL
INPUT_PORTS_END
@@ -2244,7 +2244,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( moonwara )
PORT_INCLUDE( moonwar_common )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_DIPNAME( 0x06, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -2256,10 +2256,10 @@ static INPUT_PORTS_START( moonwara )
PORT_DIPSETTING( 0x08, DEF_STR( Cocktail ) )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) /* output bits */
- PORT_START_TAG("IN3") /* IN3/4 - dummy ports for the dial */
+ PORT_START("IN3") /* IN3/4 - dummy ports for the dial */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_RESET
- PORT_START_TAG("IN4") /* doesn't actually work due to bug in game code */
+ PORT_START("IN4") /* doesn't actually work due to bug in game code */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_RESET PORT_COCKTAIL
INPUT_PORTS_END
diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c
index c1f7bead09e..71459c75541 100644
--- a/src/mame/drivers/galivan.c
+++ b/src/mame/drivers/galivan.c
@@ -204,7 +204,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(_n_)
#define NIHON_SYSTEM \
- PORT_START_TAG("IN2") /* TEST, COIN, START */ \
+ PORT_START("IN2") /* TEST, COIN, START */ \
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) \
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) \
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) \
@@ -259,13 +259,13 @@ ADDRESS_MAP_END
PORT_DIPSETTING( 0x00, "6" )
static INPUT_PORTS_START( galivan )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
NIHON_JOYSTICK(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
NIHON_JOYSTICK(2)
NIHON_SYSTEM
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
NIHON_LIVES
NIHON_BONUS_LIFE
PORT_DIPNAME( 0x10, 0x10, DEF_STR( Demo_Sounds ) )
@@ -281,7 +281,7 @@ static INPUT_PORTS_START( galivan )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
NIHON_COINAGE_A
NIHON_COINAGE_B_ALT
PORT_DIPNAME( 0x10, 0x10, DEF_STR( Difficulty ) )
@@ -299,13 +299,13 @@ static INPUT_PORTS_START( galivan )
INPUT_PORTS_END
static INPUT_PORTS_START( dangar )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
NIHON_JOYSTICK(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
NIHON_JOYSTICK(2)
NIHON_SYSTEM
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
NIHON_LIVES
NIHON_BONUS_LIFE
PORT_DIPNAME( 0x10, 0x10, DEF_STR( Demo_Sounds ) )
@@ -321,7 +321,7 @@ static INPUT_PORTS_START( dangar )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
NIHON_COINAGE_A
NIHON_COINAGE_B
PORT_DIPNAME( 0x10, 0x10, DEF_STR( Difficulty ) )
@@ -340,13 +340,13 @@ INPUT_PORTS_END
/* different Lives values and last different the last two dips */
static INPUT_PORTS_START( dangar2 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
NIHON_JOYSTICK(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
NIHON_JOYSTICK(2)
NIHON_SYSTEM
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x03, "3" )
@@ -366,7 +366,7 @@ static INPUT_PORTS_START( dangar2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
NIHON_COINAGE_A
NIHON_COINAGE_B
PORT_DIPNAME( 0x10, 0x10, DEF_STR( Difficulty ) )
@@ -385,13 +385,13 @@ INPUT_PORTS_END
/* the last two dip switches are different */
static INPUT_PORTS_START( dangarb )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
NIHON_JOYSTICK(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
NIHON_JOYSTICK(2)
NIHON_SYSTEM
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
NIHON_LIVES
NIHON_BONUS_LIFE
PORT_DIPNAME( 0x10, 0x10, DEF_STR( Demo_Sounds ) )
@@ -407,7 +407,7 @@ static INPUT_PORTS_START( dangarb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
NIHON_COINAGE_A
NIHON_COINAGE_B
PORT_DIPNAME( 0x10, 0x10, DEF_STR( Difficulty ) )
@@ -425,13 +425,13 @@ static INPUT_PORTS_START( dangarb )
INPUT_PORTS_END
static INPUT_PORTS_START( ninjemak )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
NIHON_JOYSTICK(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
NIHON_JOYSTICK(2)
NIHON_SYSTEM
- PORT_START_TAG("IN3") /* IN3 - TEST */
+ PORT_START("IN3") /* IN3 - TEST */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -455,7 +455,7 @@ static INPUT_PORTS_START( ninjemak )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN4") /* IN4 - TEST */
+ PORT_START("IN4") /* IN4 - TEST */
NIHON_LIVES
NIHON_BONUS_LIFE
PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) )
@@ -469,7 +469,7 @@ static INPUT_PORTS_START( ninjemak )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
- PORT_START_TAG("IN5") /* IN5 - TEST */
+ PORT_START("IN5") /* IN5 - TEST */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c
index d466ae53258..541369b31f2 100644
--- a/src/mame/drivers/galpani2.c
+++ b/src/mame/drivers/galpani2.c
@@ -299,7 +299,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( galpani2 )
- PORT_START_TAG("IN0") // IN0 - DSW + Player 1 - 780000.w
+ PORT_START("IN0") // IN0 - DSW + Player 1 - 780000.w
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x007, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x006, DEF_STR( Very_Easy ) )
@@ -332,7 +332,7 @@ static INPUT_PORTS_START( galpani2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
- PORT_START_TAG("IN1") // IN1 - DSW + Player 2 - 780002.w
+ PORT_START("IN1") // IN1 - DSW + Player 2 - 780002.w
PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x000f, "1 Coin/1 Credit 1/1" )
PORT_DIPSETTING( 0x000e, "2 Coin/1 Credit 2/1" )
@@ -370,7 +370,7 @@ static INPUT_PORTS_START( galpani2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(1)
- PORT_START_TAG("IN2") // IN2 - Coins - 780004.w
+ PORT_START("IN2") // IN2 - Coins - 780004.w
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -381,7 +381,7 @@ static INPUT_PORTS_START( galpani2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SPECIAL ) // CARD full
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_SPECIAL ) // CARD empty
- PORT_START_TAG("IN3") // IN3 - ? - 780006.w
+ PORT_START("IN3") // IN3 - ? - 780006.w
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/galpani3.c b/src/mame/drivers/galpani3.c
index fedb7b244eb..b3b0f310895 100644
--- a/src/mame/drivers/galpani3.c
+++ b/src/mame/drivers/galpani3.c
@@ -110,7 +110,7 @@ static VIDEO_UPDATE(galpani3)
static INPUT_PORTS_START( galpani3 )
- PORT_START_TAG("P1") /* IN0 - Player Controls */
+ PORT_START("P1") /* IN0 - Player Controls */
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -120,7 +120,7 @@ static INPUT_PORTS_START( galpani3 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ?
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2") /* IN1 - Player Controls */
+ PORT_START("P2") /* IN1 - Player Controls */
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -130,7 +130,7 @@ static INPUT_PORTS_START( galpani3 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ?
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("COIN") /* IN2 - Coins */
+ PORT_START("COIN") /* IN2 - Coins */
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
@@ -140,7 +140,7 @@ static INPUT_PORTS_START( galpani3 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW") /* IN3 - DSW provided by the MCU - $200386.b <- $400200 */
+ PORT_START("DSW") /* IN3 - DSW provided by the MCU - $200386.b <- $400200 */
PORT_DIPNAME( 0x0100, 0x0100, "Test Mode" )
PORT_DIPSETTING( 0x0100, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/galpanic.c b/src/mame/drivers/galpanic.c
index f52d39fd0d2..de264aad645 100644
--- a/src/mame/drivers/galpanic.c
+++ b/src/mame/drivers/galpanic.c
@@ -452,7 +452,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( galpanic )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -495,7 +495,7 @@ static INPUT_PORTS_START( galpanic )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
@@ -527,7 +527,7 @@ static INPUT_PORTS_START( galpanic )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
@@ -540,7 +540,7 @@ static INPUT_PORTS_START( galpanic )
INPUT_PORTS_END
static INPUT_PORTS_START( galpania )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -574,7 +574,7 @@ static INPUT_PORTS_START( galpania )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
@@ -606,7 +606,7 @@ static INPUT_PORTS_START( galpania )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
@@ -619,7 +619,7 @@ static INPUT_PORTS_START( galpania )
INPUT_PORTS_END
static INPUT_PORTS_START( fantasia )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
@@ -651,7 +651,7 @@ static INPUT_PORTS_START( fantasia )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -672,7 +672,7 @@ static INPUT_PORTS_START( fantasia )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
@@ -686,7 +686,7 @@ INPUT_PORTS_END
/* Same as 'fantasia', but no "Service Mode" Dip Switch (and thus no "hidden" buttons) */
static INPUT_PORTS_START( missw96 )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
@@ -718,7 +718,7 @@ static INPUT_PORTS_START( missw96 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -741,7 +741,7 @@ static INPUT_PORTS_START( missw96 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
@@ -754,7 +754,7 @@ static INPUT_PORTS_START( missw96 )
INPUT_PORTS_END
static INPUT_PORTS_START( galhustl )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0000, "6" )
PORT_DIPSETTING( 0x0001, "7" )
@@ -785,7 +785,7 @@ static INPUT_PORTS_START( galhustl )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) )
@@ -817,7 +817,7 @@ static INPUT_PORTS_START( galhustl )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
@@ -830,7 +830,7 @@ static INPUT_PORTS_START( galhustl )
INPUT_PORTS_END
static INPUT_PORTS_START( zipzap )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -863,7 +863,7 @@ static INPUT_PORTS_START( zipzap )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) )
@@ -896,7 +896,7 @@ static INPUT_PORTS_START( zipzap )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
diff --git a/src/mame/drivers/galspnbl.c b/src/mame/drivers/galspnbl.c
index 8ac292e8a3a..1d927a7c76c 100644
--- a/src/mame/drivers/galspnbl.c
+++ b/src/mame/drivers/galspnbl.c
@@ -79,7 +79,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( galspnbl )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* tested at 0x0016c6 - doesn't seem tilt related */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* tested at 0x0016d2 - doesn't seem tilt related */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -89,7 +89,7 @@ static INPUT_PORTS_START( galspnbl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* uncalled (?) code at 0x007ed2 ('hotpinbl') or 0x008106 ('galspnbl') */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -99,7 +99,7 @@ static INPUT_PORTS_START( galspnbl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* uncalled (?) code at 0x007e90 ('hotpinbl') or 0x0080c4 ('galspnbl') */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME( "Start" ) /* needed to avoid confusion with # of players */
@@ -109,7 +109,7 @@ static INPUT_PORTS_START( galspnbl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 0x700018.b */
+ PORT_START("DSW1") /* 0x700018.b */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Unknown ) ) /* difficulty ? code at 0x0085c6 ('hotpinbl') or 0x008994 ('galspnbl') */
PORT_DIPSETTING( 0x03, "0" )
PORT_DIPSETTING( 0x02, "1" )
@@ -129,7 +129,7 @@ static INPUT_PORTS_START( galspnbl )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW )
- PORT_START /* 0x700019.b */
+ PORT_START("DSW2") /* 0x700019.b */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 3C_1C ) )
@@ -156,7 +156,7 @@ static INPUT_PORTS_START( galspnbl )
INPUT_PORTS_END
static INPUT_PORTS_START( hotpinbl )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* tested at 0x0016c6 - doesn't seem tilt related */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* tested at 0x0016d2 - doesn't seem tilt related */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -166,7 +166,7 @@ static INPUT_PORTS_START( hotpinbl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* uncalled (?) code at 0x007ed2 ('hotpinbl') or 0x008106 ('galspnbl') */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -176,7 +176,7 @@ static INPUT_PORTS_START( hotpinbl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* uncalled (?) code at 0x007e90 ('hotpinbl') or 0x0080c4 ('galspnbl') */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME( "Start" ) /* needed to avoid confusion with # of players */
@@ -186,7 +186,7 @@ static INPUT_PORTS_START( hotpinbl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 0x700018.b */
+ PORT_START("DSW1") /* 0x700018.b */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Unknown ) ) /* difficulty ? code at 0x0085c6 ('hotpinbl') or 0x008994 ('galspnbl') */
PORT_DIPSETTING( 0x03, "0" )
PORT_DIPSETTING( 0x02, "1" )
@@ -206,7 +206,7 @@ static INPUT_PORTS_START( hotpinbl )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW )
- PORT_START /* 0x700019.b */
+ PORT_START("DSW2") /* 0x700019.b */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/gamecstl.c b/src/mame/drivers/gamecstl.c
index 712a03e486e..fdf4669a441 100644
--- a/src/mame/drivers/gamecstl.c
+++ b/src/mame/drivers/gamecstl.c
@@ -522,25 +522,25 @@ GFXDECODE_END
PORT_BIT( bit, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(text) PORT_CODE(key1)
static INPUT_PORTS_START(gamecstl)
- PORT_START_TAG("pc_keyboard_0")
+ PORT_START("pc_keyboard_0")
PORT_BIT ( 0x0001, 0x0000, IPT_UNUSED ) /* unused scancode 0 */
AT_KEYB_HELPER( 0x0002, "Esc", KEYCODE_Q ) /* Esc 01 81 */
- PORT_START_TAG("pc_keyboard_1")
+ PORT_START("pc_keyboard_1")
AT_KEYB_HELPER( 0x0020, "Y", KEYCODE_Y ) /* Y 15 95 */
AT_KEYB_HELPER( 0x1000, "Enter", KEYCODE_ENTER ) /* Enter 1C 9C */
- PORT_START_TAG("pc_keyboard_2")
+ PORT_START("pc_keyboard_2")
- PORT_START_TAG("pc_keyboard_3")
+ PORT_START("pc_keyboard_3")
AT_KEYB_HELPER( 0x0002, "N", KEYCODE_N ) /* N 31 B1 */
AT_KEYB_HELPER( 0x0800, "F1", KEYCODE_S ) /* F1 3B BB */
- PORT_START_TAG("pc_keyboard_4")
+ PORT_START("pc_keyboard_4")
- PORT_START_TAG("pc_keyboard_5")
+ PORT_START("pc_keyboard_5")
- PORT_START_TAG("pc_keyboard_6")
+ PORT_START("pc_keyboard_6")
AT_KEYB_HELPER( 0x0040, "(MF2)Cursor Up", KEYCODE_UP ) /* Up 67 e7 */
AT_KEYB_HELPER( 0x0080, "(MF2)Page Up", KEYCODE_PGUP ) /* Page Up 68 e8 */
AT_KEYB_HELPER( 0x0100, "(MF2)Cursor Left", KEYCODE_LEFT ) /* Left 69 e9 */
@@ -549,7 +549,7 @@ static INPUT_PORTS_START(gamecstl)
AT_KEYB_HELPER( 0x1000, "(MF2)Page Down", KEYCODE_PGDN ) /* Page Down 6d ed */
AT_KEYB_HELPER( 0x4000, "Del", KEYCODE_A ) /* Delete 6f ef */
- PORT_START_TAG("pc_keyboard_7")
+ PORT_START("pc_keyboard_7")
INPUT_PORTS_END
static IRQ_CALLBACK(irq_callback)
diff --git a/src/mame/drivers/gameplan.c b/src/mame/drivers/gameplan.c
index 0a32532a49b..895e9bb601e 100644
--- a/src/mame/drivers/gameplan.c
+++ b/src/mame/drivers/gameplan.c
@@ -278,7 +278,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( killcom )
- PORT_START_TAG("IN0") /* COL. A - from "TEST NO.7 - status locator - coin-door" */
+ PORT_START("IN0") /* COL. A - from "TEST NO.7 - status locator - coin-door" */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT )
@@ -288,7 +288,7 @@ static INPUT_PORTS_START( killcom )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("IN1") /* COL. B - from "TEST NO.7 - status locator - start sws." */
+ PORT_START("IN1") /* COL. B - from "TEST NO.7 - status locator - start sws." */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -298,7 +298,7 @@ static INPUT_PORTS_START( killcom )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2") /* COL. C - from "TEST NO.8 - status locator - player no.1" */
+ PORT_START("IN2") /* COL. C - from "TEST NO.8 - status locator - player no.1" */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 )
@@ -308,7 +308,7 @@ static INPUT_PORTS_START( killcom )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
- PORT_START_TAG("IN3") /* COL. D - from "TEST NO.8 - status locator - player no.2" */
+ PORT_START("IN3") /* COL. D - from "TEST NO.8 - status locator - player no.2" */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
@@ -318,7 +318,7 @@ static INPUT_PORTS_START( killcom )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_COCKTAIL
- PORT_START_TAG("DSW0") /* DSW A - from "TEST NO.6 - dip switch A" */
+ PORT_START("DSW0") /* DSW A - from "TEST NO.6 - dip switch A" */
PORT_DIPNAME( 0x03, 0x03, "Coinage P1/P2" )
PORT_DIPSETTING( 0x03, "1 Credit/2 Credits" )
PORT_DIPSETTING( 0x02, "2 Credits/3 Credits" )
@@ -342,7 +342,7 @@ static INPUT_PORTS_START( killcom )
PORT_DIPSETTING( 0x40, "Fast" )
PORT_DIPSETTING( 0x00, "Fastest" )
- PORT_START_TAG("DSW1") /* DSW B - from "TEST NO.6 - dip switch B" */
+ PORT_START("DSW1") /* DSW B - from "TEST NO.6 - dip switch B" */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -368,7 +368,7 @@ static INPUT_PORTS_START( killcom )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2") /* audio board DSW A */
+ PORT_START("DSW2") /* audio board DSW A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -394,7 +394,7 @@ static INPUT_PORTS_START( killcom )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* audio board DSW B */
+ PORT_START("DSW3") /* audio board DSW B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -423,7 +423,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( megatack )
- PORT_START_TAG("IN0") /* COL. A - from "TEST NO.7 - status locator - coin-door" */
+ PORT_START("IN0") /* COL. A - from "TEST NO.7 - status locator - coin-door" */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT )
@@ -433,7 +433,7 @@ static INPUT_PORTS_START( megatack )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("IN1") /* COL. B - from "TEST NO.7 - status locator - start sws." */
+ PORT_START("IN1") /* COL. B - from "TEST NO.7 - status locator - start sws." */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -443,7 +443,7 @@ static INPUT_PORTS_START( megatack )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2") /* COL. C - from "TEST NO.8 - status locator - player no.1" */
+ PORT_START("IN2") /* COL. C - from "TEST NO.8 - status locator - player no.1" */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -453,7 +453,7 @@ static INPUT_PORTS_START( megatack )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* COL. D - from "TEST NO.8 - status locator - player no.2" */
+ PORT_START("IN3") /* COL. D - from "TEST NO.8 - status locator - player no.2" */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -463,7 +463,7 @@ static INPUT_PORTS_START( megatack )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW0") /* DSW A - from "TEST NO.6 - dip switch A" */
+ PORT_START("DSW0") /* DSW A - from "TEST NO.6 - dip switch A" */
PORT_DIPNAME( 0x03, 0x03, "Coinage P1/P2" )
PORT_DIPSETTING( 0x03, "1 Credit/2 Credits" )
PORT_DIPSETTING( 0x02, "2 Credits/3 Credits" )
@@ -488,7 +488,7 @@ static INPUT_PORTS_START( megatack )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* DSW B - from "TEST NO.6 - dip switch B" */
+ PORT_START("DSW1") /* DSW B - from "TEST NO.6 - dip switch B" */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x07, "20000" )
PORT_DIPSETTING( 0x06, "30000" )
@@ -514,7 +514,7 @@ static INPUT_PORTS_START( megatack )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2") /* audio board DSW A */
+ PORT_START("DSW2") /* audio board DSW A */
PORT_DIPNAME( 0x01, 0x00, "Sound Test A 0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -540,7 +540,7 @@ static INPUT_PORTS_START( megatack )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* audio board DSW B */
+ PORT_START("DSW3") /* audio board DSW B */
PORT_DIPNAME( 0x01, 0x00, "Sound Test B 0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -569,7 +569,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( challeng )
- PORT_START_TAG("IN0") /* COL. A - from "TEST NO.7 - status locator - coin-door" */
+ PORT_START("IN0") /* COL. A - from "TEST NO.7 - status locator - coin-door" */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT )
@@ -579,7 +579,7 @@ static INPUT_PORTS_START( challeng )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1") /* COL. B - from "TEST NO.7 - status locator - start sws." */
+ PORT_START("IN1") /* COL. B - from "TEST NO.7 - status locator - start sws." */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -589,7 +589,7 @@ static INPUT_PORTS_START( challeng )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2") /* COL. C - from "TEST NO.8 - status locator - player no.1" */
+ PORT_START("IN2") /* COL. C - from "TEST NO.8 - status locator - player no.1" */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -599,7 +599,7 @@ static INPUT_PORTS_START( challeng )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* COL. D - from "TEST NO.8 - status locator - player no.2" */
+ PORT_START("IN3") /* COL. D - from "TEST NO.8 - status locator - player no.2" */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -609,7 +609,7 @@ static INPUT_PORTS_START( challeng )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW0") /* DSW A - from "TEST NO.6 - dip switch A" */
+ PORT_START("DSW0") /* DSW A - from "TEST NO.6 - dip switch A" */
PORT_DIPNAME( 0x03, 0x03, "Coinage P1/P2" )
PORT_DIPSETTING( 0x03, "1 Credit/2 Credits" )
PORT_DIPSETTING( 0x02, "2 Credits/3 Credits" )
@@ -633,7 +633,7 @@ static INPUT_PORTS_START( challeng )
PORT_DIPSETTING( 0x40, "5" )
PORT_DIPSETTING( 0x00, "6" )
- PORT_START_TAG("DSW1") /* DSW B - from "TEST NO.6 - dip switch B" */
+ PORT_START("DSW1") /* DSW B - from "TEST NO.6 - dip switch B" */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x01, "20000" )
PORT_DIPSETTING( 0x00, "30000" )
@@ -659,7 +659,7 @@ static INPUT_PORTS_START( challeng )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2") /* audio board DSW A */
+ PORT_START("DSW2") /* audio board DSW A */
PORT_DIPNAME( 0x01, 0x00, "Sound Test A 0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -685,7 +685,7 @@ static INPUT_PORTS_START( challeng )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* audio board DSW B */
+ PORT_START("DSW3") /* audio board DSW B */
PORT_DIPNAME( 0x01, 0x00, "Sound Test B 0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -714,7 +714,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( kaos )
- PORT_START_TAG("IN0") /* COL. A - from "TEST NO.7 - status locator - coin-door" */
+ PORT_START("IN0") /* COL. A - from "TEST NO.7 - status locator - coin-door" */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT )
@@ -724,7 +724,7 @@ static INPUT_PORTS_START( kaos )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("IN1") /* COL. B - from "TEST NO.7 - status locator - start sws." */
+ PORT_START("IN1") /* COL. B - from "TEST NO.7 - status locator - start sws." */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -734,7 +734,7 @@ static INPUT_PORTS_START( kaos )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2") /* COL. C - from "TEST NO.8 - status locator - player no.1" */
+ PORT_START("IN2") /* COL. C - from "TEST NO.8 - status locator - player no.1" */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
@@ -744,7 +744,7 @@ static INPUT_PORTS_START( kaos )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* COL. D - from "TEST NO.8 - status locator - player no.2" */
+ PORT_START("IN3") /* COL. D - from "TEST NO.8 - status locator - player no.2" */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
@@ -754,7 +754,7 @@ static INPUT_PORTS_START( kaos )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x0f, 0x0e, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x0e, DEF_STR( 1C_1C ) )
@@ -784,7 +784,7 @@ static INPUT_PORTS_START( kaos )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "4" )
@@ -809,7 +809,7 @@ static INPUT_PORTS_START( kaos )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2") /* audio board DSW A */
+ PORT_START("DSW2") /* audio board DSW A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -835,7 +835,7 @@ static INPUT_PORTS_START( kaos )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* audio board DSW B */
+ PORT_START("DSW3") /* audio board DSW B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -864,7 +864,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( leprechn )
- PORT_START_TAG("IN0") /* COL. A - from "TEST NO.7 - status locator - coin-door" */
+ PORT_START("IN0") /* COL. A - from "TEST NO.7 - status locator - coin-door" */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT )
@@ -874,7 +874,7 @@ static INPUT_PORTS_START( leprechn )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("IN1") /* COL. B - from "TEST NO.7 - status locator - start sws." */
+ PORT_START("IN1") /* COL. B - from "TEST NO.7 - status locator - start sws." */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -884,7 +884,7 @@ static INPUT_PORTS_START( leprechn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2") /* COL. C - from "TEST NO.8 - status locator - player no.1" */
+ PORT_START("IN2") /* COL. C - from "TEST NO.8 - status locator - player no.1" */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -894,7 +894,7 @@ static INPUT_PORTS_START( leprechn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
- PORT_START_TAG("IN3") /* COL. D - from "TEST NO.8 - status locator - player no.2" */
+ PORT_START("IN3") /* COL. D - from "TEST NO.8 - status locator - player no.2" */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -904,7 +904,7 @@ static INPUT_PORTS_START( leprechn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_COCKTAIL
- PORT_START_TAG("DSW0") /* DSW A - from "TEST NO.6 - dip switch A" */
+ PORT_START("DSW0") /* DSW A - from "TEST NO.6 - dip switch A" */
PORT_DIPNAME( 0x09, 0x09, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x09, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_5C ) )
@@ -927,7 +927,7 @@ static INPUT_PORTS_START( leprechn )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_4C ) )
- PORT_START_TAG("DSW1") /* DSW B - from "TEST NO.6 - dip switch B" */
+ PORT_START("DSW1") /* DSW B - from "TEST NO.6 - dip switch B" */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -952,7 +952,7 @@ static INPUT_PORTS_START( leprechn )
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* audio board DSW A */
+ PORT_START("DSW2") /* audio board DSW A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -978,7 +978,7 @@ static INPUT_PORTS_START( leprechn )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* audio board DSW B */
+ PORT_START("DSW3") /* audio board DSW B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1007,7 +1007,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( piratetr )
- PORT_START_TAG("IN0") /* COL. A - from "TEST NO.7 - status locator - coin-door" */
+ PORT_START("IN0") /* COL. A - from "TEST NO.7 - status locator - coin-door" */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT )
@@ -1017,7 +1017,7 @@ static INPUT_PORTS_START( piratetr )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("IN1") /* COL. B - from "TEST NO.7 - status locator - start sws." */
+ PORT_START("IN1") /* COL. B - from "TEST NO.7 - status locator - start sws." */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1027,7 +1027,7 @@ static INPUT_PORTS_START( piratetr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2") /* COL. C - from "TEST NO.8 - status locator - player no.1" */
+ PORT_START("IN2") /* COL. C - from "TEST NO.8 - status locator - player no.1" */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1037,7 +1037,7 @@ static INPUT_PORTS_START( piratetr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
- PORT_START_TAG("IN3") /* COL. D - from "TEST NO.8 - status locator - player no.2" */
+ PORT_START("IN3") /* COL. D - from "TEST NO.8 - status locator - player no.2" */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1047,7 +1047,7 @@ static INPUT_PORTS_START( piratetr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_COCKTAIL
- PORT_START_TAG("DSW0") /* DSW A - from "TEST NO.6 - dip switch A" */
+ PORT_START("DSW0") /* DSW A - from "TEST NO.6 - dip switch A" */
PORT_DIPNAME( 0x09, 0x09, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x09, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_5C ) )
@@ -1070,7 +1070,7 @@ static INPUT_PORTS_START( piratetr )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_4C ) )
- PORT_START_TAG("DSW1") /* DSW B - from "TEST NO.6 - dip switch B" */
+ PORT_START("DSW1") /* DSW B - from "TEST NO.6 - dip switch B" */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1095,7 +1095,7 @@ static INPUT_PORTS_START( piratetr )
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* audio board DSW A */
+ PORT_START("DSW2") /* audio board DSW A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1121,7 +1121,7 @@ static INPUT_PORTS_START( piratetr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* audio board DSW B */
+ PORT_START("DSW3") /* audio board DSW B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c
index d6ff5e082ce..db8b97c68a6 100644
--- a/src/mame/drivers/gaplus.c
+++ b/src/mame/drivers/gaplus.c
@@ -364,7 +364,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( gaplus )
/* The inputs are not memory mapped, they are handled by three I/O chips. */
- PORT_START_TAG("IN0") /* 56XX #0 pins 22-29 */
+ PORT_START("IN0") /* 56XX #0 pins 22-29 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -374,7 +374,7 @@ static INPUT_PORTS_START( gaplus )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("IN1") /* 56XX #0 pins 30-33 and 38-41 */
+ PORT_START("IN1") /* 56XX #0 pins 30-33 and 38-41 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -384,7 +384,7 @@ static INPUT_PORTS_START( gaplus )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("DSW0") /* 58XX #1 pins 30-33 and 38-41 */
+ PORT_START("DSW0") /* 58XX #1 pins 30-33 and 38-41 */
PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x80, "2" )
PORT_DIPSETTING( 0xc0, "3" )
@@ -407,7 +407,7 @@ static INPUT_PORTS_START( gaplus )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSW1") /* 58XX #1 pins 22-29 */
+ PORT_START("DSW1") /* 58XX #1 pins 22-29 */
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -433,7 +433,7 @@ static INPUT_PORTS_START( gaplus )
PORT_DIPSETTING( 0x05, "50k 150k and every 300k" )
PORT_DIPSETTING( 0x06, "50k 150k" )
- PORT_START_TAG("IN2") /* 62XX #2 pins 24-27 */
+ PORT_START("IN2") /* 62XX #2 pins 24-27 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Cabinet ) )
diff --git a/src/mame/drivers/gatron.c b/src/mame/drivers/gatron.c
index dc916a07730..5b71a6e1384 100644
--- a/src/mame/drivers/gatron.c
+++ b/src/mame/drivers/gatron.c
@@ -303,7 +303,7 @@ ADDRESS_MAP_END
*************************/
static INPUT_PORTS_START( poker41 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_NAME("Discard 4") PORT_CODE(KEYCODE_V)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Bet/Ante") PORT_CODE(KEYCODE_N)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Deal/Hit") PORT_CODE(KEYCODE_2)
@@ -313,7 +313,7 @@ static INPUT_PORTS_START( poker41 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_NAME("Discard 5") PORT_CODE(KEYCODE_B)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Discard 3") PORT_CODE(KEYCODE_C)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Discard 2") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Service 2 (Test Mode Out / Coin Stuck)") PORT_CODE(KEYCODE_0)
@@ -323,7 +323,7 @@ static INPUT_PORTS_START( poker41 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Discard 1") PORT_CODE(KEYCODE_Z)
- PORT_START_TAG("IN2") /* disabled */
+ PORT_START("IN2") /* disabled */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -335,7 +335,7 @@ static INPUT_PORTS_START( poker41 )
INPUT_PORTS_END
static INPUT_PORTS_START( pulltabs )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Ante") PORT_CODE(KEYCODE_1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -345,7 +345,7 @@ static INPUT_PORTS_START( pulltabs )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Big Bar Ticket") PORT_CODE(KEYCODE_C)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Lady Luck Ticket") PORT_CODE(KEYCODE_X)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Service 2 (Test Mode Out / Coin Stuck)") PORT_CODE(KEYCODE_0)
@@ -355,7 +355,7 @@ static INPUT_PORTS_START( pulltabs )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Super Star Ticket") PORT_CODE(KEYCODE_Z)
- PORT_START_TAG("IN2") /* disabled */
+ PORT_START("IN2") /* disabled */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c
index f4e0c16083a..ce093d6895b 100644
--- a/src/mame/drivers/gauntlet.c
+++ b/src/mame/drivers/gauntlet.c
@@ -377,7 +377,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( gauntlet )
- PORT_START_TAG("IN0") /* 803000 */
+ PORT_START("IN0") /* 803000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x000c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -387,7 +387,7 @@ static INPUT_PORTS_START( gauntlet )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* 803002 */
+ PORT_START("IN1") /* 803002 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x000c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -397,7 +397,7 @@ static INPUT_PORTS_START( gauntlet )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* 803004 */
+ PORT_START("IN2") /* 803004 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x000c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -407,7 +407,7 @@ static INPUT_PORTS_START( gauntlet )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* 803006 */
+ PORT_START("IN3") /* 803006 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
PORT_BIT( 0x000c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -417,14 +417,14 @@ static INPUT_PORTS_START( gauntlet )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN4") /* 803008 */
+ PORT_START("IN4") /* 803008 */
PORT_BIT( 0x0007, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_SERVICE( 0x0008, IP_ACTIVE_LOW )
PORT_BIT( 0x0030, IP_ACTIVE_HIGH, IPT_SPECIAL )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0xff80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN5") /* 1020 (sound) */
+ PORT_START("IN5") /* 1020 (sound) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -434,7 +434,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( vindctr2 )
- PORT_START_TAG("IN0") /* 803000 */
+ PORT_START("IN0") /* 803000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -445,7 +445,7 @@ static INPUT_PORTS_START( vindctr2 )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* 803002 */
+ PORT_START("IN1") /* 803002 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
@@ -456,22 +456,22 @@ static INPUT_PORTS_START( vindctr2 )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* 803004 */
+ PORT_START("IN2") /* 803004 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xfffc, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* 803006 */
+ PORT_START("IN3") /* 803006 */
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN4") /* 803008 */
+ PORT_START("IN4") /* 803008 */
PORT_BIT( 0x0007, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_SERVICE( 0x0008, IP_ACTIVE_LOW )
PORT_BIT( 0x0030, IP_ACTIVE_HIGH, IPT_SPECIAL )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0xff80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN5") /* 1020 (sound) */
+ PORT_START("IN5") /* 1020 (sound) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
diff --git a/src/mame/drivers/gberet.c b/src/mame/drivers/gberet.c
index 81f4539dbdf..22f68e9aefb 100644
--- a/src/mame/drivers/gberet.c
+++ b/src/mame/drivers/gberet.c
@@ -211,7 +211,7 @@ ADDRESS_MAP_END
/* Input Ports */
static INPUT_PORTS_START( gberet )
- PORT_START // IN0
+ PORT_START("P1") // IN0
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -220,7 +220,7 @@ static INPUT_PORTS_START( gberet )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) // shoot
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START // IN1
+ PORT_START("P2") // IN1
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -229,7 +229,7 @@ static INPUT_PORTS_START( gberet )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START // IN2
+ PORT_START("SYSTEM") // IN2
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -237,7 +237,7 @@ static INPUT_PORTS_START( gberet )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START // DSW0
+ PORT_START("DSW1") // DSW0
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -273,7 +273,7 @@ static INPUT_PORTS_START( gberet )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START // DSW1
+ PORT_START("DSW2") // DSW1
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -296,7 +296,7 @@ static INPUT_PORTS_START( gberet )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START // DSW2
+ PORT_START("DSW3") // DSW2
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -308,7 +308,7 @@ INPUT_PORTS_END
// IN2 is different, IN1 and DSW0 are swapped and there is no DSW2
static INPUT_PORTS_START( gberetb )
- PORT_START // IN0
+ PORT_START("P1") // IN0
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -317,7 +317,7 @@ static INPUT_PORTS_START( gberetb )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) // shoot
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START // DSW0
+ PORT_START("DSW1") // DSW0
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -353,17 +353,17 @@ static INPUT_PORTS_START( gberetb )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START // IN2
+ PORT_START("SYSTEM") // IN2
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START // IN1
+ PORT_START("UNUSED") // IN1
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START // DSW1
+ PORT_START("DSW2") // DSW1
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -388,7 +388,7 @@ static INPUT_PORTS_START( gberetb )
INPUT_PORTS_END
static INPUT_PORTS_START( mrgoemon )
- PORT_START // IN0
+ PORT_START("P1") // IN0
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -397,7 +397,7 @@ static INPUT_PORTS_START( mrgoemon )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START // IN1
+ PORT_START("P2") // IN1
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
@@ -406,7 +406,7 @@ static INPUT_PORTS_START( mrgoemon )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START // IN2
+ PORT_START("SYSTEM") // IN2
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -414,7 +414,7 @@ static INPUT_PORTS_START( mrgoemon )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START // DSW0
+ PORT_START("DSW1") // DSW0
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -450,7 +450,7 @@ static INPUT_PORTS_START( mrgoemon )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START // DSW1
+ PORT_START("DSW2") // DSW1
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -473,7 +473,7 @@ static INPUT_PORTS_START( mrgoemon )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START // DSW2
+ PORT_START("DSw3") // DSW2
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c
index b3ff6e02040..61f98aa559b 100644
--- a/src/mame/drivers/gbusters.c
+++ b/src/mame/drivers/gbusters.c
@@ -173,7 +173,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( gbusters )
- PORT_START /* DSW #1 */
+ PORT_START("DSW1") /* DSW #1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -209,7 +209,7 @@ static INPUT_PORTS_START( gbusters )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START /* DSW #2 */
+ PORT_START("DSW2") /* DSW #2 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -232,7 +232,7 @@ static INPUT_PORTS_START( gbusters )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW #3 */
+ PORT_START("DSW3") /* DSW #3 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -245,7 +245,7 @@ static INPUT_PORTS_START( gbusters )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* COINSW */
+ PORT_START("SYSTEM") /* COINSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -255,7 +255,7 @@ static INPUT_PORTS_START( gbusters )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* PLAYER 1 INPUTS */
+ PORT_START("P1") /* PLAYER 1 INPUTS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -265,7 +265,7 @@ static INPUT_PORTS_START( gbusters )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* PLAYER 2 INPUTS */
+ PORT_START("P2") /* PLAYER 2 INPUTS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/gcpinbal.c b/src/mame/drivers/gcpinbal.c
index f034327adf8..fed783d14c9 100644
--- a/src/mame/drivers/gcpinbal.c
+++ b/src/mame/drivers/gcpinbal.c
@@ -231,7 +231,7 @@ ADDRESS_MAP_END
***********************************************************/
static INPUT_PORTS_START( gcpinbal )
- PORT_START_TAG("DSW") /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
@@ -278,7 +278,7 @@ static INPUT_PORTS_START( gcpinbal )
PORT_DIPSETTING( 0x8000, "4" )
PORT_DIPSETTING( 0x4000, "5" )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -296,7 +296,7 @@ static INPUT_PORTS_START( gcpinbal )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_PLAYER(1) // Tilt left
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/getrivia.c b/src/mame/drivers/getrivia.c
index 995beff545b..067e2732346 100644
--- a/src/mame/drivers/getrivia.c
+++ b/src/mame/drivers/getrivia.c
@@ -301,7 +301,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( gselect )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, "Poker: Discard Cards" )
PORT_DIPSETTING( 0x01, "5" )
PORT_DIPSETTING( 0x00, "3" )
@@ -326,7 +326,7 @@ static INPUT_PORTS_START( gselect )
PORT_DIPSETTING( 0x20, "65" )
PORT_DIPSETTING( 0x00, "70" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_IMPULSE(2) PORT_NAME("Button 12 ?")
@@ -336,7 +336,7 @@ static INPUT_PORTS_START( gselect )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_IMPULSE(2) PORT_NAME ("Play / Raise")
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_IMPULSE(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_IMPULSE(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_IMPULSE(2)
@@ -347,7 +347,7 @@ static INPUT_PORTS_START( gselect )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_IMPULSE(2) PORT_NAME ("Stand")
/* Button 8, 6, 7 order verified in test mode switch test */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -360,7 +360,7 @@ static INPUT_PORTS_START( gepoker )
INPUT_PORTS_END
static INPUT_PORTS_START( getrivia )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x03, 0x01, "Questions" )
PORT_DIPSETTING( 0x00, "4" )
PORT_DIPSETTING( 0x01, "5" )
@@ -385,7 +385,7 @@ static INPUT_PORTS_START( getrivia )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2) PORT_CONDITION("DSWA", 0x40, PORTCOND_EQUALS, 0x40)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_IMPULSE(2) PORT_CONDITION("DSWA", 0x40, PORTCOND_EQUALS, 0x00) PORT_NAME ("Start in no coins mode")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(2) PORT_CONDITION("DSWA", 0x40, PORTCOND_EQUALS, 0x40)
@@ -397,7 +397,7 @@ static INPUT_PORTS_START( getrivia )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 )
diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c
index 4acc3733319..3461b4db7dd 100644
--- a/src/mame/drivers/gijoe.c
+++ b/src/mame/drivers/gijoe.c
@@ -269,7 +269,7 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( gijoe )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START3 )
@@ -278,7 +278,7 @@ static INPUT_PORTS_START( gijoe )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_SPECIAL ) // EEPROM ready (always 1)
PORT_SERVICE_NO_TOGGLE( 0x0800, IP_ACTIVE_LOW )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -288,7 +288,7 @@ static INPUT_PORTS_START( gijoe )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_SERVICE3 )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_SERVICE4 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -310,7 +310,7 @@ static INPUT_PORTS_START( gijoe )
PORT_DIPSETTING( 0x8000, "Common" )
PORT_DIPSETTING( 0x0000, "Independant" )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
diff --git a/src/mame/drivers/ginganin.c b/src/mame/drivers/ginganin.c
index 5f8ea5d1589..cb8af5b3e9e 100644
--- a/src/mame/drivers/ginganin.c
+++ b/src/mame/drivers/ginganin.c
@@ -192,7 +192,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( ginganin )
- PORT_START_TAG("IN0") /* - Controls - Read from 70000.w */
+ PORT_START("IN0") /* - Controls - Read from 70000.w */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -210,7 +210,7 @@ static INPUT_PORTS_START( ginganin )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1") /* DSWs - Read from 70002.w */
+ PORT_START("IN1") /* DSWs - Read from 70002.w */
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0004, DEF_STR( 4C_1C ) )
diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c
index 470870b34b2..9a62904ff2b 100644
--- a/src/mame/drivers/gladiatr.c
+++ b/src/mame/drivers/gladiatr.c
@@ -475,7 +475,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( gladiatr )
- PORT_START_TAG("DSW1") /* (8741-0 parallel port)*/
+ PORT_START("DSW1") /* (8741-0 parallel port)*/
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Medium ) )
@@ -499,7 +499,7 @@ static INPUT_PORTS_START( gladiatr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* (8741-1 parallel port) - Dips 6 Unused */
+ PORT_START("DSW2") /* (8741-1 parallel port) - Dips 6 Unused */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
@@ -523,7 +523,7 @@ static INPUT_PORTS_START( gladiatr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* (YM2203 port B) - Dips 5,6,7 Unused */
+ PORT_START("DSW3") /* (YM2203 port B) - Dips 5,6,7 Unused */
PORT_DIPNAME( 0x01, 0x01, "Invulnerability (Cheat)")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -546,7 +546,7 @@ static INPUT_PORTS_START( gladiatr )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN0") /*(8741-3 parallel port 1) */
+ PORT_START("IN0") /*(8741-3 parallel port 1) */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -556,7 +556,7 @@ static INPUT_PORTS_START( gladiatr )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* COINS */
- PORT_START_TAG("COINS") /*(8741-3 parallel port bit7) */
+ PORT_START("COINS") /*(8741-3 parallel port bit7) */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -566,7 +566,7 @@ static INPUT_PORTS_START( gladiatr )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(1)
- PORT_START_TAG("IN1") /* (8741-3 parallel port 2) */
+ PORT_START("IN1") /* (8741-3 parallel port 2) */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -576,7 +576,7 @@ static INPUT_PORTS_START( gladiatr )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* COINS */
- PORT_START_TAG("IN2") /* (8741-3 parallel port 4) */
+ PORT_START("IN2") /* (8741-3 parallel port 4) */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -586,7 +586,7 @@ static INPUT_PORTS_START( gladiatr )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* COINS */
- PORT_START_TAG("IN3") /* (8741-2 parallel port 1) */
+ PORT_START("IN3") /* (8741-2 parallel port 1) */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON3 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
diff --git a/src/mame/drivers/glass.c b/src/mame/drivers/glass.c
index 057b3a35dd3..791742fb929 100644
--- a/src/mame/drivers/glass.c
+++ b/src/mame/drivers/glass.c
@@ -124,7 +124,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( glass )
-PORT_START /* DSW #2 */
+ PORT_START("DSW2") /* DSW #2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -146,7 +146,7 @@ PORT_START /* DSW #2 */
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
-PORT_START /* DSW #1 */
+ PORT_START("DSW1") /* DSW #1 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_4C ) )
@@ -172,7 +172,7 @@ PORT_START /* DSW #1 */
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-PORT_START /* 1P INPUTS */
+ PORT_START("P1") /* 1P INPUTS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -182,7 +182,7 @@ PORT_START /* 1P INPUTS */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
-PORT_START /* 2P INPUTS + Button 3 */
+ PORT_START("P2") /* 2P INPUTS + Button 3 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/gng.c b/src/mame/drivers/gng.c
index 267546466a8..d532478012d 100644
--- a/src/mame/drivers/gng.c
+++ b/src/mame/drivers/gng.c
@@ -113,7 +113,7 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
#define GNG_COMMON \
- PORT_START_TAG("IN0")\
+ PORT_START("IN0")\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )\
@@ -122,7 +122,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE1 )\
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )\
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )\
- PORT_START_TAG("IN1")\
+ PORT_START("IN1")\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY\
@@ -131,7 +131,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )\
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )\
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )\
- PORT_START_TAG("IN2")\
+ PORT_START("IN2")\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL\
@@ -140,7 +140,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL\
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )\
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )\
- PORT_START_TAG("DSW0")\
+ PORT_START("DSW0")\
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coinage ) )\
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )\
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )\
@@ -168,7 +168,7 @@ ADDRESS_MAP_END
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Flip_Screen ) )\
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )\
PORT_DIPSETTING( 0x00, DEF_STR( On ) )\
- PORT_START_TAG("DSW1")\
+ PORT_START("DSW1")\
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )\
PORT_DIPSETTING( 0x03, "3" )\
PORT_DIPSETTING( 0x02, "4" )\
@@ -205,7 +205,7 @@ GNG_COMMON
INPUT_PORTS_END
static INPUT_PORTS_START( diamond )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -215,7 +215,7 @@ static INPUT_PORTS_START( diamond )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
@@ -225,7 +225,7 @@ static INPUT_PORTS_START( diamond )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -235,7 +235,7 @@ static INPUT_PORTS_START( diamond )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "3" )
@@ -258,7 +258,7 @@ static INPUT_PORTS_START( diamond )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x07, "Energy Loss" )
PORT_DIPSETTING( 0x00, "Slowest" )
PORT_DIPSETTING( 0x01, "-6 Slower" )
diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c
index 1967d510157..f7a5d964e0f 100644
--- a/src/mame/drivers/go2000.c
+++ b/src/mame/drivers/go2000.c
@@ -46,7 +46,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( go2000 )
- PORT_START /* 16bit */
+ PORT_START("INPUTS") /* 16bit */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) // continue
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) // korean symbol
@@ -64,7 +64,7 @@ static INPUT_PORTS_START( go2000 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED) // unused?
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN2 ) // coin2
- PORT_START /* dipswitches */
+ PORT_START("DSW") /* dipswitches */
PORT_DIPNAME( 0x0001, 0x0001, "1" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c
index 9b1947bc350..18067a1be78 100644
--- a/src/mame/drivers/goal92.c
+++ b/src/mame/drivers/goal92.c
@@ -115,7 +115,7 @@ static ADDRESS_MAP_START( sound_cpu, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( goal92 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0007, 0x0007, "Coin A / Coin C" )
PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) )
@@ -165,7 +165,7 @@ static INPUT_PORTS_START( goal92 )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -183,7 +183,7 @@ static INPUT_PORTS_START( goal92 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -201,7 +201,7 @@ static INPUT_PORTS_START( goal92 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN4 )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x00fc, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
@@ -209,7 +209,7 @@ static INPUT_PORTS_START( goal92 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START4 )
PORT_BIT( 0xfc00, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
diff --git a/src/mame/drivers/goindol.c b/src/mame/drivers/goindol.c
index 802b654e119..25a04a39b79 100644
--- a/src/mame/drivers/goindol.c
+++ b/src/mame/drivers/goindol.c
@@ -143,7 +143,7 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
#define GOINDOL_INPUT_BITS \
- PORT_START_TAG("IN0")\
+ PORT_START("IN0")\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY\
@@ -152,7 +152,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )\
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )\
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)\
- PORT_START_TAG("IN1")\
+ PORT_START("IN1")\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL\
@@ -161,11 +161,11 @@ ADDRESS_MAP_END
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL\
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )\
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(1)\
- PORT_START_TAG("IN2") /* spinner */\
+ PORT_START("IN2") /* spinner */\
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(40) PORT_KEYDELTA(10)
#define GOINDOL_DSW1 \
- PORT_START_TAG("DSW1")\
+ PORT_START("DSW1")\
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Bonus_Life ) )\
PORT_DIPSETTING( 0x04, "30k and every 50k" )\
PORT_DIPSETTING( 0x05, "50k and every 100k" )\
@@ -194,7 +194,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( goindol )
GOINDOL_INPUT_BITS
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -223,7 +223,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( homo )
GOINDOL_INPUT_BITS
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c
index 9ac80d2131e..fe2cc67940f 100644
--- a/src/mame/drivers/goldstar.c
+++ b/src/mame/drivers/goldstar.c
@@ -91,7 +91,7 @@ static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( goldstar )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_CODE(KEYCODE_V) PORT_NAME("Bet Red/2")
@@ -101,7 +101,7 @@ static INPUT_PORTS_START( goldstar )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_CODE(KEYCODE_X) PORT_NAME("Stop 2/Big/Ticket")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_CODE(KEYCODE_N) PORT_NAME("Start/Stop All/4")
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -112,7 +112,7 @@ static INPUT_PORTS_START( goldstar )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_F1) PORT_NAME("Statistics")
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, "Game Style" )
PORT_DIPSETTING( 0x01, "Gettoni" )
PORT_DIPSETTING( 0x00, "Ticket" )
@@ -137,13 +137,13 @@ static INPUT_PORTS_START( goldstar )
PORT_DIPSETTING( 0x40, "32 Bet" )
PORT_DIPSETTING( 0x00, "50 Bet" )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x07, 0x00, "Main Game Pay Rate" )
PORT_DIPSETTING( 0x00, "75 %" )
PORT_DIPSETTING( 0x01, "70 %" )
@@ -168,7 +168,7 @@ static INPUT_PORTS_START( goldstar )
PORT_DIPSETTING( 0x80, "Unlimited" )
PORT_DIPSETTING( 0x00, "Limited" )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, "1 Coin/10 Credits" )
PORT_DIPSETTING( 0x04, "1 Coin/20 Credits" )
@@ -180,7 +180,7 @@ static INPUT_PORTS_START( goldstar )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_5C ) )
PORT_DIPSETTING( 0xc0, "1 Coin/10 Credits" )
- PORT_START_TAG("DSW4")
+ PORT_START("DSW4")
PORT_DIPNAME( 0x07, 0x06, "Credit Limited" )
PORT_DIPSETTING( 0x07, "5000" )
PORT_DIPSETTING( 0x06, "10000" )
@@ -206,10 +206,10 @@ static INPUT_PORTS_START( goldstar )
PORT_DIPSETTING( 0x80, "1 Ticket/100" )
PORT_DIPSETTING( 0x00, "Pay All" )
- PORT_START_TAG("DSW6")
+ PORT_START("DSW6")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW7") /* ??? */
+ PORT_START("DSW7") /* ??? */
PORT_BIT( 0xdf, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x20, 0x00, "Show Woman" )
PORT_DIPSETTING( 0x20, DEF_STR( No ) )
diff --git a/src/mame/drivers/gomoku.c b/src/mame/drivers/gomoku.c
index fc68da1167f..1085c7c6686 100644
--- a/src/mame/drivers/gomoku.c
+++ b/src/mame/drivers/gomoku.c
@@ -85,7 +85,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( gomoku )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
@@ -95,7 +95,7 @@ static INPUT_PORTS_START( gomoku )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -107,7 +107,7 @@ static INPUT_PORTS_START( gomoku )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN2 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_SERVICE( 0x01, IP_ACTIVE_HIGH )
PORT_DIPNAME( 0x06, 0x00, DEF_STR( Lives ))
PORT_DIPSETTING( 0x00, "2" )
@@ -128,19 +128,19 @@ static INPUT_PORTS_START( gomoku )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_4C ) )
- PORT_START_TAG("UNUSED0")
+ PORT_START("UNUSED0")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("UNUSED1")
+ PORT_START("UNUSED1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("UNUSED2")
+ PORT_START("UNUSED2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("UNUSED3")
+ PORT_START("UNUSED3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("UNUSED4")
+ PORT_START("UNUSED4")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/good.c b/src/mame/drivers/good.c
index c75b8e86f10..b953d48e9ec 100644
--- a/src/mame/drivers/good.c
+++ b/src/mame/drivers/good.c
@@ -100,7 +100,7 @@ static ADDRESS_MAP_START( good_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
static INPUT_PORTS_START( good )
- PORT_START
+ PORT_START("IN0")
PORT_DIPNAME( 0x0001, 0x0001, "0" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -150,7 +150,7 @@ static INPUT_PORTS_START( good )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN1")
PORT_DIPNAME( 0x0001, 0x0001, "1" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -200,7 +200,7 @@ static INPUT_PORTS_START( good )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN2")
PORT_DIPNAME( 0x0001, 0x0001, "2" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/goodejan.c b/src/mame/drivers/goodejan.c
index 415625622e0..e955363a82c 100644
--- a/src/mame/drivers/goodejan.c
+++ b/src/mame/drivers/goodejan.c
@@ -126,7 +126,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( goodejan )
SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */
- PORT_START_TAG("KEY0")
+ PORT_START("KEY0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
@@ -136,7 +136,7 @@ static INPUT_PORTS_START( goodejan )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
@@ -146,7 +146,7 @@ static INPUT_PORTS_START( goodejan )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
@@ -156,7 +156,7 @@ static INPUT_PORTS_START( goodejan )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
@@ -166,7 +166,7 @@ static INPUT_PORTS_START( goodejan )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY4")
+ PORT_START("KEY4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
@@ -176,7 +176,7 @@ static INPUT_PORTS_START( goodejan )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0001, 0x0001, "4" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/gotcha.c b/src/mame/drivers/gotcha.c
index ea81100a76f..91679ce496e 100644
--- a/src/mame/drivers/gotcha.c
+++ b/src/mame/drivers/gotcha.c
@@ -149,7 +149,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( gotcha )
- PORT_START
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -167,7 +167,7 @@ static INPUT_PORTS_START( gotcha )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -177,7 +177,7 @@ static INPUT_PORTS_START( gotcha )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0007, "1" )
PORT_DIPSETTING( 0x0006, "2" )
diff --git a/src/mame/drivers/gottlieb.c b/src/mame/drivers/gottlieb.c
index 1db7d1ee3f0..d0f43a77bc9 100644
--- a/src/mame/drivers/gottlieb.c
+++ b/src/mame/drivers/gottlieb.c
@@ -742,7 +742,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( reactor )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, "Sound with Logos" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -767,18 +767,18 @@ static INPUT_PORTS_START( reactor )
PORT_DIPSETTING( 0xc0, "15000" )
PORT_DIPSETTING( 0x80, "20000" )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Select in Service Mode") PORT_CODE(KEYCODE_F1)
PORT_SERVICE_DIPLOC( 0x02, IP_ACTIVE_LOW, "SB1:8" )
PORT_BIT ( 0xfc, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* trackball H */
+ PORT_START("IN2") /* trackball H */
PORT_BIT( 0xff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(15) PORT_KEYDELTA(20)
- PORT_START_TAG("IN3") /* trackball V */
+ PORT_START("IN3") /* trackball V */
PORT_BIT( 0xff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(15) PORT_KEYDELTA(20)
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT ( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT ( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 )
@@ -792,7 +792,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( qbert )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -819,7 +819,7 @@ static INPUT_PORTS_START( qbert )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
/* 0x40 must be connected to the IP16 line */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -829,13 +829,13 @@ static INPUT_PORTS_START( qbert )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Select in Service Mode") PORT_CODE(KEYCODE_F1)
- PORT_START_TAG("IN2") /* trackball H not used */
+ PORT_START("IN2") /* trackball H not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* trackball V not used */
+ PORT_START("IN3") /* trackball V not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN4") /* joystick */
+ PORT_START("IN4") /* joystick */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -850,7 +850,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( insector )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x00, "25000" )
PORT_DIPSETTING( 0x01, "30000" )
@@ -875,7 +875,7 @@ static INPUT_PORTS_START( insector )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -885,13 +885,13 @@ static INPUT_PORTS_START( insector )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* trackball H not used */
+ PORT_START("IN2") /* trackball H not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* trackball V not used */
+ PORT_START("IN3") /* trackball V not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -906,7 +906,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( tylz )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
@@ -930,7 +930,7 @@ static INPUT_PORTS_START( tylz )
PORT_DIPSETTING( 0x80, "Normal Hard" )
PORT_DIPSETTING( 0xc0, DEF_STR( Hard ) )
- PORT_START_TAG("IN1") /* ? */
+ PORT_START("IN1") /* ? */
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Select in Service Mode") PORT_CODE(KEYCODE_F1) // cycle through test options, hold to do test
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN2 )
@@ -948,13 +948,13 @@ static INPUT_PORTS_START( tylz )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2") /* trackball H not used */
+ PORT_START("IN2") /* trackball H not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* trackball V (dial) */
+ PORT_START("IN3") /* trackball V (dial) */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN4") /* ? */
+ PORT_START("IN4") /* ? */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -971,7 +971,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( argusg )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -995,7 +995,7 @@ static INPUT_PORTS_START( argusg )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Select in Service Mode") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -1005,24 +1005,24 @@ static INPUT_PORTS_START( argusg )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* trackball H */
+ PORT_START("IN2") /* trackball H */
PORT_BIT( 0xff, 0, IPT_SPECIAL ) PORT_CUSTOM(analog_delta_r, "0TRACKX")
- PORT_START_TAG("IN3") /* trackball V */
+ PORT_START("IN3") /* trackball V */
PORT_BIT( 0xff, 0, IPT_SPECIAL ) PORT_CUSTOM(analog_delta_r, "1TRACKY")
/* NOTE: Buttons are shared for both players; are mirrored to each side of the controller */
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("TRACKX")
+ PORT_START("TRACKX")
PORT_BIT( 0xff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(15) PORT_KEYDELTA(20)
- PORT_START_TAG("TRACKY")
+ PORT_START("TRACKY")
PORT_BIT( 0xff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(15) PORT_KEYDELTA(20)
PORT_INCLUDE(gottlieb1_sound)
@@ -1030,7 +1030,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mplanets )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1054,20 +1054,20 @@ static INPUT_PORTS_START( mplanets )
PORT_DIPSETTING( 0x80, DEF_STR( Hard ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Hardest ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x3c, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Select in Service Mode") PORT_CODE(KEYCODE_F1)
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN2") /* trackball H not used */
+ PORT_START("IN2") /* trackball H not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* trackball V (dial) */
+ PORT_START("IN3") /* trackball V (dial) */
PORT_BIT( 0xff, 0, IPT_SPECIAL ) PORT_CUSTOM(analog_delta_r, "1TRACKY")
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -1077,7 +1077,7 @@ static INPUT_PORTS_START( mplanets )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON2 )
- PORT_START_TAG("TRACKY")
+ PORT_START("TRACKY")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(5) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X)
PORT_INCLUDE(gottlieb1_sound)
@@ -1085,7 +1085,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( krull )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1109,7 +1109,7 @@ static INPUT_PORTS_START( krull )
PORT_DIPSETTING( 0x80, "40000 50000" )
PORT_DIPSETTING( 0xc0, "50000 75000" )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Select in Service Mode") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -1119,13 +1119,13 @@ static INPUT_PORTS_START( krull )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
- PORT_START_TAG("IN2") /* trackball H not used */
+ PORT_START("IN2") /* trackball H not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* trackball V not used */
+ PORT_START("IN3") /* trackball V not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_DOWN ) PORT_8WAY
@@ -1140,7 +1140,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( kngtmare )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x11, 0x11, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x11, DEF_STR( 1C_1C ) )
@@ -1165,7 +1165,7 @@ static INPUT_PORTS_START( kngtmare )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN1") /* ? */
+ PORT_START("IN1") /* ? */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -1175,13 +1175,13 @@ static INPUT_PORTS_START( kngtmare )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* trackball H not used */
+ PORT_START("IN2") /* trackball H not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* trackball V not used */
+ PORT_START("IN3") /* trackball V not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN4") /* ? */
+ PORT_START("IN4") /* ? */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_RIGHT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_LEFT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_LEFT ) PORT_2WAY
@@ -1196,7 +1196,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( qbertqub )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x08, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1227,7 +1227,7 @@ static INPUT_PORTS_START( qbertqub )
PORT_DIPSETTING( 0x00, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x80, DEF_STR( Hard ) )
- PORT_START_TAG("IN1") /* buttons */
+ PORT_START("IN1") /* buttons */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN2 )
@@ -1237,13 +1237,13 @@ static INPUT_PORTS_START( qbertqub )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Select in Service Mode") PORT_CODE(KEYCODE_F1)
- PORT_START_TAG("IN2") /* trackball H not used */
+ PORT_START("IN2") /* trackball H not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* trackball V not used */
+ PORT_START("IN3") /* trackball V not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN4") /* joystick */
+ PORT_START("IN4") /* joystick */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -1258,7 +1258,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( curvebal )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x08, 0x00, "2 Players Game" )
PORT_DIPSETTING( 0x08, "1 Credit" )
PORT_DIPSETTING( 0x00, "2 Credits" )
@@ -1293,7 +1293,7 @@ PORT_DIPSETTING( 0xc2, DEF_STR( Free_Play ) ) */
PORT_DIPSETTING( 0x00, "A 1/1 B 1/1" )
PORT_DIPSETTING( 0xc2, DEF_STR( Free_Play ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Select in Service Mode") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -1303,13 +1303,13 @@ PORT_DIPSETTING( 0xc2, DEF_STR( Free_Play ) ) */
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* trackball H not used */
+ PORT_START("IN2") /* trackball H not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* trackball V not used */
+ PORT_START("IN3") /* trackball V not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Swing") PORT_PLAYER(1)
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Pitch Left") PORT_PLAYER(2)
@@ -1324,7 +1324,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( screwloo )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1349,7 +1349,7 @@ static INPUT_PORTS_START( screwloo )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x80, "5" )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Select in Service Mode") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -1359,13 +1359,13 @@ static INPUT_PORTS_START( screwloo )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_DOWN ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_UP ) PORT_8WAY
- PORT_START_TAG("IN2") /* trackball H not used */
+ PORT_START("IN2") /* trackball H not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* trackball V not used */
+ PORT_START("IN3") /* trackball V not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_DOWN ) PORT_8WAY
@@ -1380,7 +1380,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mach3 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
/* TODO: values are different for 5 lives */
PORT_DIPNAME( 0x09, 0x08, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x09, DEF_STR( 4C_1C ) )
@@ -1405,7 +1405,7 @@ static INPUT_PORTS_START( mach3 )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Select in Service Mode") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -1415,13 +1415,13 @@ static INPUT_PORTS_START( mach3 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
- PORT_START_TAG("IN2") /* trackball H not used */
+ PORT_START("IN2") /* trackball H not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* trackball V not used */
+ PORT_START("IN3") /* trackball V not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -1436,7 +1436,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( usvsthem )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
/* TODO: values are different for 5 lives */
PORT_DIPNAME( 0x09, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x08, DEF_STR( 2C_1C ) )
@@ -1462,7 +1462,7 @@ static INPUT_PORTS_START( usvsthem )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Select in Service Mode") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -1472,13 +1472,13 @@ static INPUT_PORTS_START( usvsthem )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
- PORT_START_TAG("IN2") /* trackball H not used */
+ PORT_START("IN2") /* trackball H not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* trackball V not used */
+ PORT_START("IN3") /* trackball V not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -1493,7 +1493,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( 3stooges )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING ( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING ( 0x00, DEF_STR( On ) )
@@ -1518,7 +1518,7 @@ static INPUT_PORTS_START( 3stooges )
PORT_DIPSETTING ( 0x80, "10000" )
PORT_DIPSETTING ( 0x00, "20000" )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Select in Service Mode") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN2 )
@@ -1528,32 +1528,32 @@ static INPUT_PORTS_START( 3stooges )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* trackball H not used */
+ PORT_START("IN2") /* trackball H not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* trackball V not used */
+ PORT_START("IN3") /* trackball V not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN4") /* joystick inputs */
+ PORT_START("IN4") /* joystick inputs */
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(stooges_joystick_r, NULL)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("P1JOY")
+ PORT_START("P1JOY")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
- PORT_START_TAG("P2JOY")
+ PORT_START("P2JOY")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("P3JOY")
+ PORT_START("P3JOY")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
@@ -1564,7 +1564,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( vidvince )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x09, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x09, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 2C_1C ) )
@@ -1588,7 +1588,7 @@ static INPUT_PORTS_START( vidvince )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN1") /* ? */
+ PORT_START("IN1") /* ? */
PORT_SERVICE( 0x01, IP_ACTIVE_HIGH )
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Select in Service Mode") PORT_CODE(KEYCODE_F1) // cycle through test options, hold to do test
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN2 )
@@ -1598,13 +1598,13 @@ static INPUT_PORTS_START( vidvince )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* trackball H not used */
+ PORT_START("IN2") /* trackball H not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* trackball V not used */
+ PORT_START("IN3") /* trackball V not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN4") /* ? */
+ PORT_START("IN4") /* ? */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -1620,7 +1620,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( wizwarz )
/* TODO: Bonus Life and Bonus Mine values are dependent upon each other */
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x00, "20000, 30000" )
PORT_DIPSETTING( 0x01, "25000, 35000" )
@@ -1649,20 +1649,20 @@ static INPUT_PORTS_START( wizwarz )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Free_Play ) )
- PORT_START_TAG("IN1") /* ? */
+ PORT_START("IN1") /* ? */
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Select in Service Mode") PORT_CODE(KEYCODE_F1) // cycle through test options, hold to do test
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN2") /* trackball H not used */
+ PORT_START("IN2") /* trackball H not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* trackball V is a dial input */
+ PORT_START("IN3") /* trackball V is a dial input */
PORT_BIT( 0xff, 0, IPT_SPECIAL ) PORT_CUSTOM(analog_delta_r, "1TRACKY")
- PORT_START_TAG("IN4") /* ? */
+ PORT_START("IN4") /* ? */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
@@ -1672,7 +1672,7 @@ static INPUT_PORTS_START( wizwarz )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
- PORT_START_TAG("TRACKY")
+ PORT_START("TRACKY")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(15) PORT_KEYDELTA(15) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X)
PORT_INCLUDE(gottlieb2_sound)
diff --git a/src/mame/drivers/gotya.c b/src/mame/drivers/gotya.c
index 0952530f005..77da62c452a 100644
--- a/src/mame/drivers/gotya.c
+++ b/src/mame/drivers/gotya.c
@@ -77,7 +77,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( gotya )
- PORT_START /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -87,7 +87,7 @@ static INPUT_PORTS_START( gotya )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Scissors") PORT_PLAYER(1)
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Rock") PORT_PLAYER(1)
- PORT_START /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
@@ -99,7 +99,7 @@ static INPUT_PORTS_START( gotya )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P2 Scissors") PORT_PLAYER(2)
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P2 Rock") PORT_PLAYER(2)
- PORT_START /* DSW1 */
+ PORT_START("DSW") /* DSW1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c
index b6d0c4ff393..0dd89913c2c 100644
--- a/src/mame/drivers/gpworld.c
+++ b/src/mame/drivers/gpworld.c
@@ -293,7 +293,7 @@ ADDRESS_MAP_END
/* PORTS */
static INPUT_PORTS_START( gpworld )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -303,7 +303,7 @@ static INPUT_PORTS_START( gpworld )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) /* maybe? it's not listed in the test screen. */
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_SERVICE )
@@ -313,7 +313,7 @@ static INPUT_PORTS_START( gpworld )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("INWHEEL")
+ PORT_START("INWHEEL")
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME( "SLIGHT RIGHT" ) PORT_CODE( KEYCODE_Y )
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME( "MEDIUM RIGHT" ) PORT_CODE( KEYCODE_U )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME( "STRONG RIGHT" ) PORT_CODE( KEYCODE_I )
@@ -323,10 +323,10 @@ static INPUT_PORTS_START( gpworld )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME( "STRONG LEFT" ) PORT_CODE( KEYCODE_E )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME( "FIERCE LEFT" ) PORT_CODE( KEYCODE_W )
- PORT_START_TAG("INACCEL") /* both accelerator & brake right now :P */
+ PORT_START("INACCEL") /* both accelerator & brake right now :P */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x70, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 3C_1C ) )
@@ -362,7 +362,7 @@ static INPUT_PORTS_START( gpworld )
PORT_DIPSETTING( 0x0b, DEF_STR( 1C_5C ) )
PORT_DIPSETTING( 0x0a, DEF_STR( 1C_6C ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x10, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c
index c89eb43e0ed..ef75dfad8f8 100644
--- a/src/mame/drivers/gradius3.c
+++ b/src/mame/drivers/gradius3.c
@@ -216,7 +216,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( gradius3 )
- PORT_START /* COINS */
+ PORT_START("SYSTEM") /* COINS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -226,7 +226,7 @@ static INPUT_PORTS_START( gradius3 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* PLAYER 1 */
+ PORT_START("P1") /* PLAYER 1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -236,7 +236,7 @@ static INPUT_PORTS_START( gradius3 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) // missile
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* PLAYER 2 */
+ PORT_START("P2") /* PLAYER 2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -246,7 +246,7 @@ static INPUT_PORTS_START( gradius3 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -282,7 +282,7 @@ static INPUT_PORTS_START( gradius3 )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -305,7 +305,7 @@ static INPUT_PORTS_START( gradius3 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW3 */
+ PORT_START("DSW3") /* DSW3 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/grchamp.c b/src/mame/drivers/grchamp.c
index b687cdd1cf3..3a9df2a6ea6 100644
--- a/src/mame/drivers/grchamp.c
+++ b/src/mame/drivers/grchamp.c
@@ -583,7 +583,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( grchamp )
- PORT_START_TAG("TILT")
+ PORT_START("TILT")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) /* High Score reset switch */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_TOGGLE /* High Gear */
@@ -593,15 +593,15 @@ static INPUT_PORTS_START( grchamp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) /* Coin A */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) /* Coin B */
- PORT_START_TAG("ACCEL")
+ PORT_START("ACCEL")
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(16) PORT_CODE_INC(KEYCODE_LCONTROL)
//mask,default,type,sensitivity,delta,min,max
- PORT_START_TAG("WHEEL")
+ PORT_START("WHEEL")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(5) PORT_REVERSE
//mask,default,type,sensitivity,delta,min,max
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0f, DEF_STR( 9C_1C ) )
PORT_DIPSETTING( 0x0e, DEF_STR( 8C_1C ) )
@@ -637,7 +637,7 @@ static INPUT_PORTS_START( grchamp )
PORT_DIPSETTING( 0x60, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x70, DEF_STR( 1C_8C ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x03, 0x02, "Extra Race" )
PORT_DIPSETTING( 0x00, "4th" )
PORT_DIPSETTING( 0x02, "5th" )
diff --git a/src/mame/drivers/gridlee.c b/src/mame/drivers/gridlee.c
index 30f832fcb64..5d0226a70e1 100644
--- a/src/mame/drivers/gridlee.c
+++ b/src/mame/drivers/gridlee.c
@@ -336,24 +336,24 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( gridlee )
- PORT_START_TAG("TRACK0_Y") /* 9500 (fake) */
+ PORT_START("TRACK0_Y") /* 9500 (fake) */
PORT_BIT( 0xff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(8)
- PORT_START_TAG("TRACK0_X") /* 9501 (fake) */
+ PORT_START("TRACK0_X") /* 9501 (fake) */
PORT_BIT( 0xff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(8) PORT_REVERSE
- PORT_START_TAG("TRACK1_Y") /* 9500 (fake) */
+ PORT_START("TRACK1_Y") /* 9500 (fake) */
PORT_BIT( 0xff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(8) PORT_COCKTAIL
- PORT_START_TAG("TRACK1_X") /* 9501 (fake) */
+ PORT_START("TRACK1_X") /* 9501 (fake) */
PORT_BIT( 0xff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(8) PORT_REVERSE PORT_COCKTAIL
- PORT_START_TAG("IN0") /* 9502 */
+ PORT_START("IN0") /* 9502 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* 9503 */
+ PORT_START("IN1") /* 9503 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -364,7 +364,7 @@ static INPUT_PORTS_START( gridlee )
PORT_DIPSETTING( 0x10, DEF_STR( 1C_2C ))
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") /* 9600 */
+ PORT_START("DSW") /* 9600 */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Bonus_Life ))
PORT_DIPSETTING( 0x00, "8000 points" )
PORT_DIPSETTING( 0x01, "10000 points" )
@@ -388,7 +388,7 @@ static INPUT_PORTS_START( gridlee )
PORT_DIPSETTING( 0x00, DEF_STR( No ))
PORT_DIPSETTING( 0x80, DEF_STR( Yes ))
- PORT_START_TAG("IN2") /* 9700 */
+ PORT_START("IN2") /* 9700 */
PORT_BIT( 0x1f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE( 0x20, IP_ACTIVE_LOW )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
diff --git a/src/mame/drivers/groundfx.c b/src/mame/drivers/groundfx.c
index c47db8cef68..0331f01a537 100644
--- a/src/mame/drivers/groundfx.c
+++ b/src/mame/drivers/groundfx.c
@@ -298,10 +298,10 @@ ADDRESS_MAP_END
***********************************************************/
static INPUT_PORTS_START( groundfx )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* Frame counter */
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -319,7 +319,7 @@ static INPUT_PORTS_START( groundfx )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_SERVICE_NO_TOGGLE( 0x01, IP_ACTIVE_LOW )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -329,16 +329,16 @@ static INPUT_PORTS_START( groundfx )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN0") /* IN 2, steering wheel */
+ PORT_START("AN0") /* IN 2, steering wheel */
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("AN1") /* IN 3, accel */
+ PORT_START("AN1") /* IN 3, accel */
PORT_BIT( 0xff, 0xff, IPT_AD_STICK_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN2") /* IN 4, sound volume */
+ PORT_START("AN2") /* IN 4, sound volume */
PORT_BIT( 0xff, 0x00, IPT_AD_STICK_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("AN3") /* IN 5, unknown */
+ PORT_START("AN3") /* IN 5, unknown */
PORT_BIT( 0xff, 0x00, IPT_AD_STICK_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_PLAYER(2)
INPUT_PORTS_END
diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c
index 70c3e9375f5..70de2543668 100644
--- a/src/mame/drivers/gstream.c
+++ b/src/mame/drivers/gstream.c
@@ -247,7 +247,7 @@ static ADDRESS_MAP_START( gstream_io, ADDRESS_SPACE_IO, 32 )
ADDRESS_MAP_END
static INPUT_PORTS_START( gstream )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -263,8 +263,7 @@ static INPUT_PORTS_START( gstream )
PORT_BIT( 0x7000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE_NO_TOGGLE( 0x8000, IP_ACTIVE_LOW )
- PORT_START
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -280,9 +279,9 @@ static INPUT_PORTS_START( gstream )
PORT_BIT( 0x7000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(gstream_mirror_service_r, 0)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x004f, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(gstream_mirror_r, 0)
- PORT_BIT( 0xffb0, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0xffb0, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c
index 4f54f8a0b31..1afe2695969 100644
--- a/src/mame/drivers/gstriker.c
+++ b/src/mame/drivers/gstriker.c
@@ -369,7 +369,7 @@ ADDRESS_MAP_END
/*** INPUT PORTS *************************************************************/
static INPUT_PORTS_START( gstriker_generic )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -380,7 +380,7 @@ static INPUT_PORTS_START( gstriker_generic )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN) // vbl?
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -391,7 +391,7 @@ static INPUT_PORTS_START( gstriker_generic )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) // "Spare"
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -406,7 +406,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( gstriker )
PORT_INCLUDE( gstriker_generic )
- PORT_START /* IN3 */
+ PORT_START("DSW1") /* IN3 */
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 2C_1C ) )
@@ -431,7 +431,7 @@ static INPUT_PORTS_START( gstriker )
PORT_DIPSETTING( 0x0080, "2" )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_START /* IN4 */
+ PORT_START("DSW2") /* IN4 */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Hard ) )
@@ -458,7 +458,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( twrldc94 )
PORT_INCLUDE( gstriker_generic )
- PORT_START /* IN3 */
+ PORT_START("DSW1") /* IN3 */
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) )
@@ -486,7 +486,7 @@ static INPUT_PORTS_START( twrldc94 )
PORT_DIPSETTING( 0x0080, "P v CPU 2:30, P v P 3:00" )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_START /* IN4 */
+ PORT_START("DSW2") /* IN4 */
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Very_Hard ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Hard ) )
@@ -515,7 +515,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( vgoalsoc )
PORT_INCLUDE( gstriker_generic )
- PORT_START /* IN3 */
+ PORT_START("DSW1") /* IN3 */
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) )
@@ -543,7 +543,7 @@ static INPUT_PORTS_START( vgoalsoc )
PORT_DIPSETTING( 0x0000, "D" )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_START /* IN4 */
+ PORT_START("DSW2") /* IN4 */
PORT_DIPNAME( 0x0003, 0x0003, "Player VS CPU Time" ) // no coperative
PORT_DIPSETTING( 0x0002, "1:00" )
PORT_DIPSETTING( 0x0003, "1:30" )
diff --git a/src/mame/drivers/gsword.c b/src/mame/drivers/gsword.c
index f70102ba993..686eb25bdd1 100644
--- a/src/mame/drivers/gsword.c
+++ b/src/mame/drivers/gsword.c
@@ -443,7 +443,7 @@ static ADDRESS_MAP_START( josvolly_cpu2_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( gsword )
- PORT_START_TAG("IN0") /* IN0 (8741-2 port1?) */
+ PORT_START("IN0") /* IN0 (8741-2 port1?) */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -453,7 +453,7 @@ static INPUT_PORTS_START( gsword )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
- PORT_START_TAG("IN1") /* IN1 (8741-2 port2?) */
+ PORT_START("IN1") /* IN1 (8741-2 port2?) */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -463,7 +463,7 @@ static INPUT_PORTS_START( gsword )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
- PORT_START_TAG("IN2") /* IN2 (8741-3 port1?) */
+ PORT_START("IN2") /* IN2 (8741-3 port1?) */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -472,7 +472,7 @@ static INPUT_PORTS_START( gsword )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
- PORT_START_TAG("IN3") /* IN3 (8741-3 port2?) */
+ PORT_START("IN3") /* IN3 (8741-3 port2?) */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -482,7 +482,7 @@ static INPUT_PORTS_START( gsword )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
- PORT_START_TAG("IN4") /* IN4 (coins) */
+ PORT_START("IN4") /* IN4 (coins) */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -492,7 +492,7 @@ static INPUT_PORTS_START( gsword )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
/* NOTE: Switches 0 & 1, 6,7,8 not used */
/* Coins configurations were handled */
/* via external hardware & not via program */
@@ -505,7 +505,7 @@ static INPUT_PORTS_START( gsword )
PORT_DIPSETTING( 0x08, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0x0c, DEF_STR( 1C_5C ) )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -530,7 +530,7 @@ static INPUT_PORTS_START( gsword )
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x80, "255 (Cheat)" )
- PORT_START_TAG("DSW2") /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -557,7 +557,7 @@ static INPUT_PORTS_START( gsword )
INPUT_PORTS_END
static INPUT_PORTS_START( josvolly )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW , IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW , IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW , IPT_COIN2 ) PORT_IMPULSE(1)
@@ -567,7 +567,7 @@ static INPUT_PORTS_START( josvolly )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -577,7 +577,7 @@ static INPUT_PORTS_START( josvolly )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -587,7 +587,7 @@ static INPUT_PORTS_START( josvolly )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x0c, 0x00, "DIP1-0c(982E)" )
PORT_DIPSETTING( 0x0c, "0" )
PORT_DIPSETTING( 0x08, "1" )
@@ -605,7 +605,7 @@ static INPUT_PORTS_START( josvolly )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
// PORT_DIPNAME( 0x01, 0x00, "DSW2-0" )
// PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
// PORT_DIPSETTING( 0x01, DEF_STR( On ) )
diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c
index efe7ff3abb8..45b6967c7cb 100644
--- a/src/mame/drivers/gticlub.c
+++ b/src/mame/drivers/gticlub.c
@@ -703,7 +703,7 @@ static NVRAM_HANDLER(gticlub)
static INPUT_PORTS_START( gticlub )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) // View switch
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) // Shift Down
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) // Shift Up
@@ -711,13 +711,13 @@ static INPUT_PORTS_START( gticlub )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Service Button") PORT_CODE(KEYCODE_8)
PORT_BIT( 0x0b, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -734,37 +734,37 @@ static INPUT_PORTS_START( gticlub )
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("AN0") /* mask default type sens delta min max */
+ PORT_START("AN0") /* mask default type sens delta min max */
PORT_BIT( 0x3ff, 0x200, IPT_PADDLE ) PORT_MINMAX(0x000,0x3ff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0x3ff, 0x000, IPT_PEDAL ) PORT_MINMAX(0x000,0x3ff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 0x3ff, 0x000, IPT_PEDAL2 ) PORT_MINMAX(0x000,0x3ff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
- PORT_START_TAG("AN3")
+ PORT_START("AN3")
PORT_BIT( 0x3ff, 0x000, IPT_PEDAL3 ) PORT_MINMAX(0x000,0x3ff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
INPUT_PORTS_END
static INPUT_PORTS_START( slrasslt )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) // View Shift
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) // Trigger
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) // Missile
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) // Power Up
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Service Button") PORT_CODE(KEYCODE_8)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -782,21 +782,21 @@ static INPUT_PORTS_START( slrasslt )
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("AN0")
+ PORT_START("AN0")
PORT_BIT( 0x3ff, 0x000, IPT_AD_STICK_Y ) PORT_MINMAX(0x000,0x3ff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0x3ff, 0x000, IPT_AD_STICK_X ) PORT_MINMAX(0x000,0x3ff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5) PORT_REVERSE
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 0x3ff, 0x000, IPT_UNUSED )
- PORT_START_TAG("AN3")
+ PORT_START("AN3")
PORT_BIT( 0x3ff, 0x000, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( thunderh )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -806,7 +806,7 @@ static INPUT_PORTS_START( thunderh )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -816,10 +816,10 @@ static INPUT_PORTS_START( thunderh )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Service Button") PORT_CODE(KEYCODE_8)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -840,7 +840,7 @@ static INPUT_PORTS_START( thunderh )
INPUT_PORTS_END
static INPUT_PORTS_START( hangplt )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -848,15 +848,15 @@ static INPUT_PORTS_START( hangplt )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x07, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x8f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) // Push limit switch
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) // Pull limit switch
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Service Button") PORT_CODE(KEYCODE_8)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -874,16 +874,16 @@ static INPUT_PORTS_START( hangplt )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("AN0")
+ PORT_START("AN0")
PORT_BIT( 0x3ff, 0x000, IPT_UNKNOWN )
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0x3ff, 0x000, IPT_UNKNOWN )
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 0x3ff, 0x000, IPT_UNKNOWN )
- PORT_START_TAG("AN3")
+ PORT_START("AN3")
PORT_BIT( 0x3ff, 0x000, IPT_UNKNOWN )
INPUT_PORTS_END
diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c
index bb818940035..2a5d93a9f8d 100644
--- a/src/mame/drivers/guab.c
+++ b/src/mame/drivers/guab.c
@@ -662,7 +662,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( guab )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_NAME("50p")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_NAME("100p")
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Back door") PORT_CODE(KEYCODE_R) PORT_TOGGLE
@@ -672,7 +672,7 @@ static INPUT_PORTS_START( guab )
PORT_BIT( 0x40, IP_ACTIVE_HIGH,IPT_UNUSED ) PORT_NAME("100p level")
PORT_BIT( 0x80, IP_ACTIVE_HIGH,IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START )
@@ -682,7 +682,7 @@ static INPUT_PORTS_START( guab )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("A")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("B")
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Select")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -694,7 +694,7 @@ static INPUT_PORTS_START( guab )
INPUT_PORTS_END
static INPUT_PORTS_START( tenup )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_NAME("50p")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_NAME("100p")
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Back door") PORT_CODE(KEYCODE_R) PORT_TOGGLE
@@ -704,7 +704,7 @@ static INPUT_PORTS_START( tenup )
PORT_BIT( 0x40, IP_ACTIVE_HIGH,IPT_UNUSED ) PORT_NAME("100p level")
PORT_BIT( 0x80, IP_ACTIVE_HIGH,IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START )
@@ -714,7 +714,7 @@ static INPUT_PORTS_START( tenup )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Pass")
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Collect")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/gumbo.c b/src/mame/drivers/gumbo.c
index d63c3412017..0f5fac13d1c 100644
--- a/src/mame/drivers/gumbo.c
+++ b/src/mame/drivers/gumbo.c
@@ -109,7 +109,7 @@ static ADDRESS_MAP_START( dblpoint_writemem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
static INPUT_PORTS_START( gumbo )
- PORT_START /* DSW */
+ PORT_START("P1_P2") /* DSW */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) // "Rotate" - also IPT_START1
@@ -127,7 +127,7 @@ static INPUT_PORTS_START( gumbo )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START
+ PORT_START("DSW")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
@@ -152,7 +152,7 @@ static INPUT_PORTS_START( gumbo )
INPUT_PORTS_END
static INPUT_PORTS_START( msbingo )
- PORT_START /* DSW */
+ PORT_START("P1_P2") /* DSW */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
@@ -170,7 +170,7 @@ static INPUT_PORTS_START( msbingo )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START
+ PORT_START("DSW")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
@@ -195,7 +195,7 @@ static INPUT_PORTS_START( msbingo )
INPUT_PORTS_END
static INPUT_PORTS_START( mspuzzle )
- PORT_START /* DSW */
+ PORT_START("P1_P2") /* DSW */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
@@ -213,7 +213,7 @@ static INPUT_PORTS_START( mspuzzle )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START
+ PORT_START("DSW")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0300, 0x0200, "Time Mode" )
PORT_DIPSETTING( 0x0300, "0" )
@@ -238,7 +238,7 @@ static INPUT_PORTS_START( mspuzzle )
INPUT_PORTS_END
static INPUT_PORTS_START( dblpoint )
- PORT_START /* Inputs */
+ PORT_START("P1_P2") /* Inputs */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -256,7 +256,7 @@ static INPUT_PORTS_START( dblpoint )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/gunbustr.c b/src/mame/drivers/gunbustr.c
index 7d4293baaf9..4104b484f45 100644
--- a/src/mame/drivers/gunbustr.c
+++ b/src/mame/drivers/gunbustr.c
@@ -220,7 +220,7 @@ ADDRESS_MAP_END
***********************************************************/
static INPUT_PORTS_START( gunbustr )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -238,7 +238,7 @@ static INPUT_PORTS_START( gunbustr )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) /* Freeze input */
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -256,7 +256,7 @@ static INPUT_PORTS_START( gunbustr )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_SERVICE_NO_TOGGLE( 0x0001, IP_ACTIVE_LOW )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -276,16 +276,16 @@ static INPUT_PORTS_START( gunbustr )
/* Light gun inputs */
- PORT_START_TAG("LIGHT0_X") /* IN 3, P1X */
+ PORT_START("LIGHT0_X") /* IN 3, P1X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_PLAYER(1)
- PORT_START_TAG("LIGHT0_Y") /* IN 4, P1Y */
+ PORT_START("LIGHT0_Y") /* IN 4, P1Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("LIGHT1_X") /* IN 5, P2X */
+ PORT_START("LIGHT1_X") /* IN 5, P2X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_PLAYER(2)
- PORT_START_TAG("LIGHT1_Y") /* IN 6, P2Y */
+ PORT_START("LIGHT1_Y") /* IN 6, P2Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_REVERSE PORT_PLAYER(2)
INPUT_PORTS_END
diff --git a/src/mame/drivers/gundealr.c b/src/mame/drivers/gundealr.c
index e3e8d901069..d0fddfb98e5 100644
--- a/src/mame/drivers/gundealr.c
+++ b/src/mame/drivers/gundealr.c
@@ -182,7 +182,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( gundealr )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -207,7 +207,7 @@ static INPUT_PORTS_START( gundealr )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
@@ -232,7 +232,7 @@ static INPUT_PORTS_START( gundealr )
PORT_DIPSETTING( 0x80, "2" )
PORT_DIPSETTING( 0xc0, "3" )
- PORT_START_TAG("IN0") /* COIN */
+ PORT_START("IN0") /* COIN */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -242,7 +242,7 @@ static INPUT_PORTS_START( gundealr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* Player 2 controls */
+ PORT_START("IN1") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2)
@@ -252,7 +252,7 @@ static INPUT_PORTS_START( gundealr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("IN2") /* Player 1 controls */
+ PORT_START("IN2") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
@@ -264,7 +264,7 @@ static INPUT_PORTS_START( gundealr )
INPUT_PORTS_END
static INPUT_PORTS_START( gundealt )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -289,7 +289,7 @@ static INPUT_PORTS_START( gundealt )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
@@ -314,7 +314,7 @@ static INPUT_PORTS_START( gundealt )
PORT_DIPSETTING( 0x80, "2" )
PORT_DIPSETTING( 0xc0, "3" )
- PORT_START_TAG("IN0") /* Player 1 controls */
+ PORT_START("IN0") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
@@ -324,7 +324,7 @@ static INPUT_PORTS_START( gundealt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("IN1") /* Player 2 controls */
+ PORT_START("IN1") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2)
@@ -334,7 +334,7 @@ static INPUT_PORTS_START( gundealt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("IN2") /* COIN */
+ PORT_START("IN2") /* COIN */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -346,7 +346,7 @@ static INPUT_PORTS_START( gundealt )
INPUT_PORTS_END
static INPUT_PORTS_START( yamyam )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -370,7 +370,7 @@ static INPUT_PORTS_START( yamyam )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x07, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x06, DEF_STR( 4C_1C ) )
@@ -394,7 +394,7 @@ static INPUT_PORTS_START( yamyam )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN0") /* COIN */
+ PORT_START("IN0") /* COIN */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -404,7 +404,7 @@ static INPUT_PORTS_START( yamyam )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* Player 2 controls */
+ PORT_START("IN1") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2)
@@ -414,7 +414,7 @@ static INPUT_PORTS_START( yamyam )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("IN2") /* Player 1 controls */
+ PORT_START("IN2") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
diff --git a/src/mame/drivers/gunsmoke.c b/src/mame/drivers/gunsmoke.c
index 5ec536101ce..557eb487433 100644
--- a/src/mame/drivers/gunsmoke.c
+++ b/src/mame/drivers/gunsmoke.c
@@ -142,7 +142,7 @@ ADDRESS_MAP_END
/* Input Ports */
static INPUT_PORTS_START( gunsmoke )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -152,7 +152,7 @@ static INPUT_PORTS_START( gunsmoke )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -162,7 +162,7 @@ static INPUT_PORTS_START( gunsmoke )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -172,7 +172,7 @@ static INPUT_PORTS_START( gunsmoke )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x01, "30K 80K 80K+" )
PORT_DIPSETTING( 0x03, "30K 100K 100K+" )
@@ -194,7 +194,7 @@ static INPUT_PORTS_START( gunsmoke )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) // Also "debug mode"
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/gyruss.c b/src/mame/drivers/gyruss.c
index 1d5a2017ae8..d50db0ac4bd 100644
--- a/src/mame/drivers/gyruss.c
+++ b/src/mame/drivers/gyruss.c
@@ -207,14 +207,14 @@ ADDRESS_MAP_END
#define GYRUSS_COMMON\
- PORT_START_TAG("IN0")\
+ PORT_START("IN0")\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )\
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )\
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 )\
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )\
- PORT_START_TAG("IN1")\
+ PORT_START("IN1")\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_2WAY\
@@ -223,7 +223,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* 1p shoot 2 - unused */\
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* 2p shoot 3 - unused */\
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )\
- PORT_START_TAG("IN2")\
+ PORT_START("IN2")\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_2WAY PORT_COCKTAIL\
@@ -231,7 +231,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL\
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* 2p shoot 2 - unused */\
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )\
- PORT_START_TAG("DSW0")\
+ PORT_START("DSW0")\
PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_B ) )\
PORT_DIPSETTING( 0x20, DEF_STR( 4C_1C ) )\
PORT_DIPSETTING( 0x50, DEF_STR( 3C_1C ) )\
@@ -270,7 +270,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( gyruss )
GYRUSS_COMMON
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -295,7 +295,7 @@ static INPUT_PORTS_START( gyruss )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, "Demo Music" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -307,7 +307,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( gyrussce )
GYRUSS_COMMON
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -332,7 +332,7 @@ static INPUT_PORTS_START( gyrussce )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, "Demo Music" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/hal21.c b/src/mame/drivers/hal21.c
index 12e806ab5f9..6007dd25c92 100644
--- a/src/mame/drivers/hal21.c
+++ b/src/mame/drivers/hal21.c
@@ -349,7 +349,7 @@ static VIDEO_UPDATE( aso )
static INPUT_PORTS_START( hal21 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -359,7 +359,7 @@ static INPUT_PORTS_START( hal21 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* P1 controls */
+ PORT_START("IN1") /* P1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -368,7 +368,7 @@ static INPUT_PORTS_START( hal21 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* P2 controls */
+ PORT_START("IN2") /* P2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -377,7 +377,7 @@ static INPUT_PORTS_START( hal21 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -400,7 +400,7 @@ static INPUT_PORTS_START( hal21 )
PORT_DIPSETTING( 0x40, "50000 120000" )
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, "Bonus Type" )
PORT_DIPSETTING( 0x01, "Every Bonus Set" )
PORT_DIPSETTING( 0x00, "Second Bonus Set" )
@@ -428,7 +428,7 @@ INPUT_PORTS_END
/**************************************************************************/
static INPUT_PORTS_START( aso )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -438,7 +438,7 @@ static INPUT_PORTS_START( aso )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -448,7 +448,7 @@ static INPUT_PORTS_START( aso )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -458,7 +458,7 @@ static INPUT_PORTS_START( aso )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Allow_Continue ) )
PORT_DIPSETTING( 0x01, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
@@ -483,7 +483,7 @@ static INPUT_PORTS_START( aso )
PORT_DIPSETTING( 0x40, "100k 200k" )
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, "Bonus Occurrence" )
PORT_DIPSETTING( 0x01, "1st & every 2nd" )
PORT_DIPSETTING( 0x00, "1st & 2nd only" )
diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c
index 7a1a34f22bf..9f60a32e546 100644
--- a/src/mame/drivers/halleys.c
+++ b/src/mame/drivers/halleys.c
@@ -1689,7 +1689,7 @@ ADDRESS_MAP_END
*/
static INPUT_PORTS_START( halleys )
- PORT_START_TAG("DSW1") /* 0xff95 */
+ PORT_START("DSW1") /* 0xff95 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1713,7 +1713,7 @@ static INPUT_PORTS_START( halleys )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSW2") /* 0xff96 */
+ PORT_START("DSW2") /* 0xff96 */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easiest ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
@@ -1736,7 +1736,7 @@ static INPUT_PORTS_START( halleys )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* 0xff97 */
+ PORT_START("DSW3") /* 0xff97 */
PORT_DIPNAME( 0x01, 0x01, "Unknown(3-1)" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1762,7 +1762,7 @@ static INPUT_PORTS_START( halleys )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0") /* 0xff90 */
+ PORT_START("IN0") /* 0xff90 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1772,7 +1772,7 @@ static INPUT_PORTS_START( halleys )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("IN1") /* 0xff91 */
+ PORT_START("IN1") /* 0xff91 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -1782,7 +1782,7 @@ static INPUT_PORTS_START( halleys )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Hyperspace")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Fire")
- PORT_START_TAG("IN2") /* 0xff92 */
+ PORT_START("IN2") /* 0xff92 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -1792,9 +1792,9 @@ static INPUT_PORTS_START( halleys )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 Hyperspace")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 Fire")
- PORT_START_TAG("IN3") /* 0xff93 */
+ PORT_START("IN3") /* 0xff93 */
- PORT_START_TAG("FAKE") /* just to be safe */
+ PORT_START("FAKE") /* just to be safe */
PORT_DIPNAME( 0x01, 0x00, "Show Unused Layer" )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x01, DEF_STR( Yes ) )
@@ -1802,7 +1802,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( benberob )
- PORT_START_TAG("DSW1") /* 0xff95 */
+ PORT_START("DSW1") /* 0xff95 */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x02, "Every 100K" )
PORT_DIPSETTING( 0x00, "100K & Every 200K" )
@@ -1826,7 +1826,7 @@ static INPUT_PORTS_START( benberob )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2") /* 0xff96 */
+ PORT_START("DSW2") /* 0xff96 */
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0f, DEF_STR( 9C_1C ) )
PORT_DIPSETTING( 0x0e, DEF_STR( 8C_1C ) )
@@ -1862,7 +1862,7 @@ static INPUT_PORTS_START( benberob )
PORT_DIPSETTING( 0x60, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x70, DEF_STR( 1C_8C ) )
- PORT_START_TAG("DSW3") /* 0xff97 */
+ PORT_START("DSW3") /* 0xff97 */
PORT_DIPNAME( 0x01, 0x01, "Starting Round" )
PORT_DIPSETTING( 0x01, "1st Round" )
PORT_DIPSETTING( 0x00, "2nd Round" )
@@ -1887,7 +1887,7 @@ static INPUT_PORTS_START( benberob )
PORT_DIPSETTING( 0x80, "9" )
PORT_DIPSETTING( 0x00, "16" )
- PORT_START_TAG("IN0") /* 0xff90 */
+ PORT_START("IN0") /* 0xff90 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1897,7 +1897,7 @@ static INPUT_PORTS_START( benberob )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("IN1") /* 0xff91 */
+ PORT_START("IN1") /* 0xff91 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -1907,7 +1907,7 @@ static INPUT_PORTS_START( benberob )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Jump")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Extinguisher")
- PORT_START_TAG("IN2") /* 0xff92 */
+ PORT_START("IN2") /* 0xff92 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -1917,7 +1917,7 @@ static INPUT_PORTS_START( benberob )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 Jump")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 Extinguisher")
- PORT_START_TAG("IN3") /* 0xff93 */
+ PORT_START("IN3") /* 0xff93 */
INPUT_PORTS_END
diff --git a/src/mame/drivers/hanaawas.c b/src/mame/drivers/hanaawas.c
index 6c91f03140d..f2bf34f66ac 100644
--- a/src/mame/drivers/hanaawas.c
+++ b/src/mame/drivers/hanaawas.c
@@ -109,14 +109,14 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( hanaawas )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_SPECIAL )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
- PORT_START_TAG("DSW") /* DSW0 */
+ PORT_START("DSW") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -141,7 +141,7 @@ static INPUT_PORTS_START( hanaawas )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
/* fake port. The button depressed gets converted to an integer in the 1-10 range */
- PORT_START_TAG("P1") /* IN2 */
+ PORT_START("P1") /* IN2 */
PORT_BIT( 0x001, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x002, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x004, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -154,7 +154,7 @@ static INPUT_PORTS_START( hanaawas )
PORT_BIT( 0x200, IP_ACTIVE_HIGH, IPT_BUTTON10 ) PORT_PLAYER(1)
/* fake port. The button depressed gets converted to an integer in the 1-10 range */
- PORT_START_TAG("P2") /* IN3 */
+ PORT_START("P2") /* IN3 */
PORT_BIT( 0x001, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x002, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x004, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2)
@@ -166,7 +166,7 @@ static INPUT_PORTS_START( hanaawas )
PORT_BIT( 0x100, IP_ACTIVE_HIGH, IPT_BUTTON9 ) PORT_PLAYER(2)
PORT_BIT( 0x200, IP_ACTIVE_HIGH, IPT_BUTTON10 ) PORT_PLAYER(2)
- PORT_START_TAG("START") /* IN4 */
+ PORT_START("START") /* IN4 */
PORT_BIT( 0x001, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x002, IP_ACTIVE_HIGH, IPT_START2 )
INPUT_PORTS_END
diff --git a/src/mame/drivers/hanaroku.c b/src/mame/drivers/hanaroku.c
index 75a22852cb3..fddb1d5fde3 100644
--- a/src/mame/drivers/hanaroku.c
+++ b/src/mame/drivers/hanaroku.c
@@ -150,7 +150,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( hanaroku )
- PORT_START_TAG("IN0") // IN0 (0xe000)
+ PORT_START("IN0") // IN0 (0xe000)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) // adds n credits depending on "Coinage" Dip Switch
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) // adds 5 credits
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("1/2 D-Up") PORT_CODE(KEYCODE_H)
@@ -160,7 +160,7 @@ static INPUT_PORTS_START( hanaroku )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 ) PORT_NAME("Play")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Start")
- PORT_START_TAG("IN1") // IN1 (0xe001)
+ PORT_START("IN1") // IN1 (0xe001)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Card 1")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Card 2")
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Card 3")
@@ -170,7 +170,7 @@ static INPUT_PORTS_START( hanaroku )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME(DEF_STR( Yes )) PORT_CODE(KEYCODE_Y)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_NAME(DEF_STR( No )) PORT_CODE(KEYCODE_N)
- PORT_START_TAG("IN2") // IN2 (0xe002)
+ PORT_START("IN2") // IN2 (0xe002)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Data Clear") PORT_CODE(KEYCODE_D)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_NAME("Medal In") PORT_CODE(KEYCODE_I)
@@ -179,13 +179,13 @@ static INPUT_PORTS_START( hanaroku )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Ext In 2")
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1") // DSW1 (0xd000 - Port A)
+ PORT_START("DSW1") // DSW1 (0xd000 - Port A)
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW2") // DSW2 (0xd000 - Port B)
+ PORT_START("DSW2") // DSW2 (0xd000 - Port B)
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW3") // DSW3 (0xe004)
+ PORT_START("DSW3") // DSW3 (0xe004)
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) ) // Stored at 0xc028
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
diff --git a/src/mame/drivers/harddriv.c b/src/mame/drivers/harddriv.c
index 44c67db9780..62174035548 100644
--- a/src/mame/drivers/harddriv.c
+++ b/src/mame/drivers/harddriv.c
@@ -534,7 +534,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( harddriv )
- PORT_START_TAG("IN0") /* 600000 */
+ PORT_START("IN0") /* 600000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED ) /* diagnostic switch */
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SPECIAL ) /* HBLANK */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_VBLANK )
@@ -545,52 +545,52 @@ static INPUT_PORTS_START( harddriv )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNUSED ) /* option switches */
- PORT_START_TAG("a80000")
+ PORT_START("a80000")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START2 ) PORT_NAME("Abort") /* abort */
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Key") /* key */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 ) /* aux coin */
PORT_BIT( 0xfff8, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC0") /* b00000 - 8 bit ADC 0 - gas pedal */
+ PORT_START("8BADC0") /* b00000 - 8 bit ADC 0 - gas pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START_TAG("8BADC1") /* b00000 - 8 bit ADC 1 - clutch pedal */
+ PORT_START("8BADC1") /* b00000 - 8 bit ADC 1 - clutch pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL3 ) PORT_SENSITIVITY(25) PORT_KEYDELTA(100)
- PORT_START_TAG("8BADC2") /* b00000 - 8 bit ADC 2 - seat */
+ PORT_START("8BADC2") /* b00000 - 8 bit ADC 2 - seat */
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("8BADC3") /* b00000 - 8 bit ADC 3 - shifter lever Y */
+ PORT_START("8BADC3") /* b00000 - 8 bit ADC 3 - shifter lever Y */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(128) PORT_PLAYER(2)
- PORT_START_TAG("8BADC4") /* b00000 - 8 bit ADC 4 - shifter lever X*/
+ PORT_START("8BADC4") /* b00000 - 8 bit ADC 4 - shifter lever X*/
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(128) PORT_PLAYER(2)
- PORT_START_TAG("8BADC5") /* b00000 - 8 bit ADC 5 - wheel */
+ PORT_START("8BADC5") /* b00000 - 8 bit ADC 5 - wheel */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(5)
- PORT_START_TAG("8BADC6") /* b00000 - 8 bit ADC 6 - line volts */
+ PORT_START("8BADC6") /* b00000 - 8 bit ADC 6 - line volts */
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("8BADC7") /* b00000 - 8 bit ADC 7 - shift force */
+ PORT_START("8BADC7") /* b00000 - 8 bit ADC 7 - shift force */
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("12BADC0") /* b80000 - 12 bit ADC 0 - steering wheel */
+ PORT_START("12BADC0") /* b80000 - 12 bit ADC 0 - steering wheel */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(5)
- PORT_START_TAG("12BADC1") /* b80000 - 12 bit ADC 1 - force brake */
+ PORT_START("12BADC1") /* b80000 - 12 bit ADC 1 - force brake */
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(25) PORT_KEYDELTA(40) PORT_REVERSE
- PORT_START_TAG("12BADC2") /* b80000 - 12 bit ADC 2 */
+ PORT_START("12BADC2") /* b80000 - 12 bit ADC 2 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("12BADC3") /* b80000 - 12 bit ADC 3 */
+ PORT_START("12BADC3") /* b80000 - 12 bit ADC 3 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( racedriv )
- PORT_START_TAG("IN0") /* 600000 */
+ PORT_START("IN0") /* 600000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED ) /* diagnostic switch */
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SPECIAL ) /* HBLANK */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_VBLANK )
@@ -601,52 +601,52 @@ static INPUT_PORTS_START( racedriv )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNUSED ) /* option switches */
- PORT_START_TAG("a80000")
+ PORT_START("a80000")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START2 ) PORT_NAME("Abort") /* abort */
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Key") /* key */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 ) /* aux coin */
PORT_BIT( 0xfff8, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC0") /* b00000 - 8 bit ADC 0 - gas pedal */
+ PORT_START("8BADC0") /* b00000 - 8 bit ADC 0 - gas pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START_TAG("8BADC1") /* b00000 - 8 bit ADC 1 - clutch pedal */
+ PORT_START("8BADC1") /* b00000 - 8 bit ADC 1 - clutch pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL3 ) PORT_SENSITIVITY(25) PORT_KEYDELTA(100)
- PORT_START_TAG("8BADC2") /* b00000 - 8 bit ADC 2 - seat */
+ PORT_START("8BADC2") /* b00000 - 8 bit ADC 2 - seat */
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("8BADC3") /* b00000 - 8 bit ADC 3 - shifter lever Y */
+ PORT_START("8BADC3") /* b00000 - 8 bit ADC 3 - shifter lever Y */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(128) PORT_PLAYER(2)
- PORT_START_TAG("8BADC4") /* b00000 - 8 bit ADC 4 - shifter lever X*/
+ PORT_START("8BADC4") /* b00000 - 8 bit ADC 4 - shifter lever X*/
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(128) PORT_PLAYER(2)
- PORT_START_TAG("8BADC5") /* b00000 - 8 bit ADC 5 - wheel */
+ PORT_START("8BADC5") /* b00000 - 8 bit ADC 5 - wheel */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(5)
- PORT_START_TAG("8BADC6") /* b00000 - 8 bit ADC 6 - line volts */
+ PORT_START("8BADC6") /* b00000 - 8 bit ADC 6 - line volts */
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("8BADC7") /* b00000 - 8 bit ADC 7 */
+ PORT_START("8BADC7") /* b00000 - 8 bit ADC 7 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("12BADC0") /* b80000 - 12 bit ADC 0 - steering wheel */
+ PORT_START("12BADC0") /* b80000 - 12 bit ADC 0 - steering wheel */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(5)
- PORT_START_TAG("12BADC1") /* b80000 - 12 bit ADC 1 - force brake */
+ PORT_START("12BADC1") /* b80000 - 12 bit ADC 1 - force brake */
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(25) PORT_KEYDELTA(40) PORT_REVERSE
- PORT_START_TAG("12BADC2") /* b80000 - 12 bit ADC 2 */
+ PORT_START("12BADC2") /* b80000 - 12 bit ADC 2 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("12BADC3") /* b80000 - 12 bit ADC 3 */
+ PORT_START("12BADC3") /* b80000 - 12 bit ADC 3 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( racedrvc )
- PORT_START_TAG("IN0") /* 60c000 */
+ PORT_START("IN0") /* 60c000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED ) /* diagnostic switch */
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SPECIAL ) /* HBLANK */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_VBLANK )
@@ -657,7 +657,7 @@ static INPUT_PORTS_START( racedrvc )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNUSED ) /* option switches */
- PORT_START_TAG("a80000")
+ PORT_START("a80000")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START2 ) PORT_NAME("Abort")
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Key")
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 ) /* aux coin */
@@ -670,45 +670,45 @@ static INPUT_PORTS_START( racedrvc )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SPECIAL ) /* center edge on steering wheel */
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC0") /* b00000 - 8 bit ADC 0 - gas pedal */
+ PORT_START("8BADC0") /* b00000 - 8 bit ADC 0 - gas pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START_TAG("8BADC1") /* b00000 - 8 bit ADC 1 - clutch pedal */
+ PORT_START("8BADC1") /* b00000 - 8 bit ADC 1 - clutch pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL3 ) PORT_SENSITIVITY(25) PORT_KEYDELTA(100)
- PORT_START_TAG("8BADC2") /* b00000 - 8 bit ADC 2 */
+ PORT_START("8BADC2") /* b00000 - 8 bit ADC 2 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC3") /* b00000 - 8 bit ADC 3 */
+ PORT_START("8BADC3") /* b00000 - 8 bit ADC 3 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC4") /* b00000 - 8 bit ADC 4 */
+ PORT_START("8BADC4") /* b00000 - 8 bit ADC 4 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC5") /* b00000 - 8 bit ADC 5 */
+ PORT_START("8BADC5") /* b00000 - 8 bit ADC 5 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC6") /* b00000 - 8 bit ADC 6 - force brake */
+ PORT_START("8BADC6") /* b00000 - 8 bit ADC 6 - force brake */
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(25) PORT_KEYDELTA(40) PORT_REVERSE
- PORT_START_TAG("8BADC7") /* b00000 - 8 bit ADC 7 */
+ PORT_START("8BADC7") /* b00000 - 8 bit ADC 7 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("12BADC0") /* 400000 - steering wheel */
+ PORT_START("12BADC0") /* 400000 - steering wheel */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(5)
/* dummy ADC ports to end up with the same number as the full version */
- PORT_START_TAG("12BADC1")
+ PORT_START("12BADC1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("12BADC2")
+ PORT_START("12BADC2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("12BADC3")
+ PORT_START("12BADC3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( stunrun )
- PORT_START_TAG("IN0") /* 60c000 */
+ PORT_START("IN0") /* 60c000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SPECIAL ) /* HBLANK */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_VBLANK )
@@ -719,46 +719,46 @@ static INPUT_PORTS_START( stunrun )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Option switches */
- PORT_START_TAG("a80000")
+ PORT_START("a80000")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xfff8, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC0") /* b00000 - 8 bit ADC 0 */
+ PORT_START("8BADC0") /* b00000 - 8 bit ADC 0 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10)
- PORT_START_TAG("8BADC1") /* b00000 - 8 bit ADC 1 */
+ PORT_START("8BADC1") /* b00000 - 8 bit ADC 1 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC2") /* b00000 - 8 bit ADC 2 */
+ PORT_START("8BADC2") /* b00000 - 8 bit ADC 2 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10)
- PORT_START_TAG("8BADC3") /* b00000 - 8 bit ADC 3 */
+ PORT_START("8BADC3") /* b00000 - 8 bit ADC 3 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC4") /* b00000 - 8 bit ADC 4 */
+ PORT_START("8BADC4") /* b00000 - 8 bit ADC 4 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC5") /* b00000 - 8 bit ADC 5 */
+ PORT_START("8BADC5") /* b00000 - 8 bit ADC 5 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC6") /* b00000 - 8 bit ADC 6 */
+ PORT_START("8BADC6") /* b00000 - 8 bit ADC 6 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC7") /* b00000 - 8 bit ADC 7 */
+ PORT_START("8BADC7") /* b00000 - 8 bit ADC 7 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("12BADC0") /* b80000 - 12 bit ADC 0 */
+ PORT_START("12BADC0") /* b80000 - 12 bit ADC 0 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("12BADC1") /* b80000 - 12 bit ADC 1 */
+ PORT_START("12BADC1") /* b80000 - 12 bit ADC 1 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("12BADC2") /* b80000 - 12 bit ADC 2 */
+ PORT_START("12BADC2") /* b80000 - 12 bit ADC 2 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("12BADC3") /* b80000 - 12 bit ADC 3 */
+ PORT_START("12BADC3") /* b80000 - 12 bit ADC 3 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_INCLUDE( atarijsa_ii ) /* audio board port */
@@ -770,7 +770,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( steeltal )
- PORT_START_TAG("IN0") /* 60c000 */
+ PORT_START("IN0") /* 60c000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SPECIAL ) /* HBLANK */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_VBLANK )
@@ -781,47 +781,47 @@ static INPUT_PORTS_START( steeltal )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("a80000")
+ PORT_START("a80000")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Trigger")
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Thumb")
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Zoom")
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Real Helicopter Flight")
PORT_BIT( 0xfff0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC0") /* b00000 - 8 bit ADC 0 */
+ PORT_START("8BADC0") /* b00000 - 8 bit ADC 0 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC1") /* b00000 - 8 bit ADC 1 */
+ PORT_START("8BADC1") /* b00000 - 8 bit ADC 1 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) /* volume control */
- PORT_START_TAG("8BADC2") /* b00000 - 8 bit ADC 2 */
+ PORT_START("8BADC2") /* b00000 - 8 bit ADC 2 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC3") /* b00000 - 8 bit ADC 3 */
+ PORT_START("8BADC3") /* b00000 - 8 bit ADC 3 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC4") /* b00000 - 8 bit ADC 4 */
+ PORT_START("8BADC4") /* b00000 - 8 bit ADC 4 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC5") /* b00000 - 8 bit ADC 5 */
+ PORT_START("8BADC5") /* b00000 - 8 bit ADC 5 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC6") /* b00000 - 8 bit ADC 6 */
+ PORT_START("8BADC6") /* b00000 - 8 bit ADC 6 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC7") /* b00000 - 8 bit ADC 7 */
+ PORT_START("8BADC7") /* b00000 - 8 bit ADC 7 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("12BADC0") /* b80000 - 12 bit ADC 0 */
+ PORT_START("12BADC0") /* b80000 - 12 bit ADC 0 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) /* left/right */
- PORT_START_TAG("12BADC1") /* b80000 - 12 bit ADC 1 */
+ PORT_START("12BADC1") /* b80000 - 12 bit ADC 1 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) /* up/down */
- PORT_START_TAG("12BADC2") /* b80000 - 12 bit ADC 2 */
+ PORT_START("12BADC2") /* b80000 - 12 bit ADC 2 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2) /* collective */
- PORT_START_TAG("12BADC3") /* b80000 - 12 bit ADC 3 */
+ PORT_START("12BADC3") /* b80000 - 12 bit ADC 3 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(2) /* rudder */
PORT_INCLUDE( atarijsa_iii ) /* audio board port */
@@ -833,7 +833,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( strtdriv )
- PORT_START_TAG("IN0") /* 60c000 */
+ PORT_START("IN0") /* 60c000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SPECIAL ) /* HBLANK */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_VBLANK )
@@ -844,7 +844,7 @@ static INPUT_PORTS_START( strtdriv )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("a80000")
+ PORT_START("a80000")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START2 ) /* abort */
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START1 ) /* start */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 ) /* aux coin */
@@ -858,45 +858,45 @@ static INPUT_PORTS_START( strtdriv )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SPECIAL ) /* center edge on steering wheel */
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC0") /* b00000 - 8 bit ADC 0 - gas pedal */
+ PORT_START("8BADC0") /* b00000 - 8 bit ADC 0 - gas pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START_TAG("8BADC1") /* b00000 - 8 bit ADC 1 */
+ PORT_START("8BADC1") /* b00000 - 8 bit ADC 1 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC2") /* b00000 - 8 bit ADC 2 - voice mic */
+ PORT_START("8BADC2") /* b00000 - 8 bit ADC 2 - voice mic */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC3") /* b00000 - 8 bit ADC 3 - volume */
+ PORT_START("8BADC3") /* b00000 - 8 bit ADC 3 - volume */
PORT_BIT( 0xff, 0X80, IPT_UNUSED )
- PORT_START_TAG("8BADC4") /* b00000 - 8 bit ADC 4 - elevator */
+ PORT_START("8BADC4") /* b00000 - 8 bit ADC 4 - elevator */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_REVERSE /* up/down */
- PORT_START_TAG("8BADC5") /* b00000 - 8 bit ADC 5 - canopy */
+ PORT_START("8BADC5") /* b00000 - 8 bit ADC 5 - canopy */
PORT_BIT( 0xff, 0X80, IPT_UNUSED )
- PORT_START_TAG("8BADC6") /* b00000 - 8 bit ADC 6 - brake */
+ PORT_START("8BADC6") /* b00000 - 8 bit ADC 6 - brake */
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(25) PORT_KEYDELTA(40) PORT_REVERSE
- PORT_START_TAG("8BADC7") /* b00000 - 8 bit ADC 7 - seat adjust */
+ PORT_START("8BADC7") /* b00000 - 8 bit ADC 7 - seat adjust */
PORT_BIT( 0xff, 0X80, IPT_UNUSED )
- PORT_START_TAG("12BADC0") /* 400000 - steering wheel */
+ PORT_START("12BADC0") /* 400000 - steering wheel */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(5)
/* dummy ADC ports to end up with the same number as the full version */
- PORT_START_TAG("12BADC1") /* FAKE */
+ PORT_START("12BADC1") /* FAKE */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("12BADC2") /* FAKE */
+ PORT_START("12BADC2") /* FAKE */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("12BADC3") /* FAKE */
+ PORT_START("12BADC3") /* FAKE */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( hdrivair )
- PORT_START_TAG("IN0") /* 60c000 */
+ PORT_START("IN0") /* 60c000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SPECIAL ) /* HBLANK */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_VBLANK )
@@ -907,7 +907,7 @@ static INPUT_PORTS_START( hdrivair )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("a80000")
+ PORT_START("a80000")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START2 ) /* abort */
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START1 ) /* start */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 ) /* aux coin */
@@ -921,39 +921,39 @@ static INPUT_PORTS_START( hdrivair )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SPECIAL ) /* center edge on steering wheel */
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC0") /* b00000 - 8 bit ADC 0 - gas pedal */
+ PORT_START("8BADC0") /* b00000 - 8 bit ADC 0 - gas pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(20) PORT_PLAYER(1)
- PORT_START_TAG("8BADC1") /* b00000 - 8 bit ADC 1 */
+ PORT_START("8BADC1") /* b00000 - 8 bit ADC 1 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC2") /* b00000 - 8 bit ADC 2 - voice mic */
+ PORT_START("8BADC2") /* b00000 - 8 bit ADC 2 - voice mic */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8BADC3") /* b00000 - 8 bit ADC 3 - volume */
+ PORT_START("8BADC3") /* b00000 - 8 bit ADC 3 - volume */
PORT_BIT( 0xff, 0X80, IPT_UNUSED )
- PORT_START_TAG("8BADC4") /* b00000 - 8 bit ADC 4 - elevator */
+ PORT_START("8BADC4") /* b00000 - 8 bit ADC 4 - elevator */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_REVERSE /* up/down */
- PORT_START_TAG("8BADC5") /* b00000 - 8 bit ADC 5 - canopy */
+ PORT_START("8BADC5") /* b00000 - 8 bit ADC 5 - canopy */
PORT_BIT( 0xff, 0X80, IPT_UNUSED )
- PORT_START_TAG("8BADC6") /* b00000 - 8 bit ADC 6 - brake */
+ PORT_START("8BADC6") /* b00000 - 8 bit ADC 6 - brake */
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(25) PORT_KEYDELTA(40) PORT_REVERSE
- PORT_START_TAG("8BADC7") /* b00000 - 8 bit ADC 7 - seat adjust */
+ PORT_START("8BADC7") /* b00000 - 8 bit ADC 7 - seat adjust */
PORT_BIT( 0xff, 0X80, IPT_UNUSED )
- PORT_START_TAG("12BADC0") /* 400000 - steering wheel */
+ PORT_START("12BADC0") /* 400000 - steering wheel */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(5) PORT_REVERSE
/* dummy ADC ports to end up with the same number as the full version */
- PORT_START_TAG("12BADC1")
+ PORT_START("12BADC1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("12BADC2")
+ PORT_START("12BADC2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("12BADC3")
+ PORT_START("12BADC3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c
index 4fa8e4ec903..940682438c4 100644
--- a/src/mame/drivers/hcastle.c
+++ b/src/mame/drivers/hcastle.c
@@ -117,7 +117,7 @@ ADDRESS_MAP_END
/*****************************************************************************/
static INPUT_PORTS_START( hcastle )
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -127,7 +127,7 @@ static INPUT_PORTS_START( hcastle )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -137,7 +137,7 @@ static INPUT_PORTS_START( hcastle )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -147,7 +147,7 @@ static INPUT_PORTS_START( hcastle )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "Unused SW 1-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -171,7 +171,7 @@ static INPUT_PORTS_START( hcastle )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -207,7 +207,7 @@ static INPUT_PORTS_START( hcastle )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Invalidity" ) // Disables the 2 coin slots
- PORT_START
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/hexa.c b/src/mame/drivers/hexa.c
index 857254a0a2a..7e91fa5f663 100644
--- a/src/mame/drivers/hexa.c
+++ b/src/mame/drivers/hexa.c
@@ -65,7 +65,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( hexa )
- PORT_START /* IN0 */
+ PORT_START("INPUTS") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
@@ -75,7 +75,7 @@ static INPUT_PORTS_START( hexa )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_START /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
diff --git a/src/mame/drivers/hexion.c b/src/mame/drivers/hexion.c
index ab38142e2ca..0c83eacb0f1 100644
--- a/src/mame/drivers/hexion.c
+++ b/src/mame/drivers/hexion.c
@@ -145,7 +145,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( hexion )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -181,7 +181,7 @@ static INPUT_PORTS_START( hexion )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -207,7 +207,7 @@ static INPUT_PORTS_START( hexion )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -220,7 +220,7 @@ static INPUT_PORTS_START( hexion )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -230,7 +230,7 @@ static INPUT_PORTS_START( hexion )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -240,7 +240,7 @@ static INPUT_PORTS_START( hexion )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
diff --git a/src/mame/drivers/higemaru.c b/src/mame/drivers/higemaru.c
index 27afda8a00e..2b34187622d 100644
--- a/src/mame/drivers/higemaru.c
+++ b/src/mame/drivers/higemaru.c
@@ -55,7 +55,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( higemaru )
- PORT_START /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
@@ -65,7 +65,7 @@ static INPUT_PORTS_START( higemaru )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
@@ -75,7 +75,7 @@ static INPUT_PORTS_START( higemaru )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN2 */
+ PORT_START("SYSTEM") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_DIPNAME( 0x04, 0x04, "Freeze" ) /* could be Tilt? */
@@ -87,7 +87,7 @@ static INPUT_PORTS_START( higemaru )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START /* DSW0 */
+ PORT_START("DSW1") /* DSW0 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x01, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
@@ -112,7 +112,7 @@ static INPUT_PORTS_START( higemaru )
PORT_DIPSETTING( 0xc0, "3" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_START /* DSW1 */
+ PORT_START("DSW2") /* DSW1 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
diff --git a/src/mame/drivers/hikaru.c b/src/mame/drivers/hikaru.c
index a4cf0633db1..a0fd57a35dd 100644
--- a/src/mame/drivers/hikaru.c
+++ b/src/mame/drivers/hikaru.c
@@ -272,7 +272,7 @@ VIDEO_UPDATE(hikaru)
}
static INPUT_PORTS_START( hikaru )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
INPUT_PORTS_END
static ADDRESS_MAP_START( hikaru_map, ADDRESS_SPACE_PROGRAM, 64 )
diff --git a/src/mame/drivers/hitme.c b/src/mame/drivers/hitme.c
index 4a86bd452bc..24fdadbd1e8 100644
--- a/src/mame/drivers/hitme.c
+++ b/src/mame/drivers/hitme.c
@@ -358,7 +358,7 @@ MACHINE_DRIVER_END
*************************************/
static INPUT_PORTS_START( hitme )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) /* Start button */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) /* Always high */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) /* Hblank */
@@ -368,7 +368,7 @@ static INPUT_PORTS_START( hitme )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) /* P1 Bet button */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) /* Time out counter (*TO) */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) /* Always high */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) /* Aux 2 dipswitch - Unused */
@@ -378,7 +378,7 @@ static INPUT_PORTS_START( hitme )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) /* P2 Bet button */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) /* Time out counter (*TO) */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x01, 0x00, "Extra Hand On Natural" ) /* Aux 1 dipswitch */
PORT_DIPSETTING( 0x00, DEF_STR ( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR ( On ) )
@@ -390,7 +390,7 @@ static INPUT_PORTS_START( hitme )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3) /* P3 Bet button */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) /* Time out counter (*TO) */
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Time out counter (TOC1) */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) /* Always high */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) /* Aux 2 dipswitch - Unused*/
@@ -400,7 +400,7 @@ static INPUT_PORTS_START( hitme )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4) /* P4 Bet button */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) /* Time out counter (*TO) */
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_DIPNAME( 0x07, 0x07, "Number of Chips" )
PORT_DIPSETTING( 0x00, "5 Chips" )
PORT_DIPSETTING( 0x01, "10 Chips" )
@@ -412,7 +412,7 @@ static INPUT_PORTS_START( hitme )
PORT_DIPSETTING( 0x07, "40 Chips" )
PORT_BIT( 0xf8, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN5")
+ PORT_START("IN5")
PORT_DIPNAME( 0x07, 0x00, "Number of Hands" )
PORT_DIPSETTING( 0x00, "5 Hands" )
PORT_DIPSETTING( 0x01, "10 Hands" )
@@ -425,17 +425,17 @@ static INPUT_PORTS_START( hitme )
PORT_BIT( 0xf8, IP_ACTIVE_HIGH, IPT_UNUSED )
/* this is actually a variable resistor */
- PORT_START_TAG("R3")
+ PORT_START("R3")
PORT_ADJUSTER(30, "Game Speed")
/* this is actually a variable resistor */
- PORT_START_TAG("WIDTH")
+ PORT_START("WIDTH")
PORT_ADJUSTER(50, "Card Width")
INPUT_PORTS_END
static INPUT_PORTS_START( barricad )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) /* Start button */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) /* Always high */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) /* Hblank */
@@ -445,7 +445,7 @@ static INPUT_PORTS_START( barricad )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) /* Time out counter (*TO) */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) /* Always high */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) /* Aux 2 dipswitch - Unused */
@@ -455,7 +455,7 @@ static INPUT_PORTS_START( barricad )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) /* Time out counter (*TO) */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* ??? */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) /* Always high */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) /* Hblank */
@@ -465,7 +465,7 @@ static INPUT_PORTS_START( barricad )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) /* Time out counter (*TO) */
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Time out counter (TOC1) */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Always high */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Aux 2 dipswitch - Unused*/
@@ -480,7 +480,7 @@ static INPUT_PORTS_START( barricad )
same dipswitch as hitme's chips, and speed is hitme's hands. The flyer
says 1-7 points per games, but it really can go to 8. */
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_DIPNAME( 0x07, 0x07, "Points Per Game" )
PORT_DIPSETTING( 0x00, "1 Point" )
PORT_DIPSETTING( 0x01, "2 Points" )
@@ -494,7 +494,7 @@ static INPUT_PORTS_START( barricad )
/* These are like lives, you lose a point if you crash. The last person with
points wins the game. */
- PORT_START_TAG("IN5")
+ PORT_START("IN5")
PORT_DIPNAME( 0x07, 0x00, "Game Speed" )
PORT_DIPSETTING( 0x00, "Fast Fast" )
PORT_DIPSETTING( 0x01, "7" )
@@ -506,7 +506,7 @@ static INPUT_PORTS_START( barricad )
PORT_DIPSETTING( 0x07, "Slow Slow" )
/* this is actually a variable resistor */
- PORT_START_TAG("R3")
+ PORT_START("R3")
PORT_ADJUSTER(30, "Tone")
INPUT_PORTS_END
diff --git a/src/mame/drivers/hnayayoi.c b/src/mame/drivers/hnayayoi.c
index 27755716870..30a8f9a2024 100644
--- a/src/mame/drivers/hnayayoi.c
+++ b/src/mame/drivers/hnayayoi.c
@@ -222,7 +222,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mj_keyboard )
- PORT_START_TAG("KEY0")
+ PORT_START("KEY0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
@@ -231,7 +231,7 @@ static INPUT_PORTS_START( mj_keyboard )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
@@ -240,7 +240,7 @@ static INPUT_PORTS_START( mj_keyboard )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
@@ -248,14 +248,14 @@ static INPUT_PORTS_START( mj_keyboard )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY4")
+ PORT_START("KEY4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
@@ -267,7 +267,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( hnayayoi )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -293,7 +293,7 @@ static INPUT_PORTS_START( hnayayoi )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -319,7 +319,7 @@ static INPUT_PORTS_START( hnayayoi )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* DSW3 */
+ PORT_START("DSW3") /* DSW3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) // blitter busy flag
PORT_SERVICE( 0x02, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
@@ -341,7 +341,7 @@ static INPUT_PORTS_START( hnayayoi )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("COIN") /* COIN */
+ PORT_START("COIN") /* COIN */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) /* Test */
@@ -355,7 +355,7 @@ static INPUT_PORTS_START( hnayayoi )
INPUT_PORTS_END
static INPUT_PORTS_START( hnfubuki )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -381,7 +381,7 @@ static INPUT_PORTS_START( hnfubuki )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -407,7 +407,7 @@ static INPUT_PORTS_START( hnfubuki )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* DSW3 */
+ PORT_START("DSW3") /* DSW3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) // blitter busy flag
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -431,7 +431,7 @@ static INPUT_PORTS_START( hnfubuki )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("COIN") /* COIN */
+ PORT_START("COIN") /* COIN */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) /* Test */
@@ -446,7 +446,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( untoucha )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -472,7 +472,7 @@ static INPUT_PORTS_START( untoucha )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -498,7 +498,7 @@ static INPUT_PORTS_START( untoucha )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("COIN") /* COIN */
+ PORT_START("COIN") /* COIN */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) /* Test */
@@ -508,7 +508,7 @@ static INPUT_PORTS_START( untoucha )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("KEY0") /* P1 keyboard */
+ PORT_START("KEY0") /* P1 keyboard */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Hold 1") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Hold 3") PORT_CODE(KEYCODE_C)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Hold 5") PORT_CODE(KEYCODE_B)
@@ -517,7 +517,7 @@ static INPUT_PORTS_START( untoucha )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -526,7 +526,7 @@ static INPUT_PORTS_START( untoucha )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Take Score") PORT_CODE(KEYCODE_RCONTROL)
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Hold 2") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Hold 4") PORT_CODE(KEYCODE_V)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -535,7 +535,7 @@ static INPUT_PORTS_START( untoucha )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Deal") PORT_CODE(KEYCODE_1)
@@ -544,7 +544,7 @@ static INPUT_PORTS_START( untoucha )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY4")
+ PORT_START("KEY4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Double Up") PORT_CODE(KEYCODE_RSHIFT)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c
index 1315cc5a736..451f507d877 100644
--- a/src/mame/drivers/hng64.c
+++ b/src/mame/drivers/hng64.c
@@ -1247,7 +1247,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( hng64 )
- PORT_START_TAG("IPT_TEST")
+ PORT_START("IPT_TEST")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -1265,9 +1265,9 @@ static INPUT_PORTS_START( hng64 )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IPT_NONE")
+ PORT_START("IPT_NONE")
- PORT_START_TAG("FATFURWA_TST_ETC")
+ PORT_START("FATFURWA_TST_ETC")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_COIN1)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_COIN2)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_UNKNOWN)
@@ -1287,7 +1287,7 @@ static INPUT_PORTS_START( hng64 )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x8000, DEF_STR( On ) )
- PORT_START_TAG("FATFURWA_PLR_1")
+ PORT_START("FATFURWA_PLR_1")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT) PORT_PLAYER(1)
@@ -1305,7 +1305,7 @@ static INPUT_PORTS_START( hng64 )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_START1)
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN)
- PORT_START_TAG("FATFURWA_PLR_2")
+ PORT_START("FATFURWA_PLR_2")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT) PORT_PLAYER(2)
diff --git a/src/mame/drivers/holeland.c b/src/mame/drivers/holeland.c
index 490695173ed..93d116bf11f 100644
--- a/src/mame/drivers/holeland.c
+++ b/src/mame/drivers/holeland.c
@@ -78,7 +78,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( holeland )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -88,7 +88,7 @@ static INPUT_PORTS_START( holeland )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -98,7 +98,7 @@ static INPUT_PORTS_START( holeland )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_SERVICE( 0x01, IP_ACTIVE_HIGH )
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -122,7 +122,7 @@ static INPUT_PORTS_START( holeland )
PORT_DIPSETTING( 0x80, "A" )
PORT_DIPSETTING( 0x00, "B" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x00, "Coin Case" )
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x01, "2" )
@@ -147,7 +147,7 @@ static INPUT_PORTS_START( holeland )
INPUT_PORTS_END
static INPUT_PORTS_START( crzrally )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -157,7 +157,7 @@ static INPUT_PORTS_START( crzrally )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -167,7 +167,7 @@ static INPUT_PORTS_START( crzrally )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -189,7 +189,7 @@ static INPUT_PORTS_START( crzrally )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c
index 7a79fbf37c0..ecccf41d995 100644
--- a/src/mame/drivers/homedata.c
+++ b/src/mame/drivers/homedata.c
@@ -723,7 +723,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mjhokite )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -748,7 +748,7 @@ static INPUT_PORTS_START( mjhokite )
PORT_DIPSETTING( 0x20, "7" )
PORT_DIPSETTING( 0x00, "8 (hardest)" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -774,7 +774,7 @@ static INPUT_PORTS_START( mjhokite )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_DIPNAME( 0x02, 0x02, "Freeze?" )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -786,7 +786,7 @@ static INPUT_PORTS_START( mjhokite )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY0")
+ PORT_START("KEY0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
@@ -794,7 +794,7 @@ static INPUT_PORTS_START( mjhokite )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
@@ -802,7 +802,7 @@ static INPUT_PORTS_START( mjhokite )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
@@ -810,7 +810,7 @@ static INPUT_PORTS_START( mjhokite )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
@@ -818,7 +818,7 @@ static INPUT_PORTS_START( mjhokite )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY4")
+ PORT_START("KEY4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -828,7 +828,7 @@ static INPUT_PORTS_START( mjhokite )
INPUT_PORTS_END
static INPUT_PORTS_START( reikaids )
- PORT_START_TAG("IN0") // IN0 - 0x7801
+ PORT_START("IN0") // IN0 - 0x7801
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
@@ -838,7 +838,7 @@ static INPUT_PORTS_START( reikaids )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) /* jump */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1") // IN1 - 0x7802
+ PORT_START("IN1") // IN1 - 0x7802
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
@@ -848,7 +848,7 @@ static INPUT_PORTS_START( reikaids )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) /* jump */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN2") // IN2 - 0x7803
+ PORT_START("IN2") // IN2 - 0x7803
PORT_BIT( 0x01, IP_ACTIVE_HIGH,IPT_SPECIAL ) /* coprocessor status */
PORT_BIT( 0x02, IP_ACTIVE_HIGH,IPT_SPECIAL ) /* coprocessor data */
PORT_BIT( 0x04, IP_ACTIVE_HIGH,IPT_SPECIAL ) /* vblank */
@@ -858,7 +858,7 @@ static INPUT_PORTS_START( reikaids )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") // DSW1
+ PORT_START("DSW1") // DSW1
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Allow_Continue ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -882,7 +882,7 @@ static INPUT_PORTS_START( reikaids )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") // DSW2
+ PORT_START("DSW2") // DSW2
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -955,7 +955,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mj_keyboard )
- PORT_START_TAG("KEY0")
+ PORT_START("KEY0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_C )
@@ -964,7 +964,7 @@ static INPUT_PORTS_START( mj_keyboard )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* dip switch (handled separately) */
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_G )
@@ -973,7 +973,7 @@ static INPUT_PORTS_START( mj_keyboard )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* dip switch (handled separately) */
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_I )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_J )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
@@ -982,7 +982,7 @@ static INPUT_PORTS_START( mj_keyboard )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* dip switch (handled separately) */
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_M )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_N )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
@@ -991,7 +991,7 @@ static INPUT_PORTS_START( mj_keyboard )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* dip switch (handled separately) */
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY4")
+ PORT_START("KEY4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
@@ -1000,7 +1000,7 @@ static INPUT_PORTS_START( mj_keyboard )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* dip switch (handled separately) */
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY5")
+ PORT_START("KEY5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1011,7 +1011,7 @@ static INPUT_PORTS_START( mj_keyboard )
INPUT_PORTS_END
static INPUT_PORTS_START( pteacher )
- PORT_START_TAG("DSW") /* dip switches (handled by pteacher_keyboard_r) */
+ PORT_START("DSW") /* dip switches (handled by pteacher_keyboard_r) */
PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1048,7 +1048,7 @@ static INPUT_PORTS_START( pteacher )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1057,7 +1057,7 @@ static INPUT_PORTS_START( pteacher )
INPUT_PORTS_END
static INPUT_PORTS_START( jogakuen )
- PORT_START_TAG("DSW") /* dip switches (handled by pteacher_keyboard_r) */
+ PORT_START("DSW") /* dip switches (handled by pteacher_keyboard_r) */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1094,7 +1094,7 @@ static INPUT_PORTS_START( jogakuen )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1103,7 +1103,7 @@ static INPUT_PORTS_START( jogakuen )
INPUT_PORTS_END
static INPUT_PORTS_START( mjikaga )
- PORT_START_TAG("DSW") /* dip switches (handled by pteacher_keyboard_r) */
+ PORT_START("DSW") /* dip switches (handled by pteacher_keyboard_r) */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1140,7 +1140,7 @@ static INPUT_PORTS_START( mjikaga )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/homerun.c b/src/mame/drivers/homerun.c
index 9ad3a691e99..881124b8de0 100644
--- a/src/mame/drivers/homerun.c
+++ b/src/mame/drivers/homerun.c
@@ -122,13 +122,13 @@ static const struct YM2203interface ym2203_interface =
static INPUT_PORTS_START( homerun )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
@@ -136,10 +136,10 @@ static INPUT_PORTS_START( homerun )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
@@ -151,11 +151,11 @@ static INPUT_PORTS_START( homerun )
INPUT_PORTS_END
static INPUT_PORTS_START( dynashot )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf7, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
@@ -165,11 +165,11 @@ static INPUT_PORTS_START( dynashot )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0xdf, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c
index df735933195..a9c6982b238 100644
--- a/src/mame/drivers/hornet.c
+++ b/src/mame/drivers/hornet.c
@@ -884,7 +884,7 @@ ADDRESS_MAP_END
/*****************************************************************************/
static INPUT_PORTS_START( hornet )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -894,7 +894,7 @@ static INPUT_PORTS_START( hornet )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -904,14 +904,14 @@ static INPUT_PORTS_START( hornet )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service Button") PORT_CODE(KEYCODE_7)
PORT_SERVICE_NO_TOGGLE( 0x10, IP_ACTIVE_LOW )
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x80, 0x00, "Test Mode" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
@@ -939,7 +939,7 @@ static INPUT_PORTS_START( hornet )
INPUT_PORTS_END
static INPUT_PORTS_START( sscope )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -948,17 +948,17 @@ static INPUT_PORTS_START( sscope )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) // Gun trigger
PORT_BIT( 0x03, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service Button") PORT_CODE(KEYCODE_7)
PORT_SERVICE_NO_TOGGLE( 0x10, IP_ACTIVE_LOW )
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x80, 0x00, "Test Mode" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c
index 736fd9f6ec4..1187bd0b90b 100644
--- a/src/mame/drivers/hotblock.c
+++ b/src/mame/drivers/hotblock.c
@@ -150,7 +150,7 @@ static VIDEO_UPDATE(hotblock)
static INPUT_PORTS_START(hotblock)
- PORT_START /* 8bit */
+ PORT_START("P1") /* 8bit */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_8WAY
@@ -160,7 +160,7 @@ static INPUT_PORTS_START(hotblock)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) // unused?
- PORT_START /* 8bit */
+ PORT_START("P2") /* 8bit */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_8WAY
diff --git a/src/mame/drivers/hshavoc.c b/src/mame/drivers/hshavoc.c
index ab107ed635d..51ffd91af57 100644
--- a/src/mame/drivers/hshavoc.c
+++ b/src/mame/drivers/hshavoc.c
@@ -41,7 +41,7 @@ Unfortunately it's read protected.
static INPUT_PORTS_START( hshavoc )
- PORT_START_TAG("IN0") /* 16bit */
+ PORT_START("IN0") /* 16bit */
PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/hyhoo.c b/src/mame/drivers/hyhoo.c
index a6c37a6f505..e65fb370e8d 100644
--- a/src/mame/drivers/hyhoo.c
+++ b/src/mame/drivers/hyhoo.c
@@ -94,7 +94,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( hyhoo )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x00, "4 (Easy)" )
PORT_DIPSETTING( 0x01, "3" )
@@ -115,7 +115,7 @@ static INPUT_PORTS_START( hyhoo )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "Bonus Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -138,7 +138,7 @@ static INPUT_PORTS_START( hyhoo )
PORT_DIPSETTING( 0x40, "90%" )
PORT_DIPSETTING( 0x00, "95%" )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // NOT USED
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
@@ -148,7 +148,7 @@ static INPUT_PORTS_START( hyhoo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) // NOT USED
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
- PORT_START_TAG("IN0") /* (3) PORT 1-0 */
+ PORT_START("IN0") /* (3) PORT 1-0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -158,7 +158,7 @@ static INPUT_PORTS_START( hyhoo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* (4) PORT 1-1 */
+ PORT_START("IN1") /* (4) PORT 1-1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START3 )
@@ -168,7 +168,7 @@ static INPUT_PORTS_START( hyhoo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* (5) PORT 2-0 */
+ PORT_START("IN2") /* (5) PORT 2-0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
@@ -180,7 +180,7 @@ static INPUT_PORTS_START( hyhoo )
INPUT_PORTS_END
static INPUT_PORTS_START( hyhoo2 )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x00, "4 (Easy)" )
PORT_DIPSETTING( 0x01, "3" )
@@ -203,7 +203,7 @@ static INPUT_PORTS_START( hyhoo2 )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -213,7 +213,7 @@ static INPUT_PORTS_START( hyhoo2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // NOT USED
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
@@ -223,7 +223,7 @@ static INPUT_PORTS_START( hyhoo2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) // NOT USED
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
- PORT_START_TAG("IN0") /* (3) PORT 1-0 */
+ PORT_START("IN0") /* (3) PORT 1-0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -233,7 +233,7 @@ static INPUT_PORTS_START( hyhoo2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* (4) PORT 1-1 */
+ PORT_START("IN1") /* (4) PORT 1-1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START3 )
@@ -243,7 +243,7 @@ static INPUT_PORTS_START( hyhoo2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* (5) PORT 2-0 */
+ PORT_START("IN2") /* (5) PORT 2-0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
diff --git a/src/mame/drivers/hyperspt.c b/src/mame/drivers/hyperspt.c
index 802db1723d9..03b9337a447 100644
--- a/src/mame/drivers/hyperspt.c
+++ b/src/mame/drivers/hyperspt.c
@@ -132,7 +132,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( hyperspt )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -142,7 +142,7 @@ static INPUT_PORTS_START( hyperspt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
@@ -154,7 +154,7 @@ static INPUT_PORTS_START( hyperspt )
/* Fake button to press buttons 1 and 3 impossibly fast. Handle via konami_IN1_r */
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Run Like Hell (Cheat)") PORT_PLAYER(1)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3) //PORT_COCKTAIL These were commented out
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3) //PORT_COCKTAIL before the system changed.
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) //PORT_COCKTAIL Why?
@@ -164,7 +164,7 @@ static INPUT_PORTS_START( hyperspt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4) //PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -202,7 +202,7 @@ static INPUT_PORTS_START( hyperspt )
/* 0x00 disables Coin 2. It still accepts coins and makes the sound, but
it doesn't give you any credit */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, "After Last Event" )
PORT_DIPSETTING( 0x01, "Game Over" )
PORT_DIPSETTING( 0x00, "Game Continues" )
@@ -235,7 +235,7 @@ static INPUT_PORTS_START( hyperspt )
INPUT_PORTS_END
static INPUT_PORTS_START( roadf )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -245,7 +245,7 @@ static INPUT_PORTS_START( roadf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -255,7 +255,7 @@ static INPUT_PORTS_START( roadf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -265,7 +265,7 @@ static INPUT_PORTS_START( roadf )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* the game doesn't boot if this is 1 */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -303,7 +303,7 @@ static INPUT_PORTS_START( roadf )
/* 0x00 disables Coin 2. It still accepts coins and makes the sound, but
it doesn't give you any credit */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Allow_Continue ) )
PORT_DIPSETTING( 0x01, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c
index 116265ae71e..edbc07483b8 100644
--- a/src/mame/drivers/hyprduel.c
+++ b/src/mame/drivers/hyprduel.c
@@ -621,14 +621,14 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( hyprduel )
- PORT_START
+ PORT_START("SERVICE")
PORT_SERVICE_NO_TOGGLE( 0x8000, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x4000, 0x0000, "Show Warning" )
PORT_DIPSETTING( 0x4000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_BIT( 0x3fff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 3C_1C ) )
@@ -669,11 +669,11 @@ static INPUT_PORTS_START( hyprduel )
PORT_DIPSETTING( 0x0000, "5" )
PORT_BIT( 0xc000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("P1_P2")
JOY_LSB(1, BUTTON1, BUTTON2, BUTTON3, UNKNOWN)
JOY_MSB(2, BUTTON1, BUTTON2, BUTTON3, UNKNOWN)
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
diff --git a/src/mame/drivers/igs009.c b/src/mame/drivers/igs009.c
index a7b15716cda..bf31f275725 100644
--- a/src/mame/drivers/igs009.c
+++ b/src/mame/drivers/igs009.c
@@ -296,7 +296,7 @@ ADDRESS_MAP_END
***************************************************************************/
INPUT_PORTS_START( jingbell )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -310,7 +310,7 @@ INPUT_PORTS_START( jingbell )
PORT_DIPUNKNOWN( 0x40, 0x40 )
PORT_DIPUNKNOWN( 0x80, 0x80 )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPUNKNOWN( 0x01, 0x01 )
PORT_DIPUNKNOWN( 0x02, 0x02 )
PORT_DIPUNKNOWN( 0x04, 0x04 )
@@ -320,7 +320,7 @@ INPUT_PORTS_START( jingbell )
PORT_DIPUNKNOWN( 0x40, 0x40 )
PORT_DIPUNKNOWN( 0x80, 0x80 )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPUNKNOWN( 0x01, 0x01 )
PORT_DIPUNKNOWN( 0x02, 0x02 )
PORT_DIPUNKNOWN( 0x04, 0x04 )
@@ -330,7 +330,7 @@ INPUT_PORTS_START( jingbell )
PORT_DIPUNKNOWN( 0x40, 0x40 )
PORT_DIPUNKNOWN( 0x80, 0x80 )
- PORT_START_TAG("DSW4")
+ PORT_START("DSW4")
PORT_DIPUNKNOWN( 0x01, 0x01 )
PORT_DIPUNKNOWN( 0x02, 0x02 )
PORT_DIPUNKNOWN( 0x04, 0x04 )
@@ -340,7 +340,7 @@ INPUT_PORTS_START( jingbell )
PORT_DIPUNKNOWN( 0x40, 0x40 )
PORT_DIPUNKNOWN( 0x80, 0x80 )
- PORT_START_TAG("DSW5")
+ PORT_START("DSW5")
PORT_DIPUNKNOWN( 0x01, 0x01 )
PORT_DIPUNKNOWN( 0x02, 0x02 )
PORT_DIPUNKNOWN( 0x04, 0x04 )
@@ -350,7 +350,7 @@ INPUT_PORTS_START( jingbell )
PORT_DIPUNKNOWN( 0x40, 0x40 )
PORT_DIPUNKNOWN( 0x80, 0x80 )
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Memory Clear") // stats, memory
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM( hopper_r, (void *)0 ) // hopper sensor
@@ -360,7 +360,7 @@ INPUT_PORTS_START( jingbell )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Records")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("COINS")
+ PORT_START("COINS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -370,7 +370,7 @@ INPUT_PORTS_START( jingbell )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("BUTTONS1")
+ PORT_START("BUTTONS1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Stop 1")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Stop 2")
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Stop 3")
@@ -380,7 +380,7 @@ INPUT_PORTS_START( jingbell )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("BUTTONS2")
+ PORT_START("BUTTONS2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Start/H_Dup")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Small")
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Left Bet/H_Dup")
diff --git a/src/mame/drivers/igs_180.c b/src/mame/drivers/igs_180.c
index eaebbf8948b..7b65df37711 100644
--- a/src/mame/drivers/igs_180.c
+++ b/src/mame/drivers/igs_180.c
@@ -511,7 +511,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( iqblocka )
- PORT_START_TAG("DSW0") // IN0
+ PORT_START("DSW0") // IN0
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -536,7 +536,7 @@ static INPUT_PORTS_START( iqblocka )
PORT_DIPSETTING( 0x40, "20" )
PORT_DIPSETTING( 0x00, "50" )
- PORT_START_TAG("DSW1") // IN1
+ PORT_START("DSW1") // IN1
PORT_DIPNAME( 0x07, 0x07, "Key In" )
PORT_DIPSETTING( 0x07, "10" )
PORT_DIPSETTING( 0x06, "20" )
@@ -561,7 +561,7 @@ static INPUT_PORTS_START( iqblocka )
PORT_DIPSETTING( 0x40, "300" )
PORT_DIPSETTING( 0x00, "400" )
- PORT_START_TAG("DSW2") // IN2
+ PORT_START("DSW2") // IN2
PORT_DIPNAME( 0x03, 0x03, "Win Up Pool" )
PORT_DIPSETTING( 0x03, "300" )
PORT_DIPSETTING( 0x02, "500" )
@@ -585,7 +585,7 @@ static INPUT_PORTS_START( iqblocka )
PORT_DIPSETTING( 0x80, DEF_STR( Low ) )
PORT_DIPSETTING( 0x00, DEF_STR( High ) )
- PORT_START_TAG("PLAYER1")
+ PORT_START("PLAYER1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME( "Start / Test" ) // keep pressed while booting
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
@@ -595,7 +595,7 @@ static INPUT_PORTS_START( iqblocka )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("PLAYER2")
+ PORT_START("PLAYER2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 ) PORT_NAME( "Bet" )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
@@ -605,7 +605,7 @@ static INPUT_PORTS_START( iqblocka )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("COINS")
+ PORT_START("COINS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -615,7 +615,7 @@ static INPUT_PORTS_START( iqblocka )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW ) // keep pressed while booting
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SERVICE1 ) // this seems to toggle between videogame and gambling
- PORT_START_TAG("BUTTONS")
+ PORT_START("BUTTONS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME( "Small" )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(2) // coin error
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
diff --git a/src/mame/drivers/igs_blit.c b/src/mame/drivers/igs_blit.c
index 8df4fe6f331..1ae3f065aef 100644
--- a/src/mame/drivers/igs_blit.c
+++ b/src/mame/drivers/igs_blit.c
@@ -1301,7 +1301,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( chindrag )
- PORT_START_TAG("DSW1") // IN0 - DSW1
+ PORT_START("DSW1") // IN0 - DSW1
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
@@ -1326,7 +1326,7 @@ static INPUT_PORTS_START( chindrag )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") // IN1 - DSW2
+ PORT_START("DSW2") // IN1 - DSW2
PORT_DIPNAME( 0x01, 0x01, "Background" )
PORT_DIPSETTING( 0x01, "Girl" )
PORT_DIPSETTING( 0x00, "Landscape" )
@@ -1352,12 +1352,12 @@ static INPUT_PORTS_START( chindrag )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") // IN2 - DSW3
+ PORT_START("DSW3") // IN2 - DSW3
PORT_DIPNAME( 0xff, 0xff, DEF_STR( Unused ) )
PORT_DIPSETTING( 0xff, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("COIN") // IN3
+ PORT_START("COIN") // IN3
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) // keep pressed while booting
@@ -1367,7 +1367,7 @@ static INPUT_PORTS_START( chindrag )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0") // IN4
+ PORT_START("IN0") // IN4
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
@@ -1377,7 +1377,7 @@ static INPUT_PORTS_START( chindrag )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) // press in girl test to pause, button 3 advances
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") // IN5
+ PORT_START("IN1") // IN5
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1387,7 +1387,7 @@ static INPUT_PORTS_START( chindrag )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_START_TAG("IN2") // IN6
+ PORT_START("IN2") // IN6
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -1400,7 +1400,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( chmplst2 )
- PORT_START_TAG("DSW1") // IN0 - DSW1
+ PORT_START("DSW1") // IN0 - DSW1
PORT_DIPNAME( 0x07, 0x02, "Pay Out (%)" )
PORT_DIPSETTING( 0x07, "50" )
PORT_DIPSETTING( 0x06, "54" )
@@ -1425,7 +1425,7 @@ static INPUT_PORTS_START( chmplst2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") // IN1 - DSW2
+ PORT_START("DSW2") // IN1 - DSW2
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) ) // Only when bit 4 = 1
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -1450,7 +1450,7 @@ static INPUT_PORTS_START( chmplst2 )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW3") // IN2 - DSW3
+ PORT_START("DSW3") // IN2 - DSW3
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x03, "500" )
PORT_DIPSETTING( 0x02, "1000" )
@@ -1474,7 +1474,7 @@ static INPUT_PORTS_START( chmplst2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("COIN") // IN3
+ PORT_START("COIN") // IN3
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) // data clear
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) // keep pressed while booting
@@ -1484,7 +1484,7 @@ static INPUT_PORTS_START( chmplst2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY0") // IN4
+ PORT_START("KEY0") // IN4
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
@@ -1494,7 +1494,7 @@ static INPUT_PORTS_START( chmplst2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ? set to 0 both
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ? and you can't start a game
- PORT_START_TAG("KEY1") // IN5
+ PORT_START("KEY1") // IN5
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
@@ -1504,7 +1504,7 @@ static INPUT_PORTS_START( chmplst2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY2") // IN6
+ PORT_START("KEY2") // IN6
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
@@ -1514,7 +1514,7 @@ static INPUT_PORTS_START( chmplst2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3") // IN7
+ PORT_START("KEY3") // IN7
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
@@ -1524,7 +1524,7 @@ static INPUT_PORTS_START( chmplst2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY4") // IN8
+ PORT_START("KEY4") // IN8
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1537,7 +1537,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( drgnwrld )
- PORT_START_TAG("DSW1") // IN0 - DSW1
+ PORT_START("DSW1") // IN0 - DSW1
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
@@ -1562,7 +1562,7 @@ static INPUT_PORTS_START( drgnwrld )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") // IN1 - DSW2
+ PORT_START("DSW2") // IN1 - DSW2
PORT_DIPNAME( 0x01, 0x01, "Open Girl?" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1588,12 +1588,12 @@ static INPUT_PORTS_START( drgnwrld )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") // IN2 - DSW3
+ PORT_START("DSW3") // IN2 - DSW3
PORT_DIPNAME( 0xff, 0xff, DEF_STR( Unused ) )
PORT_DIPSETTING( 0xff, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("COIN") // IN3
+ PORT_START("COIN") // IN3
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) // keep pressed while booting
@@ -1603,7 +1603,7 @@ static INPUT_PORTS_START( drgnwrld )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0") // IN4
+ PORT_START("IN0") // IN4
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
@@ -1613,7 +1613,7 @@ static INPUT_PORTS_START( drgnwrld )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) // press in girl test to pause, button 3 advances
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") // IN5
+ PORT_START("IN1") // IN5
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1623,7 +1623,7 @@ static INPUT_PORTS_START( drgnwrld )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_START_TAG("IN2") // IN6
+ PORT_START("IN2") // IN6
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -1636,12 +1636,12 @@ INPUT_PORTS_END
static INPUT_PORTS_START( grtwall )
- PORT_START_TAG("DSW1") // IN0 - DSW3
+ PORT_START("DSW1") // IN0 - DSW3
PORT_DIPNAME( 0xff, 0xff, "3" )
PORT_DIPSETTING( 0xff, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") // IN1 - DSW2
+ PORT_START("DSW2") // IN1 - DSW2
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x03, "1000" )
PORT_DIPSETTING( 0x02, "1500" )
@@ -1665,7 +1665,7 @@ static INPUT_PORTS_START( grtwall )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") // IN2 - DSW1
+ PORT_START("DSW3") // IN2 - DSW1
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
@@ -1689,12 +1689,12 @@ static INPUT_PORTS_START( grtwall )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW4") // IN3 - DSW4
+ PORT_START("DSW4") // IN3 - DSW4
PORT_DIPNAME( 0xff, 0xff, "4" )
PORT_DIPSETTING( 0xff, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("COIN") // IN4
+ PORT_START("COIN") // IN4
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) // keep pressed while booting
@@ -1704,7 +1704,7 @@ static INPUT_PORTS_START( grtwall )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0") // IN5
+ PORT_START("IN0") // IN5
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
@@ -1717,7 +1717,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( lhb )
- PORT_START_TAG("DSW1") // IN0 - DSW1
+ PORT_START("DSW1") // IN0 - DSW1
PORT_DIPNAME( 0x0f, 0x07, "Pay Out (%)" )
PORT_DIPSETTING( 0x0f, "96" )
PORT_DIPSETTING( 0x0e, "93" )
@@ -1746,7 +1746,7 @@ static INPUT_PORTS_START( lhb )
PORT_DIPSETTING( 0x40, "10" )
PORT_DIPSETTING( 0x00, "20" )
- PORT_START_TAG("DSW2") // IN1 - DSW2
+ PORT_START("DSW2") // IN1 - DSW2
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -1770,7 +1770,7 @@ static INPUT_PORTS_START( lhb )
PORT_DIPSETTING( 0x80, "2" )
// PORT_DIPSETTING( 0x00, "2" )
- PORT_START_TAG("DSW3") // IN2 - DSW3
+ PORT_START("DSW3") // IN2 - DSW3
PORT_DIPNAME( 0x03, 0x03, "Max Credit" )
PORT_DIPSETTING( 0x03, "1000" )
PORT_DIPSETTING( 0x02, "2000" )
@@ -1793,7 +1793,7 @@ static INPUT_PORTS_START( lhb )
PORT_DIPSETTING( 0x40, "5" )
PORT_DIPSETTING( 0x00, "8" )
- PORT_START_TAG("DSW4") // IN3 - DSW4
+ PORT_START("DSW4") // IN3 - DSW4
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1818,12 +1818,12 @@ static INPUT_PORTS_START( lhb )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START_TAG("DSW5") // IN4 - DSW5
+ PORT_START("DSW5") // IN4 - DSW5
PORT_DIPNAME( 0xff, 0xff, "5" )
PORT_DIPSETTING( 0xff, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("COIN") // IN5
+ PORT_START("COIN") // IN5
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) // keep pressed while booting
@@ -1833,7 +1833,7 @@ static INPUT_PORTS_START( lhb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY0") // IN6
+ PORT_START("KEY0") // IN6
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
@@ -1843,7 +1843,7 @@ static INPUT_PORTS_START( lhb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY1") // IN7
+ PORT_START("KEY1") // IN7
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
@@ -1853,7 +1853,7 @@ static INPUT_PORTS_START( lhb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY2") // IN8
+ PORT_START("KEY2") // IN8
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
@@ -1863,7 +1863,7 @@ static INPUT_PORTS_START( lhb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3") // IN9
+ PORT_START("KEY3") // IN9
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
@@ -1873,7 +1873,7 @@ static INPUT_PORTS_START( lhb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY4") // IN10
+ PORT_START("KEY4") // IN10
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1886,7 +1886,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( vbowl )
- PORT_START_TAG("DSW1") // IN0 - DSW1
+ PORT_START("DSW1") // IN0 - DSW1
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
@@ -1912,7 +1912,7 @@ static INPUT_PORTS_START( vbowl )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") // IN1 - DSW2
+ PORT_START("DSW2") // IN1 - DSW2
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) ) // 5
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) ) // 7
@@ -1936,7 +1936,7 @@ static INPUT_PORTS_START( vbowl )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") // IN2 - DSW3
+ PORT_START("DSW3") // IN2 - DSW3
PORT_DIPNAME( 0x03, 0x03, "Cabinet ID" )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -1959,7 +1959,7 @@ static INPUT_PORTS_START( vbowl )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW4") // IN3 - DSW4
+ PORT_START("DSW4") // IN3 - DSW4
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1985,7 +1985,7 @@ static INPUT_PORTS_START( vbowl )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("COIN") // IN4
+ PORT_START("COIN") // IN4
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1995,7 +1995,7 @@ static INPUT_PORTS_START( vbowl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0") // IN5
+ PORT_START("IN0") // IN5
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
@@ -2005,7 +2005,7 @@ static INPUT_PORTS_START( vbowl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 )
- PORT_START_TAG("IN1") // IN6
+ PORT_START("IN1") // IN6
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
@@ -2015,16 +2015,16 @@ static INPUT_PORTS_START( vbowl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_START_TAG("AN0") // IN7
+ PORT_START("AN0") // IN7
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_PLAYER(1)
- PORT_START_TAG("AN1") // IN8
+ PORT_START("AN1") // IN8
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_PLAYER(1)
INPUT_PORTS_END
static INPUT_PORTS_START( vbowlj )
- PORT_START_TAG("DSW1") // IN0 - DSW1
+ PORT_START("DSW1") // IN0 - DSW1
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
@@ -2050,7 +2050,7 @@ static INPUT_PORTS_START( vbowlj )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") // IN1 - DSW2
+ PORT_START("DSW2") // IN1 - DSW2
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) ) // 5
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) ) // 7
@@ -2074,7 +2074,7 @@ static INPUT_PORTS_START( vbowlj )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") // IN2 - DSW3
+ PORT_START("DSW3") // IN2 - DSW3
PORT_DIPNAME( 0x03, 0x03, "Cabinet ID" )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -2097,7 +2097,7 @@ static INPUT_PORTS_START( vbowlj )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW4") // IN3 - DSW4
+ PORT_START("DSW4") // IN3 - DSW4
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2123,7 +2123,7 @@ static INPUT_PORTS_START( vbowlj )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("COIN") // IN4
+ PORT_START("COIN") // IN4
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2133,7 +2133,7 @@ static INPUT_PORTS_START( vbowlj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0") // IN5
+ PORT_START("IN0") // IN5
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
@@ -2143,7 +2143,7 @@ static INPUT_PORTS_START( vbowlj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 )
- PORT_START_TAG("IN1") // IN6
+ PORT_START("IN1") // IN6
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
@@ -2153,16 +2153,16 @@ static INPUT_PORTS_START( vbowlj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_START_TAG("AN0") // IN7
+ PORT_START("AN0") // IN7
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_PLAYER(1)
- PORT_START_TAG("AN1") // IN8
+ PORT_START("AN1") // IN8
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_PLAYER(1)
INPUT_PORTS_END
static INPUT_PORTS_START( xymg )
- PORT_START_TAG("DSW1") // IN0 - DSW1
+ PORT_START("DSW1") // IN0 - DSW1
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
@@ -2186,7 +2186,7 @@ static INPUT_PORTS_START( xymg )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2") // IN1 - DSW2
+ PORT_START("DSW2") // IN1 - DSW2
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x03, "1000" )
PORT_DIPSETTING( 0x02, "1500" )
@@ -2210,12 +2210,12 @@ static INPUT_PORTS_START( xymg )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") // IN2 - DSW3
+ PORT_START("DSW3") // IN2 - DSW3
PORT_DIPNAME( 0xff, 0xff, DEF_STR( Unused ) )
PORT_DIPSETTING( 0xff, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("COIN") // IN3
+ PORT_START("COIN") // IN3
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) // keep pressed while booting
@@ -2225,7 +2225,7 @@ static INPUT_PORTS_START( xymg )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY0") // IN4
+ PORT_START("KEY0") // IN4
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
@@ -2235,7 +2235,7 @@ static INPUT_PORTS_START( xymg )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY1") // IN5
+ PORT_START("KEY1") // IN5
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
@@ -2245,7 +2245,7 @@ static INPUT_PORTS_START( xymg )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY2") // IN6
+ PORT_START("KEY2") // IN6
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
@@ -2255,7 +2255,7 @@ static INPUT_PORTS_START( xymg )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3") // IN7
+ PORT_START("KEY3") // IN7
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
@@ -2265,7 +2265,7 @@ static INPUT_PORTS_START( xymg )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY4") // IN8
+ PORT_START("KEY4") // IN8
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
diff --git a/src/mame/drivers/ikki.c b/src/mame/drivers/ikki.c
index 6addbe10c25..e076ab658de 100644
--- a/src/mame/drivers/ikki.c
+++ b/src/mame/drivers/ikki.c
@@ -69,7 +69,7 @@ ADDRESS_MAP_END
/****************************************************************************/
static INPUT_PORTS_START( ikki )
- PORT_START /* dsw1 */
+ PORT_START("DSW1") /* dsw1 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "5" )
@@ -100,7 +100,7 @@ static INPUT_PORTS_START( ikki )
PORT_DIPSETTING( 0xe0, "1C 2C / 1C 6C" )
PORT_DIPSETTING( 0xf0, DEF_STR( Free_Play ) )
- PORT_START /* dsw2 */
+ PORT_START("DSW2") /* dsw2 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -125,7 +125,7 @@ static INPUT_PORTS_START( ikki )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* e004 */
+ PORT_START("P1") /* e004 */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -135,7 +135,7 @@ static INPUT_PORTS_START( ikki )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
- PORT_START /* e005 */
+ PORT_START("P2") /* e005 */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -145,7 +145,7 @@ static INPUT_PORTS_START( ikki )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* e003 */
+ PORT_START("SYSTEM") /* e003 */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )
diff --git a/src/mame/drivers/imolagp.c b/src/mame/drivers/imolagp.c
index 8ddb4df61f4..d01d4664190 100644
--- a/src/mame/drivers/imolagp.c
+++ b/src/mame/drivers/imolagp.c
@@ -436,7 +436,7 @@ static MACHINE_DRIVER_START( imolagp )
MACHINE_DRIVER_END
static INPUT_PORTS_START( imolagp )
- PORT_START_TAG("DSWA") /* 0x4000 */
+ PORT_START("DSWA") /* 0x4000 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x07, DEF_STR( 8C_1C ) )
PORT_DIPSETTING( 0x06, DEF_STR( 7C_1C ) )
@@ -461,7 +461,7 @@ static INPUT_PORTS_START( imolagp )
PORT_DIPSETTING( 0xc0, "Grid Test" )
PORT_DIPSETTING( 0xe0, DEF_STR( Unused ) )
- PORT_START_TAG("DSWB") /* 0x6000 */
+ PORT_START("DSWB") /* 0x6000 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x07, DEF_STR( 8C_1C ) )
PORT_DIPSETTING( 0x06, DEF_STR( 7C_1C ) )
@@ -486,7 +486,7 @@ static INPUT_PORTS_START( imolagp )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("2800") /* 2800 */ /* speed: 08 00 0F 1C 0F 00 1E 3D */
+ PORT_START("2800") /* 2800 */ /* speed: 08 00 0F 1C 0F 00 1E 3D */
// PORT_DIPNAME( 0x03, 0x03, "Pedal" )
// PORT_DIPSETTING( 0x01, "STOPPED" )
// PORT_DIPSETTING( 0x00, "SLOW" )
@@ -502,7 +502,7 @@ static INPUT_PORTS_START( imolagp )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("2802") /* 2802 */
+ PORT_START("2802") /* 2802 */
PORT_BIT( 0x0f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(1) PORT_PLAYER(1)
INPUT_PORTS_END
diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c
index 08fc3f6fc5b..b655b9cc6b1 100644
--- a/src/mame/drivers/inufuku.c
+++ b/src/mame/drivers/inufuku.c
@@ -269,7 +269,7 @@ ADDRESS_MAP_END
******************************************************************************/
static INPUT_PORTS_START( inufuku )
- PORT_START_TAG("P1") // 0
+ PORT_START("P1") // 0
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -279,7 +279,7 @@ static INPUT_PORTS_START( inufuku )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
- PORT_START_TAG("P2") // 1
+ PORT_START("P2") // 1
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -289,7 +289,7 @@ static INPUT_PORTS_START( inufuku )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_START_TAG("IN0") // 2
+ PORT_START("IN0") // 2
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -299,7 +299,7 @@ static INPUT_PORTS_START( inufuku )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P4") // 3
+ PORT_START("P4") // 3
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(4)
@@ -309,7 +309,7 @@ static INPUT_PORTS_START( inufuku )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(4)
- PORT_START_TAG("IN1") // 4
+ PORT_START("IN1") // 4
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START3 )
@@ -321,7 +321,7 @@ static INPUT_PORTS_START( inufuku )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) // pending sound command
- PORT_START_TAG("P3") // 5
+ PORT_START("P3") // 5
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(3)
diff --git a/src/mame/drivers/iqblock.c b/src/mame/drivers/iqblock.c
index f0005cfdeaf..b26b0dbd268 100644
--- a/src/mame/drivers/iqblock.c
+++ b/src/mame/drivers/iqblock.c
@@ -140,7 +140,7 @@ static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( iqblock )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -150,7 +150,7 @@ static INPUT_PORTS_START( iqblock )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) // "test mode" only
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 ) // "test mode" only
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -160,14 +160,14 @@ static INPUT_PORTS_START( iqblock )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL // "test mode" only
- PORT_START
+ PORT_START("EXTRA")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) // "test mode" only
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) // "test mode" only
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL // "test mode" only
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_COCKTAIL // "test mode" only
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("SW0")
PORT_DIPNAME( 0x03, 0x03, "Unknown SW 0-0&1" ) // Difficulty ? Read notes above
PORT_DIPSETTING( 0x03, "0" )
PORT_DIPSETTING( 0x02, "1" )
@@ -191,7 +191,7 @@ static INPUT_PORTS_START( iqblock )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("SW1")
PORT_DIPNAME( 0x01, 0x00, "Demo Sounds?" ) // To be confirmed ! Read notes above
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/irobot.c b/src/mame/drivers/irobot.c
index 351e71e8fbe..bb4d6302afe 100644
--- a/src/mame/drivers/irobot.c
+++ b/src/mame/drivers/irobot.c
@@ -163,7 +163,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( irobot )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -173,7 +173,7 @@ static INPUT_PORTS_START( irobot )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -183,7 +183,7 @@ static INPUT_PORTS_START( irobot )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -193,7 +193,7 @@ static INPUT_PORTS_START( irobot )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* EXT DONE */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x00, "Coins Per Credit" )
PORT_DIPSETTING( 0x00, "1 Coin 1 Credit" )
PORT_DIPSETTING( 0x01, "2 Coins 1 Credit" )
@@ -216,7 +216,7 @@ static INPUT_PORTS_START( irobot )
PORT_DIPSETTING( 0x60, "2 Credits for 4 Coin Units" )
PORT_DIPSETTING( 0xe0, DEF_STR( Free_Play ) )
- PORT_START_TAG("DSW2") /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Language ) )
PORT_DIPSETTING( 0x01, DEF_STR( English ) )
PORT_DIPSETTING( 0x00, DEF_STR( German ) )
@@ -240,10 +240,10 @@ static INPUT_PORTS_START( irobot )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("AN0") /* IN4 */
+ PORT_START("AN0") /* IN4 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(96,163) PORT_SENSITIVITY(70) PORT_KEYDELTA(50)
- PORT_START_TAG("AN1") /* IN5 */
+ PORT_START("AN1") /* IN5 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(96,159) PORT_SENSITIVITY(50) PORT_KEYDELTA(50) PORT_REVERSE
INPUT_PORTS_END
diff --git a/src/mame/drivers/ironhors.c b/src/mame/drivers/ironhors.c
index 4cbd112aaa7..3ac780490d7 100644
--- a/src/mame/drivers/ironhors.c
+++ b/src/mame/drivers/ironhors.c
@@ -106,7 +106,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( ironhors )
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -114,7 +114,7 @@ static INPUT_PORTS_START( ironhors )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
/* note that button 3 for player 1 and 2 are exchanged */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -125,7 +125,7 @@ static INPUT_PORTS_START( ironhors )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
@@ -135,7 +135,7 @@ static INPUT_PORTS_START( ironhors )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* DSW0 */
+ PORT_START("DSW1") /* DSW0 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -158,7 +158,7 @@ static INPUT_PORTS_START( ironhors )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW1 */
+ PORT_START("DSW2") /* DSW1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -193,7 +193,7 @@ static INPUT_PORTS_START( ironhors )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
- PORT_START
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -207,7 +207,7 @@ static INPUT_PORTS_START( ironhors )
INPUT_PORTS_END
static INPUT_PORTS_START( dairesya )
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -215,7 +215,7 @@ static INPUT_PORTS_START( dairesya )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -225,7 +225,7 @@ static INPUT_PORTS_START( dairesya )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
@@ -235,7 +235,7 @@ static INPUT_PORTS_START( dairesya )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* DSW0 */
+ PORT_START("DSW1") /* DSW0 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -258,7 +258,7 @@ static INPUT_PORTS_START( dairesya )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW1 */
+ PORT_START("DSW2") /* DSW1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -293,7 +293,7 @@ static INPUT_PORTS_START( dairesya )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
- PORT_START
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
diff --git a/src/mame/drivers/istellar.c b/src/mame/drivers/istellar.c
index 55d685c1db6..c8047c5518e 100644
--- a/src/mame/drivers/istellar.c
+++ b/src/mame/drivers/istellar.c
@@ -206,7 +206,7 @@ ADDRESS_MAP_END
/* PORTS */
static INPUT_PORTS_START( istellar )
/* TEST MODE might display a 0 for a short and a 1 for an open circuit? If so, everything below is inverted. */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -233,7 +233,7 @@ static INPUT_PORTS_START( istellar )
settings. I'm unaware of what mechanism MAME will use to make this work right? */
/* "In case of inter-stellar upright type the coin switch 2 is not used." Quoth the manual. */
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unused ) ) PORT_DIPLOCATION("SW2:3")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -249,7 +249,7 @@ static INPUT_PORTS_START( istellar )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c
index 1f5f2823349..eb3f4a0f78c 100644
--- a/src/mame/drivers/itech32.c
+++ b/src/mame/drivers/itech32.c
@@ -999,7 +999,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( timekill )
- PORT_START_TAG("P1") /* 40000 */
+ PORT_START("P1") /* 40000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -1009,7 +1009,7 @@ static INPUT_PORTS_START( timekill )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_START_TAG("P2") /* 48000 */
+ PORT_START("P2") /* 48000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
@@ -1019,7 +1019,7 @@ static INPUT_PORTS_START( timekill )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
- PORT_START_TAG("SYSTEM") /* 50000 */
+ PORT_START("SYSTEM") /* 50000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -1029,7 +1029,7 @@ static INPUT_PORTS_START( timekill )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DIPS") /* 58000 */
+ PORT_START("DIPS") /* 58000 */
PORT_SERVICE_NO_TOGGLE( 0x0001, IP_ACTIVE_LOW )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_VBLANK )
@@ -1048,7 +1048,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( itech32_base )
- PORT_START_TAG("P1") /* 080000 */
+ PORT_START("P1") /* 080000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
@@ -1058,7 +1058,7 @@ static INPUT_PORTS_START( itech32_base )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_START_TAG("P2") /* 100000 */
+ PORT_START("P2") /* 100000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
@@ -1068,13 +1068,13 @@ static INPUT_PORTS_START( itech32_base )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
- PORT_START_TAG("P3") /* 180000 */
+ PORT_START("P3") /* 180000 */
PORT_BIT( 0x00ff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("P4") /* 200000 */
+ PORT_START("P4") /* 200000 */
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DIPS") /* 280000 */
+ PORT_START("DIPS") /* 280000 */
PORT_SERVICE_NO_TOGGLE( 0x0001, IP_ACTIVE_LOW )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_VBLANK )
@@ -1090,7 +1090,7 @@ static INPUT_PORTS_START( itech32_base )
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_HIGH, "SW1:1" )
- PORT_START_TAG("EXTRA") /* 78000 */
+ PORT_START("EXTRA") /* 78000 */
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
@@ -1169,7 +1169,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( drivedge )
- PORT_START_TAG("8C000") /* 8C000 */
+ PORT_START("8C000") /* 8C000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Gear 1") PORT_CODE(KEYCODE_Z) PORT_PLAYER(1)
@@ -1179,7 +1179,7 @@ static INPUT_PORTS_START( drivedge )
PORT_SERVICE_NO_TOGGLE( 0x0040, IP_ACTIVE_LOW )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8E000") /* 8E000 */
+ PORT_START("8E000") /* 8E000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Fan") PORT_CODE(KEYCODE_F) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Tow Truck") PORT_CODE(KEYCODE_T) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Horn") PORT_CODE(KEYCODE_SPACE) PORT_PLAYER(1)
@@ -1189,7 +1189,7 @@ static INPUT_PORTS_START( drivedge )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("200000") /* 200000 */
+ PORT_START("200000") /* 200000 */
PORT_SERVICE_NO_TOGGLE( 0x0100, IP_ACTIVE_LOW )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_VBLANK )
@@ -1205,17 +1205,17 @@ static INPUT_PORTS_START( drivedge )
PORT_DIPSETTING( 0x7000, "8" )
PORT_SERVICE_DIPLOC( 0x8000, IP_ACTIVE_HIGH, "SW1:1" )
- PORT_START_TAG("80000") /* 80000 */
+ PORT_START("80000") /* 80000 */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0x06) PORT_SENSITIVITY(2) PORT_KEYDELTA(100) PORT_PLAYER(3)
/* here we use "DIPS" to simplify the read handlers */
- PORT_START_TAG("DIPS") /* 82000 */
+ PORT_START("DIPS") /* 82000 */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0x06) PORT_SENSITIVITY(2) PORT_KEYDELTA(40) PORT_PLAYER(2)
- PORT_START_TAG("STEER") /* 88000 */
+ PORT_START("STEER") /* 88000 */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(5)
- PORT_START_TAG("GAS") /* 8A000 */
+ PORT_START("GAS") /* 8A000 */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0x0c) PORT_SENSITIVITY(1) PORT_KEYDELTA(20) PORT_PLAYER(1)
INPUT_PORTS_END
@@ -1229,10 +1229,10 @@ static INPUT_PORTS_START( wcbowl )
PORT_MODIFY("P2")
PORT_BIT( 0x00f0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("TRACKX1")
+ PORT_START("TRACKX1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("TRACKY1")
+ PORT_START("TRACKY1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_PLAYER(1)
INPUT_PORTS_END
@@ -1255,10 +1255,10 @@ static INPUT_PORTS_START( wcbowln ) /* WCB version 1.66 supports cocktail mode *
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0040, DEF_STR( On ) )
- PORT_START_TAG("TRACKX2")
+ PORT_START("TRACKX2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_REVERSE PORT_COCKTAIL PORT_PLAYER(2)
- PORT_START_TAG("TRACKY2")
+ PORT_START("TRACKY2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_COCKTAIL PORT_PLAYER(2)
INPUT_PORTS_END
@@ -1314,16 +1314,16 @@ static INPUT_PORTS_START( shufshot ) /* ShuffleShot v1.39 & v1.40 support cockta
PORT_DIPSETTING( 0x0000, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x0020, DEF_STR( Cocktail ) )
- PORT_START_TAG("TRACKX1")
+ PORT_START("TRACKX1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("TRACKY1")
+ PORT_START("TRACKY1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_PLAYER(1)
- PORT_START_TAG("TRACKX2")
+ PORT_START("TRACKX2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_REVERSE PORT_COCKTAIL PORT_PLAYER(2)
- PORT_START_TAG("TRACKY2")
+ PORT_START("TRACKY2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_COCKTAIL PORT_PLAYER(2)
INPUT_PORTS_END
@@ -1350,16 +1350,16 @@ static INPUT_PORTS_START( shufbowl )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0040, DEF_STR( On ) )
- PORT_START_TAG("TRACKX1")
+ PORT_START("TRACKX1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("TRACKY1")
+ PORT_START("TRACKY1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_PLAYER(1)
- PORT_START_TAG("TRACKX2")
+ PORT_START("TRACKX2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_REVERSE PORT_COCKTAIL PORT_PLAYER(2)
- PORT_START_TAG("TRACKY2")
+ PORT_START("TRACKY2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_COCKTAIL PORT_PLAYER(2)
INPUT_PORTS_END
@@ -1390,16 +1390,16 @@ static INPUT_PORTS_START( gt3d )
PORT_DIPSETTING( 0x0000, "One Trackball" )
PORT_DIPSETTING( 0x0040, "Two Trackballs" )
- PORT_START_TAG("TRACKX1")
+ PORT_START("TRACKX1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("TRACKY1")
+ PORT_START("TRACKY1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_PLAYER(1)
- PORT_START_TAG("TRACKX2")
+ PORT_START("TRACKX2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_REVERSE PORT_COCKTAIL PORT_PLAYER(2)
- PORT_START_TAG("TRACKY2")
+ PORT_START("TRACKY2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_COCKTAIL PORT_PLAYER(2)
INPUT_PORTS_END
diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c
index c5a9c251db5..71afbc7907d 100644
--- a/src/mame/drivers/itech8.c
+++ b/src/mame/drivers/itech8.c
@@ -1014,12 +1014,12 @@ ADDRESS_MAP_END
*************************************/
#define UNUSED_ANALOG(TAG) \
- PORT_START_TAG(TAG) \
+ PORT_START(TAG) \
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
static INPUT_PORTS_START( wfortune )
- PORT_START_TAG("40") /* 40 */
+ PORT_START("40") /* 40 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */
PORT_BIT( 0x06, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x08, 0x08, DEF_STR( Cabinet ))
@@ -1028,7 +1028,7 @@ static INPUT_PORTS_START( wfortune )
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("60") /* 60 */
+ PORT_START("60") /* 60 */
PORT_BIT( 0x07, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Blue Player") PORT_PLAYER(3)
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Yellow Player") PORT_PLAYER(2)
@@ -1036,23 +1036,23 @@ static INPUT_PORTS_START( wfortune )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("80") /* 80 */
+ PORT_START("80") /* 80 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
UNUSED_ANALOG("AN_C") /* analog C */
- PORT_START_TAG("AN_D") /* analog D */
+ PORT_START("AN_D") /* analog D */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(75) PORT_KEYDELTA(10) PORT_PLAYER(1)
UNUSED_ANALOG("AN_E") /* analog E */
- PORT_START_TAG("AN_F") /* analog F */
+ PORT_START("AN_F") /* analog F */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(75) PORT_KEYDELTA(10) PORT_COCKTAIL PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( stratab )
- PORT_START_TAG("40") /* 40 */
+ PORT_START("40") /* 40 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */
PORT_BIT( 0x06, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x08, 0x08, DEF_STR( Cabinet ))
@@ -1061,7 +1061,7 @@ static INPUT_PORTS_START( stratab )
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("60") /* 60 */
+ PORT_START("60") /* 60 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P2 Right Hook") PORT_COCKTAIL PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P2 Left Hook") PORT_COCKTAIL PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Right Hook") PORT_PLAYER(1)
@@ -1071,19 +1071,19 @@ static INPUT_PORTS_START( stratab )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("80") /* 80 */
+ PORT_START("80") /* 80 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN_C") /* analog C */
+ PORT_START("AN_C") /* analog C */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_PLAYER(1)
- PORT_START_TAG("AN_D") /* analog D */
+ PORT_START("AN_D") /* analog D */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("AN_E") /* analog E */
+ PORT_START("AN_E") /* analog E */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_COCKTAIL PORT_PLAYER(2)
- PORT_START_TAG("AN_F") /* analog F */
+ PORT_START("AN_F") /* analog F */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_REVERSE PORT_COCKTAIL PORT_PLAYER(2)
INPUT_PORTS_END
@@ -1096,7 +1096,7 @@ static CUSTOM_INPUT( gtg_mux )
}
static INPUT_PORTS_START( gtg )
- PORT_START_TAG("40") /* 40 */
+ PORT_START("40") /* 40 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */
PORT_BIT( 0x06, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x08, 0x08, DEF_STR( Cabinet ))
@@ -1105,7 +1105,7 @@ static INPUT_PORTS_START( gtg )
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("60") /* 60 */
+ PORT_START("60") /* 60 */
/* it is still unknown how the second player inputs are muxed in */
/* currently we map both sets of controls to the same inputs */
PORT_BIT( 0x1f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(gtg_mux, "P1\0P2")
@@ -1113,7 +1113,7 @@ static INPUT_PORTS_START( gtg )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("80") /* 80 */
+ PORT_START("80") /* 80 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
UNUSED_ANALOG("AN_C") /* analog C */
@@ -1121,14 +1121,14 @@ static INPUT_PORTS_START( gtg )
UNUSED_ANALOG("AN_E") /* analog E */
UNUSED_ANALOG("AN_F") /* analog F */
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Swing") PORT_PLAYER(1)
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_COCKTAIL PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_COCKTAIL PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL PORT_PLAYER(2)
@@ -1138,12 +1138,12 @@ INPUT_PORTS_END
static INPUT_PORTS_START( gtgt )
- PORT_START_TAG("40") /* 40 */
+ PORT_START("40") /* 40 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */
PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("60") /* 60 */
+ PORT_START("60") /* 60 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Face Right") PORT_PLAYER(1)
@@ -1153,13 +1153,13 @@ static INPUT_PORTS_START( gtgt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("80") /* 80 */
+ PORT_START("80") /* 80 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN_C") /* analog C */
+ PORT_START("AN_C") /* analog C */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_PLAYER(1)
- PORT_START_TAG("AN_D") /* analog D */
+ PORT_START("AN_D") /* analog D */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_REVERSE PORT_PLAYER(1)
UNUSED_ANALOG("AN_E") /* analog E */
@@ -1168,7 +1168,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( gtg2t )
- PORT_START_TAG("40") /* 40 */
+ PORT_START("40") /* 40 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */
PORT_BIT( 0x06, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x08, 0x08, DEF_STR( Cabinet ))
@@ -1177,7 +1177,7 @@ static INPUT_PORTS_START( gtg2t )
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("60") /* 60 */
+ PORT_START("60") /* 60 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P2 Face Right") PORT_COCKTAIL PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P2 Face Left") PORT_COCKTAIL PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Face Right") PORT_PLAYER(1)
@@ -1187,30 +1187,30 @@ static INPUT_PORTS_START( gtg2t )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("80") /* 80 */
+ PORT_START("80") /* 80 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN_C") /* analog C */
+ PORT_START("AN_C") /* analog C */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_PLAYER(1)
- PORT_START_TAG("AN_D") /* analog D */
+ PORT_START("AN_D") /* analog D */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("AN_E") /* analog E */
+ PORT_START("AN_E") /* analog E */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_COCKTAIL PORT_PLAYER(2)
- PORT_START_TAG("AN_F") /* analog F */
+ PORT_START("AN_F") /* analog F */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_REVERSE PORT_COCKTAIL PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( slikshot )
- PORT_START_TAG("40") /* 40 */
+ PORT_START("40") /* 40 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */
PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("60") /* 60 */
+ PORT_START("60") /* 60 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL )
@@ -1220,7 +1220,7 @@ static INPUT_PORTS_START( slikshot )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Green")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("80") /* 80 */
+ PORT_START("80") /* 80 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
UNUSED_ANALOG("AN_C") /* analog C */
@@ -1228,21 +1228,21 @@ static INPUT_PORTS_START( slikshot )
UNUSED_ANALOG("AN_E") /* analog E */
UNUSED_ANALOG("AN_F") /* analog F */
- PORT_START_TAG("FAKEX") /* fake */
+ PORT_START("FAKEX") /* fake */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_RESET PORT_PLAYER(1)
- PORT_START_TAG("FAKEY") /* fake */
+ PORT_START("FAKEY") /* fake */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(100) PORT_RESET PORT_REVERSE PORT_PLAYER(1)
INPUT_PORTS_END
static INPUT_PORTS_START( dynobop )
- PORT_START_TAG("40") /* 40 */
+ PORT_START("40") /* 40 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */
PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("60") /* 60 */
+ PORT_START("60") /* 60 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* ball gate */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* ball detect */
@@ -1252,7 +1252,7 @@ static INPUT_PORTS_START( dynobop )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("80") /* 80 */
+ PORT_START("80") /* 80 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
UNUSED_ANALOG("AN_C") /* analog C */
@@ -1260,21 +1260,21 @@ static INPUT_PORTS_START( dynobop )
UNUSED_ANALOG("AN_E") /* analog E */
UNUSED_ANALOG("AN_F") /* analog F */
- PORT_START_TAG("FAKEX") /* fake */
+ PORT_START("FAKEX") /* fake */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_RESET PORT_PLAYER(1)
- PORT_START_TAG("FAKEY") /* fake */
+ PORT_START("FAKEY") /* fake */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(100) PORT_RESET PORT_REVERSE PORT_PLAYER(1)
INPUT_PORTS_END
static INPUT_PORTS_START( sstrike )
- PORT_START_TAG("40") /* 40 */
+ PORT_START("40") /* 40 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */
PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("60") /* 60 */
+ PORT_START("60") /* 60 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL )
@@ -1284,7 +1284,7 @@ static INPUT_PORTS_START( sstrike )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("80") /* 80 */
+ PORT_START("80") /* 80 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
UNUSED_ANALOG("AN_C") /* analog C */
@@ -1292,16 +1292,16 @@ static INPUT_PORTS_START( sstrike )
UNUSED_ANALOG("AN_E") /* analog E */
UNUSED_ANALOG("AN_F") /* analog F */
- PORT_START_TAG("FAKEX") /* fake */
+ PORT_START("FAKEX") /* fake */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_RESET PORT_PLAYER(1)
- PORT_START_TAG("FAKEY") /* fake */
+ PORT_START("FAKEY") /* fake */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(100) PORT_RESET PORT_REVERSE PORT_PLAYER(1)
INPUT_PORTS_END
static INPUT_PORTS_START( pokrdice )
- PORT_START_TAG("40") /* 40 */
+ PORT_START("40") /* 40 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Lower Right") PORT_CODE(KEYCODE_3_PAD)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1314,7 +1314,7 @@ static INPUT_PORTS_START( pokrdice )
PORT_BIT( 0x60, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("60") /* 60 */
+ PORT_START("60") /* 60 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Upper Right") PORT_CODE(KEYCODE_9_PAD)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Middle") PORT_CODE(KEYCODE_5_PAD)
@@ -1324,7 +1324,7 @@ static INPUT_PORTS_START( pokrdice )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Play")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("80") /* 80 */
+ PORT_START("80") /* 80 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
UNUSED_ANALOG("AN_C") /* analog C */
@@ -1335,7 +1335,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( hstennis )
- PORT_START_TAG("40") /* 40 */
+ PORT_START("40") /* 40 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */
PORT_BIT( 0x06, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x08, 0x08, DEF_STR( Cabinet ))
@@ -1347,7 +1347,7 @@ static INPUT_PORTS_START( hstennis )
PORT_BIT( 0x60, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("60") /* 60 */
+ PORT_START("60") /* 60 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Soft") PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
@@ -1357,7 +1357,7 @@ static INPUT_PORTS_START( hstennis )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Hard") PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("80") /* 80 */
+ PORT_START("80") /* 80 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P2 Soft") PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
@@ -1375,7 +1375,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( arlingtn )
- PORT_START_TAG("40") /* 40 */
+ PORT_START("40") /* 40 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */
PORT_BIT( 0x06, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown )) /* see code at e23c */
@@ -1384,7 +1384,7 @@ static INPUT_PORTS_START( arlingtn )
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("60") /* 60 */
+ PORT_START("60") /* 60 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Place")
@@ -1394,7 +1394,7 @@ static INPUT_PORTS_START( arlingtn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("80") /* 80 */
+ PORT_START("80") /* 80 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0x06, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Show")
@@ -1411,12 +1411,12 @@ INPUT_PORTS_END
static INPUT_PORTS_START( peggle )
- PORT_START_TAG("40") /* 40 */
+ PORT_START("40") /* 40 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */
PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("60") /* 60 */
+ PORT_START("60") /* 60 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
@@ -1425,7 +1425,7 @@ static INPUT_PORTS_START( peggle )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("80") /* 80 */
+ PORT_START("80") /* 80 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -1438,25 +1438,25 @@ INPUT_PORTS_END
static INPUT_PORTS_START( pegglet )
- PORT_START_TAG("40") /* 40 */
+ PORT_START("40") /* 40 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */
PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("60") /* 60 */
+ PORT_START("60") /* 60 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x3e, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("80") /* 80 */
+ PORT_START("80") /* 80 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
UNUSED_ANALOG("AN_C") /* analog C */
- PORT_START_TAG("AN_D") /* analog D */
+ PORT_START("AN_D") /* analog D */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_RESET PORT_PLAYER(1)
UNUSED_ANALOG("AN_E") /* analog E */
@@ -1465,7 +1465,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( neckneck )
- PORT_START_TAG("40") /* 40 */
+ PORT_START("40") /* 40 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */
PORT_BIT( 0x06, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x08, 0x00, DEF_STR( Unknown )) /* see code at e23c */
@@ -1474,7 +1474,7 @@ static INPUT_PORTS_START( neckneck )
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("60") /* 60 */
+ PORT_START("60") /* 60 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Horse 3")
@@ -1484,7 +1484,7 @@ static INPUT_PORTS_START( neckneck )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("80") /* 80 */
+ PORT_START("80") /* 80 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0x06, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Horse 4")
@@ -1501,10 +1501,10 @@ INPUT_PORTS_END
static INPUT_PORTS_START( rimrockn )
- PORT_START_TAG("40") /* 40 */
+ PORT_START("40") /* 40 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("60") /* 60 */
+ PORT_START("60") /* 60 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -1514,10 +1514,10 @@ static INPUT_PORTS_START( rimrockn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */
- PORT_START_TAG("80") /* 80 */
+ PORT_START("80") /* 80 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("161") /* special 161 */
+ PORT_START("161") /* special 161 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Pass") PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Shoot") PORT_PLAYER(1)
@@ -1527,7 +1527,7 @@ static INPUT_PORTS_START( rimrockn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("162") /* special 162 */
+ PORT_START("162") /* special 162 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P2 Pass") PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P2 Shoot") PORT_PLAYER(2)
@@ -1537,7 +1537,7 @@ static INPUT_PORTS_START( rimrockn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("163") /* special 163 */
+ PORT_START("163") /* special 163 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P3 Shoot") PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P3 Pass") PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1547,7 +1547,7 @@ static INPUT_PORTS_START( rimrockn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START_TAG("164") /* special 164 */
+ PORT_START("164") /* special 164 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P4 Shoot") PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P4 Pass") PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1557,7 +1557,7 @@ static INPUT_PORTS_START( rimrockn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4 )
- PORT_START_TAG("165") /* special 165 */
+ PORT_START("165") /* special 165 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE4 )
@@ -1577,7 +1577,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( ninclown )
- PORT_START_TAG("40") /* 40 */
+ PORT_START("40") /* 40 */
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE_NO_TOGGLE( 0x0200, IP_ACTIVE_LOW )
PORT_BIT( 0x0c00, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1585,7 +1585,7 @@ static INPUT_PORTS_START( ninclown )
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xc000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("60") /* 60 */
+ PORT_START("60") /* 60 */
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("P1 Throw") PORT_PLAYER(1)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
@@ -1595,7 +1595,7 @@ static INPUT_PORTS_START( ninclown )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Kick") PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Punch") PORT_PLAYER(1)
- PORT_START_TAG("80") /* 80 */
+ PORT_START("80") /* 80 */
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("P2 Throw") PORT_PLAYER(2)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
@@ -1613,7 +1613,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( gtg2 )
- PORT_START_TAG("40") /* 40 */
+ PORT_START("40") /* 40 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -1624,36 +1624,36 @@ static INPUT_PORTS_START( gtg2 )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ))
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("60") /* 60 */
+ PORT_START("60") /* 60 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Face Right") PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Face Left") PORT_PLAYER(1)
PORT_BIT( 0x78, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("80") /* 80 */
+ PORT_START("80") /* 80 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P2 Face Right") PORT_COCKTAIL PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P2 Face Left") PORT_COCKTAIL PORT_PLAYER(2)
PORT_BIT( 0x78, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("AN_C") /* analog C */
+ PORT_START("AN_C") /* analog C */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_PLAYER(1)
- PORT_START_TAG("AN_D") /* analog D */
+ PORT_START("AN_D") /* analog D */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("AN_E") /* analog E */
+ PORT_START("AN_E") /* analog E */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_COCKTAIL PORT_PLAYER(2)
- PORT_START_TAG("AN_F") /* analog F */
+ PORT_START("AN_F") /* analog F */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_REVERSE PORT_COCKTAIL PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( gpgolf )
- PORT_START_TAG("40") /* 40 */
+ PORT_START("40") /* 40 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -1664,7 +1664,7 @@ static INPUT_PORTS_START( gpgolf )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ))
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("60") /* 60 */
+ PORT_START("60") /* 60 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Swing") PORT_PLAYER(1)
@@ -1674,7 +1674,7 @@ static INPUT_PORTS_START( gpgolf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("80") /* 80 */
+ PORT_START("80") /* 80 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
UNUSED_ANALOG("AN_C") /* analog C */
diff --git a/src/mame/drivers/itgambl2.c b/src/mame/drivers/itgambl2.c
index c12ac40c324..6e615fcdf27 100644
--- a/src/mame/drivers/itgambl2.c
+++ b/src/mame/drivers/itgambl2.c
@@ -86,7 +86,7 @@ ADDRESS_MAP_END
*************************/
static INPUT_PORTS_START( itgambl2 )
- PORT_START
+ PORT_START("IN0")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/itgambl3.c b/src/mame/drivers/itgambl3.c
index 5e2d7f5af06..c3befc1bc4c 100644
--- a/src/mame/drivers/itgambl3.c
+++ b/src/mame/drivers/itgambl3.c
@@ -75,7 +75,7 @@ ADDRESS_MAP_END
*************************/
static INPUT_PORTS_START( itgambl3 )
- PORT_START
+ PORT_START("IN0")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/itgamble.c b/src/mame/drivers/itgamble.c
index a44ff3b7e43..429cebaca02 100644
--- a/src/mame/drivers/itgamble.c
+++ b/src/mame/drivers/itgamble.c
@@ -87,7 +87,7 @@ ADDRESS_MAP_END
*************************/
static INPUT_PORTS_START( itgamble )
- PORT_START
+ PORT_START("IN0")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c
index 6c0deca0465..c03bad85a33 100644
--- a/src/mame/drivers/jack.c
+++ b/src/mame/drivers/jack.c
@@ -220,7 +220,7 @@ ADDRESS_MAP_END
PORT_DIPSETTING( 0x80, "2" )
#define COMMON_REMAINDER2\
- PORT_START_TAG("DSW2")\
+ PORT_START("DSW2")\
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )\
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )\
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )\
@@ -232,14 +232,14 @@ ADDRESS_MAP_END
PORT_DIPNAME( 0x80, 0x00, "255 Lives (Cheat)")\
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )\
PORT_DIPSETTING( 0x80, DEF_STR( On ) )\
- PORT_START_TAG("IN0")\
+ PORT_START("IN0")\
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )\
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )\
PORT_BIT( 0x1c, IP_ACTIVE_HIGH, IPT_UNUSED )\
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN2 )\
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 )\
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )\
- PORT_START_TAG("IN1")\
+ PORT_START("IN1")\
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY\
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY\
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY\
@@ -248,17 +248,17 @@ ADDRESS_MAP_END
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL\
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL\
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL\
- PORT_START_TAG("IN2")\
+ PORT_START("IN2")\
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )\
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 )\
PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNUSED )\
- PORT_START_TAG("IN3")\
+ PORT_START("IN3")\
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL\
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL\
PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNUSED )
static INPUT_PORTS_START( jack )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_3C ) )
@@ -275,7 +275,7 @@ INPUT_PORTS_END
/* Same as 'jack', but different coinage */
static INPUT_PORTS_START( jack2 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_3C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -292,7 +292,7 @@ INPUT_PORTS_END
/* Same as 'jack', but another different coinage */
static INPUT_PORTS_START( jack3 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) )
@@ -309,7 +309,7 @@ INPUT_PORTS_END
/* Same as 'jack', but different "Bullets per Bean Collected" and "Difficulty" Dip Switches */
static INPUT_PORTS_START( treahunt )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_3C ) )
@@ -336,7 +336,7 @@ COMMON_REMAINDER2
INPUT_PORTS_END
static INPUT_PORTS_START( zzyzzyxx )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_3C ) )
@@ -359,7 +359,7 @@ static INPUT_PORTS_START( zzyzzyxx )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x02, DEF_STR( None ) )
PORT_DIPSETTING( 0x00, "10000 50000" )
@@ -383,14 +383,14 @@ static INPUT_PORTS_START( zzyzzyxx )
PORT_DIPSETTING( 0x40, DEF_STR( None ) ) // 3 under 0 pts
// PORT_DIPSETTING( 0xc0, DEF_STR( None ) ) // 5 under 0 pts
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x1c, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_2WAY
PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -398,17 +398,17 @@ static INPUT_PORTS_START( zzyzzyxx )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( freeze )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -430,11 +430,11 @@ static INPUT_PORTS_START( freeze )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Free_Play ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
/* probably unused */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -444,7 +444,7 @@ static INPUT_PORTS_START( freeze )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -454,7 +454,7 @@ static INPUT_PORTS_START( freeze )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -464,7 +464,7 @@ static INPUT_PORTS_START( freeze )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -476,7 +476,7 @@ static INPUT_PORTS_START( freeze )
INPUT_PORTS_END
static INPUT_PORTS_START( sucasino )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) )
@@ -499,17 +499,17 @@ static INPUT_PORTS_START( sucasino )
PORT_DIPSETTING( 0x70, "7" )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x3c, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
@@ -517,17 +517,17 @@ static INPUT_PORTS_START( sucasino )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( tripool )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -553,7 +553,7 @@ static INPUT_PORTS_START( tripool )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -579,7 +579,7 @@ static INPUT_PORTS_START( tripool )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME ("Select Game 1")
@@ -589,7 +589,7 @@ static INPUT_PORTS_START( tripool )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
@@ -599,19 +599,19 @@ static INPUT_PORTS_START( tripool )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) // not needed?
PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL // not needed?
PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( joinem )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_3C ) )
@@ -635,7 +635,7 @@ static INPUT_PORTS_START( joinem )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -659,21 +659,21 @@ static INPUT_PORTS_START( joinem )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -685,7 +685,7 @@ static INPUT_PORTS_START( joinem )
INPUT_PORTS_END
static INPUT_PORTS_START( loverboy )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0c, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -716,7 +716,7 @@ static INPUT_PORTS_START( loverboy )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -742,7 +742,7 @@ static INPUT_PORTS_START( loverboy )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
@@ -752,7 +752,7 @@ static INPUT_PORTS_START( loverboy )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
@@ -762,7 +762,7 @@ static INPUT_PORTS_START( loverboy )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -774,7 +774,7 @@ static INPUT_PORTS_START( loverboy )
INPUT_PORTS_END
static INPUT_PORTS_START( striv )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x02, 0x00, "Monitor" )
PORT_DIPSETTING( 0x02, "Horizontal" )
PORT_DIPSETTING( 0x00, "Vertical" )
@@ -801,10 +801,10 @@ static INPUT_PORTS_START( striv )
PORT_DIPSETTING( 0x40, DEF_STR( Yes ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) //?
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 )
@@ -814,7 +814,7 @@ static INPUT_PORTS_START( striv )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
@@ -824,11 +824,11 @@ static INPUT_PORTS_START( striv )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(2)
PORT_BIT( 0xfd, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) //?
INPUT_PORTS_END
diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c
index e029c6b9511..f9e0d388140 100644
--- a/src/mame/drivers/jackal.c
+++ b/src/mame/drivers/jackal.c
@@ -129,7 +129,7 @@ ADDRESS_MAP_END
/* Input Ports */
static INPUT_PORTS_START( jackal )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION( "SW1:1,2,3,4" )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -164,7 +164,7 @@ static INPUT_PORTS_START( jackal )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION( "SW2:1,2" )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -187,7 +187,7 @@ static INPUT_PORTS_START( jackal )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -203,7 +203,7 @@ static INPUT_PORTS_START( jackal )
PORT_DIPSETTING( 0x80, DEF_STR( Mono ) )
PORT_DIPSETTING( 0x00, DEF_STR( Stereo ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -215,7 +215,7 @@ static INPUT_PORTS_START( jackal )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -232,10 +232,10 @@ static INPUT_PORTS_START( topgunbl )
PORT_MODIFY("IN0")
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DIAL0") // player 1 8-way rotary control - converted in topgunbl_rotary_r()
+ PORT_START("DIAL0") // player 1 8-way rotary control - converted in topgunbl_rotary_r()
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X)
- PORT_START_TAG("DIAL1") // player 2 8-way rotary control - converted in topgunbl_rotary_r()
+ PORT_START("DIAL1") // player 2 8-way rotary control - converted in topgunbl_rotary_r()
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M) PORT_PLAYER(2)
INPUT_PORTS_END
diff --git a/src/mame/drivers/jailbrek.c b/src/mame/drivers/jailbrek.c
index 576c6d30c77..b1de5bade1c 100644
--- a/src/mame/drivers/jailbrek.c
+++ b/src/mame/drivers/jailbrek.c
@@ -99,7 +99,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( jailbrek )
- PORT_START /* IN0 - $3300 */
+ PORT_START("SYSTEM") /* IN0 - $3300 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -107,7 +107,7 @@ static INPUT_PORTS_START( jailbrek )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN1 - $3301 */
+ PORT_START("P1") /* IN1 - $3301 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -116,7 +116,7 @@ static INPUT_PORTS_START( jailbrek )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) // select
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN2 - $3302 */
+ PORT_START("P2") /* IN2 - $3302 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -125,7 +125,7 @@ static INPUT_PORTS_START( jailbrek )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* DSW0 - $3303 */
+ PORT_START("DSW1") /* DSW0 - $3303 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -161,7 +161,7 @@ static INPUT_PORTS_START( jailbrek )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START /* DSW1 - $3100 */
+ PORT_START("DSW2") /* DSW1 - $3100 */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -183,7 +183,7 @@ static INPUT_PORTS_START( jailbrek )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW2 - $3200 */
+ PORT_START("DSW3") /* DSW2 - $3200 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c
index 5b6ae684d8e..605b21587a9 100644
--- a/src/mame/drivers/jalmah.c
+++ b/src/mame/drivers/jalmah.c
@@ -550,7 +550,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( common )
/*System port*/
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -595,7 +595,7 @@ static INPUT_PORTS_START( common )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
/*Dip-SW port*/
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) // Coin2 is always 1C/1C.
PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 3C_1C ) )
@@ -646,14 +646,14 @@ static INPUT_PORTS_START( common )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
/*Mahjong Panel ports*/
- PORT_START_TAG("KEY0")
+ PORT_START("KEY0")
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
PORT_BIT( 0xe9fb, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_M )
@@ -665,7 +665,7 @@ static INPUT_PORTS_START( common )
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_MAHJONG_J )
PORT_BIT( 0xe1e0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_H )
@@ -683,14 +683,14 @@ static INPUT_PORTS_START( jalmah )
PORT_MODIFY("SYSTEM")
PORT_SERVICE( 0x0008, IP_ACTIVE_LOW )
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2)
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
PORT_BIT( 0xe9fb, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_PLAYER(2)
- PORT_START_TAG("KEY4")
+ PORT_START("KEY4")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_M ) PORT_PLAYER(2)
@@ -702,7 +702,7 @@ static INPUT_PORTS_START( jalmah )
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_PLAYER(2)
PORT_BIT( 0xe1e0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY5")
+ PORT_START("KEY5")
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c
index 2778ac947b2..53a91d11cb5 100644
--- a/src/mame/drivers/jchan.c
+++ b/src/mame/drivers/jchan.c
@@ -674,7 +674,7 @@ static INPUT_PORTS_START( jchan )
/* TO BE VERIFIED: Player 1 & 2 - see subroutine $21e2a of main68k IT1 */
/* TO BE VERIFIED: dips assignements according infos by BrianT at http://www.crazykong.com - seems ok */
- PORT_START_TAG("IN0") // Player Controls - $f00000.w (-> $2000b1.b)
+ PORT_START("IN0") // Player Controls - $f00000.w (-> $2000b1.b)
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -684,7 +684,7 @@ static INPUT_PORTS_START( jchan )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1") // Player Controls - $f00002.w (-> $2000b5.b)
+ PORT_START("IN1") // Player Controls - $f00002.w (-> $2000b5.b)
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -694,7 +694,7 @@ static INPUT_PORTS_START( jchan )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_START_TAG("IN2") // Coins - f00004.b
+ PORT_START("IN2") // Coins - f00004.b
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
@@ -704,7 +704,7 @@ static INPUT_PORTS_START( jchan )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") // DSW provided by the MCU - $200098.b <- $300200
+ PORT_START("DSW") // DSW provided by the MCU - $200098.b <- $300200
PORT_DIPNAME( 0x0100, 0x0100, "Test Mode" )
PORT_DIPSETTING( 0x0100, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/jcross.c b/src/mame/drivers/jcross.c
index f0bdc1c8e48..499e19a6c33 100644
--- a/src/mame/drivers/jcross.c
+++ b/src/mame/drivers/jcross.c
@@ -127,7 +127,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( jcross )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -136,7 +136,7 @@ static INPUT_PORTS_START( jcross )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* sound CPU status */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -145,7 +145,7 @@ static INPUT_PORTS_START( jcross )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -154,7 +154,7 @@ static INPUT_PORTS_START( jcross )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "Unknown SW 1-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -179,7 +179,7 @@ static INPUT_PORTS_START( jcross )
PORT_DIPSETTING( 0x40, "50000 120000" )
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, "Bonus Life Occurence" ) /* not verified */
PORT_DIPSETTING( 0x01, "1st, 2nd, then every 2nd" )
PORT_DIPSETTING( 0x00, "1st and 2nd only" )
diff --git a/src/mame/drivers/jedi.c b/src/mame/drivers/jedi.c
index b20995e86ed..db999e66086 100644
--- a/src/mame/drivers/jedi.c
+++ b/src/mame/drivers/jedi.c
@@ -309,7 +309,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( jedi )
- PORT_START_TAG("0c00") /* 0C00 */
+ PORT_START("0c00") /* 0C00 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -319,17 +319,17 @@ static INPUT_PORTS_START( jedi )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("0c01") /* 0C01 */
+ PORT_START("0c01") /* 0C01 */
PORT_BIT( 0x03, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_TILT )
PORT_BIT( 0x18, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x60, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(jedi_audio_comm_stat_r, 0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("STICKY") /* analog Y */
+ PORT_START("STICKY") /* analog Y */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START_TAG("STICKX") /* analog X */
+ PORT_START("STICKX") /* analog X */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
INPUT_PORTS_END
diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c
index a1fde88c49d..82d87768767 100644
--- a/src/mame/drivers/jollyjgr.c
+++ b/src/mame/drivers/jollyjgr.c
@@ -164,7 +164,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( jollyjgr )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x03, "10000" )
PORT_DIPSETTING( 0x02, "20000" )
@@ -186,7 +186,7 @@ static INPUT_PORTS_START( jollyjgr )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START
+ PORT_START("INPUTS")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -196,7 +196,7 @@ static INPUT_PORTS_START( jollyjgr )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -206,7 +206,7 @@ static INPUT_PORTS_START( jollyjgr )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_TILT )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
diff --git a/src/mame/drivers/jongkyo.c b/src/mame/drivers/jongkyo.c
index eefb8da74d3..41b05a6b398 100644
--- a/src/mame/drivers/jongkyo.c
+++ b/src/mame/drivers/jongkyo.c
@@ -230,7 +230,7 @@ Bonus credit |50 | | | | |on
static INPUT_PORTS_START( jongkyo )
- PORT_START_TAG("0")
+ PORT_START("0")
PORT_DIPNAME( 0x01, 0x01, "0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -256,7 +256,7 @@ static INPUT_PORTS_START( jongkyo )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("1")
+ PORT_START("1")
PORT_DIPNAME( 0x01, 0x01, "1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -282,7 +282,7 @@ static INPUT_PORTS_START( jongkyo )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("2")
+ PORT_START("2")
PORT_DIPNAME( 0x01, 0x01, "2" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -308,7 +308,7 @@ static INPUT_PORTS_START( jongkyo )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("3")
+ PORT_START("3")
PORT_DIPNAME( 0x01, 0x01, "3" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -334,7 +334,7 @@ static INPUT_PORTS_START( jongkyo )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("4")
+ PORT_START("4")
PORT_DIPNAME( 0x01, 0x01, "4" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -360,7 +360,7 @@ static INPUT_PORTS_START( jongkyo )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("5")
+ PORT_START("5")
PORT_DIPNAME( 0x01, 0x01, "5" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -386,7 +386,7 @@ static INPUT_PORTS_START( jongkyo )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("6")
+ PORT_START("6")
PORT_DIPNAME( 0x01, 0x01, "6" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -412,7 +412,7 @@ static INPUT_PORTS_START( jongkyo )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("7")
+ PORT_START("7")
PORT_DIPNAME( 0x01, 0x01, "7" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -438,7 +438,7 @@ static INPUT_PORTS_START( jongkyo )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("8")
+ PORT_START("8")
PORT_DIPNAME( 0x01, 0x01, "8" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -464,7 +464,7 @@ static INPUT_PORTS_START( jongkyo )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("9")
+ PORT_START("9")
PORT_DIPNAME( 0x01, 0x01, "9")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -490,7 +490,7 @@ static INPUT_PORTS_START( jongkyo )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("10")
+ PORT_START("10")
PORT_DIPNAME( 0x01, 0x01, "10" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -516,7 +516,7 @@ static INPUT_PORTS_START( jongkyo )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_DIPNAME( 0x01, 0x00, "Note" )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x01, DEF_STR( Yes ) )
@@ -529,7 +529,7 @@ static INPUT_PORTS_START( jongkyo )
PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0f, 0x0f, "Payout Rate" ) PORT_DIPLOCATION("SW:1,2,3,4")
PORT_DIPSETTING( 0x00, "50%" )
PORT_DIPSETTING( 0x01, "53%" )
diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c
index 8b7e35d6db6..1b7b3cd2e1b 100644
--- a/src/mame/drivers/jpmimpct.c
+++ b/src/mame/drivers/jpmimpct.c
@@ -675,7 +675,7 @@ ADDRESS_MAP_END
*************************************/
#define IMPACT_STANDARD \
- PORT_START_TAG("DSW") \
+ PORT_START("DSW") \
PORT_DIPNAME( 0x01, 0x01, "DSW 0 (toggle to stop alarm)") \
PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) \
PORT_DIPSETTING( 0x00, DEF_STR( On ) ) \
@@ -700,25 +700,25 @@ ADDRESS_MAP_END
PORT_DIPNAME( 0x80, 0x80, "DSW 7") \
PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) \
PORT_DIPSETTING( 0x00, DEF_STR( On ) ) \
- PORT_START_TAG("SW1") \
+ PORT_START("SW1") \
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_TOGGLE PORT_NAME( "Back Door" ) \
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_TOGGLE PORT_NAME( "Cash Door" ) \
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_TOGGLE PORT_NAME( "Refill Key" ) \
- PORT_START_TAG("TEST/DEMO") \
+ PORT_START("TEST/DEMO") \
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE4 ) PORT_NAME( "Test/Demo" ) \
#define IMPACT_TOUCHSCREEN \
- PORT_START_TAG("TOUCH") \
+ PORT_START("TOUCH") \
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_IMPULSE(1) PORT_NAME( "Touch screen" ) \
- PORT_START_TAG("TOUCH_X") \
+ PORT_START("TOUCH_X") \
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(45) PORT_KEYDELTA(15) \
- PORT_START_TAG("TOUCH_Y") \
+ PORT_START("TOUCH_Y") \
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(45) PORT_KEYDELTA(15) \
static INPUT_PORTS_START( hngmnjpm )
IMPACT_STANDARD
- PORT_START_TAG("COINS")
+ PORT_START("COINS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1) PORT_NAME( "Coin: 1 pound" )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(1) PORT_NAME( "Coin: 50p" )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(1) PORT_NAME( "Coin: 20p" )
@@ -728,7 +728,7 @@ static INPUT_PORTS_START( hngmnjpm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SW2")
+ PORT_START("SW2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME( "Collect" )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME( "'3'" )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME( "'2'" )
@@ -738,7 +738,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( coronatn )
IMPACT_STANDARD
- PORT_START_TAG("COINS")
+ PORT_START("COINS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1) PORT_NAME( "Coin: 1 pound" )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(1) PORT_NAME( "Coin: 50p" )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(1) PORT_NAME( "Coin: 20p" )
@@ -748,7 +748,7 @@ static INPUT_PORTS_START( coronatn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SW2")
+ PORT_START("SW2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME( "Ask Ken" )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME( "Collect" )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME( "'1'" )
@@ -760,7 +760,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( cluedo )
IMPACT_STANDARD
- PORT_START_TAG("COINS")
+ PORT_START("COINS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1) PORT_NAME( "Coin: 1 pound" )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(1) PORT_NAME( "Coin: 50p" )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(1) PORT_NAME( "Coin: 20p" )
@@ -770,7 +770,7 @@ static INPUT_PORTS_START( cluedo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SW2")
+ PORT_START("SW2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
IMPACT_TOUCHSCREEN
@@ -779,7 +779,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( trivialp )
IMPACT_STANDARD
- PORT_START_TAG("COINS")
+ PORT_START("COINS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1) PORT_NAME( "Coin: 1 pound" )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(1) PORT_NAME( "Coin: 50p" )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(1) PORT_NAME( "Coin: 20p" )
@@ -789,7 +789,7 @@ static INPUT_PORTS_START( trivialp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SW2")
+ PORT_START("SW2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME( "Pass" )
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -799,7 +799,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( scrabble )
IMPACT_STANDARD
- PORT_START_TAG("COINS")
+ PORT_START("COINS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1) PORT_NAME( "Coin: 1 pound" )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(1) PORT_NAME( "Coin: 50p" )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(1) PORT_NAME( "Coin: 20p" )
@@ -809,7 +809,7 @@ static INPUT_PORTS_START( scrabble )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SW2")
+ PORT_START("SW2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
IMPACT_TOUCHSCREEN
diff --git a/src/mame/drivers/jrpacman.c b/src/mame/drivers/jrpacman.c
index 613f8d923dd..55f06e105aa 100644
--- a/src/mame/drivers/jrpacman.c
+++ b/src/mame/drivers/jrpacman.c
@@ -155,7 +155,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( jrpacman )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -167,7 +167,7 @@ static INPUT_PORTS_START( jrpacman )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN3 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -179,7 +179,7 @@ static INPUT_PORTS_START( jrpacman )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c
index 0877c5b5889..122b17698b3 100644
--- a/src/mame/drivers/junofrst.c
+++ b/src/mame/drivers/junofrst.c
@@ -226,7 +226,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( junofrst )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -251,7 +251,7 @@ static INPUT_PORTS_START( junofrst )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -261,7 +261,7 @@ static INPUT_PORTS_START( junofrst )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -271,7 +271,7 @@ static INPUT_PORTS_START( junofrst )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -281,7 +281,7 @@ static INPUT_PORTS_START( junofrst )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c
index c35ea95d867..35e114c02fe 100644
--- a/src/mame/drivers/kaneko16.c
+++ b/src/mame/drivers/kaneko16.c
@@ -875,7 +875,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( bakubrkr )
- PORT_START_TAG("IN0") // IN0 - Player 1 + DSW - e00000.w
+ PORT_START("IN0") // IN0 - Player 1 + DSW - e00000.w
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -897,7 +897,7 @@ static INPUT_PORTS_START( bakubrkr )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") // IN1 - Player 2 - e00002.b
+ PORT_START("IN1") // IN1 - Player 2 - e00002.b
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -907,7 +907,7 @@ static INPUT_PORTS_START( bakubrkr )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") // IN2 - Coins - e00004.b
+ PORT_START("IN2") // IN2 - Coins - e00004.b
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
@@ -917,7 +917,7 @@ static INPUT_PORTS_START( bakubrkr )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3") // IN3 - Seems unused ! - e00006.b
+ PORT_START("IN3") // IN3 - Seems unused ! - e00006.b
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -934,7 +934,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( berlwall )
- PORT_START_TAG("IN0") // IN0 - Player 1 - 680000.w
+ PORT_START("IN0") // IN0 - Player 1 - 680000.w
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -944,7 +944,7 @@ static INPUT_PORTS_START( berlwall )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") // IN1 - Player 2 - 680002.w
+ PORT_START("IN1") // IN1 - Player 2 - 680002.w
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -954,7 +954,7 @@ static INPUT_PORTS_START( berlwall )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") // IN2 - Coins - 680004.w
+ PORT_START("IN2") // IN2 - Coins - 680004.w
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
@@ -964,7 +964,7 @@ static INPUT_PORTS_START( berlwall )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3") // IN3 - ? - 680006.w
+ PORT_START("IN3") // IN3 - ? - 680006.w
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -974,7 +974,7 @@ static INPUT_PORTS_START( berlwall )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") // IN4 - DSW 1 - $200018.b <- ! $80001d.b
+ PORT_START("DSW1") // IN4 - DSW 1 - $200018.b <- ! $80001d.b
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -998,7 +998,7 @@ static INPUT_PORTS_START( berlwall )
PORT_DIPSETTING( 0x20, DEF_STR( 1C_5C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_6C ) )
- PORT_START_TAG("DSW2") // IN5 - DSW 2 - $200019.b <- $80001f.b
+ PORT_START("DSW2") // IN5 - DSW 2 - $200019.b <- $80001f.b
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -1044,7 +1044,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( blazeon )
- PORT_START_TAG("IN0") // IN0 - Player 1 + DSW - c00000.w
+ PORT_START("IN0") // IN0 - Player 1 + DSW - c00000.w
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
@@ -1071,7 +1071,7 @@ static INPUT_PORTS_START( blazeon )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
- PORT_START_TAG("IN1") // IN1 - Player 2 - c00002.w
+ PORT_START("IN1") // IN1 - Player 2 - c00002.w
PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x0007, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0008, DEF_STR( 3C_1C ) )
@@ -1117,10 +1117,10 @@ static INPUT_PORTS_START( blazeon )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(2)
- PORT_START_TAG("IN2") // IN2 - ? - c00004.w
+ PORT_START("IN2") // IN2 - ? - c00004.w
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
- PORT_START_TAG("IN3") // IN3 - Other Buttons - c00006.w
+ PORT_START("IN3") // IN3 - Other Buttons - c00006.w
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1136,7 +1136,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( bloodwar )
- PORT_START_TAG("IN0") // IN0 - Player 1 - b00000.w
+ PORT_START("IN0") // IN0 - Player 1 - b00000.w
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -1146,7 +1146,7 @@ static INPUT_PORTS_START( bloodwar )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1") // IN1 - Player 2 - b00002.w
+ PORT_START("IN1") // IN1 - Player 2 - b00002.w
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -1156,7 +1156,7 @@ static INPUT_PORTS_START( bloodwar )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") // IN2 - Coins - b00004.w
+ PORT_START("IN2") // IN2 - Coins - b00004.w
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
@@ -1166,7 +1166,7 @@ static INPUT_PORTS_START( bloodwar )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_SERVICE2 ) // tested
- PORT_START_TAG("IN3") // IN3 - ? - b00006.w
+ PORT_START("IN3") // IN3 - ? - b00006.w
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN ) // tested
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) // tested
@@ -1176,7 +1176,7 @@ static INPUT_PORTS_START( bloodwar )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") // IN4 - DSW from the MCU - $10497e.b <- $208000.b
+ PORT_START("DSW1") // IN4 - DSW from the MCU - $10497e.b <- $208000.b
PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0100, DEF_STR( On ) )
@@ -1206,7 +1206,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( bonkadv )
- PORT_START_TAG("IN0") // IN0 - Player 1 - b00000.w
+ PORT_START("IN0") // IN0 - Player 1 - b00000.w
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -1216,7 +1216,7 @@ static INPUT_PORTS_START( bonkadv )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1") // IN1 - Player 2 - b00002.w
+ PORT_START("IN1") // IN1 - Player 2 - b00002.w
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -1226,7 +1226,7 @@ static INPUT_PORTS_START( bonkadv )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_START_TAG("IN2") // IN2 - Coins - b00004.w
+ PORT_START("IN2") // IN2 - Coins - b00004.w
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
@@ -1236,7 +1236,7 @@ static INPUT_PORTS_START( bonkadv )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_SERVICE2 )
- PORT_START_TAG("IN3") // IN3 - ? - b00006.w
+ PORT_START("IN3") // IN3 - ? - b00006.w
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1246,7 +1246,7 @@ static INPUT_PORTS_START( bonkadv )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") // IN4 - DSW from the MCU - $10019e.b <- $200200.b
+ PORT_START("DSW1") // IN4 - DSW from the MCU - $10019e.b <- $200200.b
PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0100, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1277,7 +1277,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( gtmr )
- PORT_START_TAG("IN0") // IN0 - Player 1 - b00000.w
+ PORT_START("IN0") // IN0 - Player 1 - b00000.w
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1287,7 +1287,7 @@ static INPUT_PORTS_START( gtmr )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") // IN1 - Player 2 - b00002.w
+ PORT_START("IN1") // IN1 - Player 2 - b00002.w
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1297,7 +1297,7 @@ static INPUT_PORTS_START( gtmr )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") // IN2 - Coins - b00004.w
+ PORT_START("IN2") // IN2 - Coins - b00004.w
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
@@ -1307,7 +1307,7 @@ static INPUT_PORTS_START( gtmr )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3") // IN3 - Seems unused ! - b00006.w
+ PORT_START("IN3") // IN3 - Seems unused ! - b00006.w
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1317,7 +1317,7 @@ static INPUT_PORTS_START( gtmr )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") // IN4 - DSW from the MCU - 101265.b <- 206000.b
+ PORT_START("DSW1") // IN4 - DSW from the MCU - 101265.b <- 206000.b
PORT_SERVICE_DIPLOC( 0x0100, IP_ACTIVE_LOW, "SW1:1" )
PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:2")
PORT_DIPSETTING( 0x0200, DEF_STR( Off ) )
@@ -1340,10 +1340,10 @@ static INPUT_PORTS_START( gtmr )
PORT_DIPSETTING( 0x4000, "Flag Only" )
PORT_DIPSETTING( 0x0000, DEF_STR( None ) )
- PORT_START_TAG("WHEEL0") // IN5 - Wheel (270deg) - 100015.b <- ffffe.b
+ PORT_START("WHEEL0") // IN5 - Wheel (270deg) - 100015.b <- ffffe.b
PORT_BIT ( 0x00ff, 0x0080, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(25)
- PORT_START_TAG("WHEEL1") // IN6 - Wheel (360deg)
+ PORT_START("WHEEL1") // IN6 - Wheel (360deg)
PORT_BIT ( 0x00ff, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(70) PORT_KEYDELTA(25) PORT_PLAYER(1)
INPUT_PORTS_END
@@ -1353,7 +1353,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( gtmr2 )
- PORT_START_TAG("IN0") // IN0 - Player 1 - 100004.w <- b00000.w (cpl)
+ PORT_START("IN0") // IN0 - Player 1 - 100004.w <- b00000.w (cpl)
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1363,7 +1363,7 @@ static INPUT_PORTS_START( gtmr2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") // IN1 - Player 2 - 10000c.w <- b00002.w (cpl) - for "test mode" only
+ PORT_START("IN1") // IN1 - Player 2 - 10000c.w <- b00002.w (cpl) - for "test mode" only
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1373,7 +1373,7 @@ static INPUT_PORTS_START( gtmr2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") // IN2 - Coins - 100014.w <- b00004.w (cpl)
+ PORT_START("IN2") // IN2 - Coins - 100014.w <- b00004.w (cpl)
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 ) // only in "test mode"
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
@@ -1383,7 +1383,7 @@ static INPUT_PORTS_START( gtmr2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3") // IN3 - 100017.w <- b00006.w
+ PORT_START("IN3") // IN3 - 100017.w <- b00006.w
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1393,7 +1393,7 @@ static INPUT_PORTS_START( gtmr2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("IN 3-6") // Code at 0x002236 - Centers 270D wheel ?
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") // IN4 - DSW from the MCU - 1016f7.b <- 206000.b
+ PORT_START("DSW1") // IN4 - DSW from the MCU - 1016f7.b <- 206000.b
PORT_DIPNAME( 0x0700, 0x0700, "Linked Operation Board Number" ) PORT_DIPLOCATION("SW1:6,7,8")
PORT_DIPSETTING( 0x0700, "No Communication" )
PORT_DIPSETTING( 0x0600, "Board #1" )
@@ -1418,16 +1418,16 @@ static INPUT_PORTS_START( gtmr2 )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_SERVICE_DIPLOC( 0x8000, IP_ACTIVE_LOW, "SW1:1" )
- PORT_START_TAG("WHEEL0") // IN5 - Wheel (270A) - 100019.b <- fffff.b
+ PORT_START("WHEEL0") // IN5 - Wheel (270A) - 100019.b <- fffff.b
PORT_BIT ( 0x00ff, 0x0080, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(1)
- PORT_START_TAG("WHEEL1") // IN6 - Wheel (270D) - 100019.b <- ffffe.b
+ PORT_START("WHEEL1") // IN6 - Wheel (270D) - 100019.b <- ffffe.b
PORT_BIT ( 0x00ff, 0x0080, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(1)
- PORT_START_TAG("WHEEL2") // IN7 - Wheel (360) - 100019.b <- ffffe.b
+ PORT_START("WHEEL2") // IN7 - Wheel (360) - 100019.b <- ffffe.b
PORT_BIT( 0x00ff, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(1) PORT_CODE_DEC(KEYCODE_LEFT) PORT_CODE_INC(KEYCODE_RIGHT)
- PORT_START_TAG("FAKE") // Fake IN1 - To be pressed during boot sequence - Code at 0x000c9e
+ PORT_START("FAKE") // Fake IN1 - To be pressed during boot sequence - Code at 0x000c9e
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("IN 1-0") PORT_CODE(KEYCODE_H) // "sound test"
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1444,7 +1444,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( mgcrystl )
- PORT_START_TAG("IN0") // IN0 - Player 1 + DSW - c00000.w
+ PORT_START("IN0") // IN0 - Player 1 + DSW - c00000.w
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1466,7 +1466,7 @@ static INPUT_PORTS_START( mgcrystl )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") // IN1 - Player 2 - c00002.b
+ PORT_START("IN1") // IN1 - Player 2 - c00002.b
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1485,7 +1485,7 @@ static INPUT_PORTS_START( mgcrystl )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") // IN2 - Other Buttons - c00004.b
+ PORT_START("IN2") // IN2 - Other Buttons - c00004.b
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
@@ -1504,7 +1504,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( shogwarr )
- PORT_START_TAG("IN0") // IN0 - - b80000.w
+ PORT_START("IN0") // IN0 - - b80000.w
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1514,7 +1514,7 @@ static INPUT_PORTS_START( shogwarr )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ? tested
- PORT_START_TAG("IN1") // IN1 - - b80002.w
+ PORT_START("IN1") // IN1 - - b80002.w
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1524,7 +1524,7 @@ static INPUT_PORTS_START( shogwarr )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ? tested
- PORT_START_TAG("IN2") // IN2 - Coins - b80004.w
+ PORT_START("IN2") // IN2 - Coins - b80004.w
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
@@ -1534,7 +1534,7 @@ static INPUT_PORTS_START( shogwarr )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ? tested
- PORT_START_TAG("IN3") // IN3 - ? - b80006.w
+ PORT_START("IN3") // IN3 - ? - b80006.w
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1544,7 +1544,7 @@ static INPUT_PORTS_START( shogwarr )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") // IN4 - DSW from the MCU - 102e15.b <- 200059.b
+ PORT_START("DSW1") // IN4 - DSW from the MCU - 102e15.b <- 200059.b
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/kangaroo.c b/src/mame/drivers/kangaroo.c
index 8fe9c02317d..792f1ea3ac7 100644
--- a/src/mame/drivers/kangaroo.c
+++ b/src/mame/drivers/kangaroo.c
@@ -309,14 +309,14 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( fnkyfish )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -324,7 +324,7 @@ static INPUT_PORTS_START( fnkyfish )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -332,7 +332,7 @@ static INPUT_PORTS_START( fnkyfish )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "5" )
@@ -361,7 +361,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( kangaroo )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START2 )
@@ -377,7 +377,7 @@ static INPUT_PORTS_START( kangaroo )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -387,7 +387,7 @@ static INPUT_PORTS_START( kangaroo )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_SERVICE( 0x80, IP_ACTIVE_HIGH )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -397,7 +397,7 @@ static INPUT_PORTS_START( kangaroo )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "5" )
diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c
index fc68951b296..0d74e897060 100644
--- a/src/mame/drivers/karnov.c
+++ b/src/mame/drivers/karnov.c
@@ -377,7 +377,7 @@ ADDRESS_MAP_END
/******************************************************************************/
#define INPUTS\
- PORT_START_TAG("IN0") /* Player 1 controls */\
+ PORT_START("IN0") /* Player 1 controls */\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY\
@@ -386,7 +386,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )\
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )\
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* Button 4 on karnov schematics */\
- PORT_START_TAG("IN1") /* Player 2 controls */\
+ PORT_START("IN1") /* Player 2 controls */\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL\
@@ -395,7 +395,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL\
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL\
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* Button 4 on karnov schematics */\
- PORT_START_TAG("IN2") /* start buttons */\
+ PORT_START("IN2") /* start buttons */\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) /* PL1 Button 5 on karnov schematics */\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) /* PL2 Button 5 on karnov schematics */\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )\
@@ -404,7 +404,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )\
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )\
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )\
- PORT_START_TAG("FAKE") /* Dummy input for i8751 */\
+ PORT_START("FAKE") /* Dummy input for i8751 */\
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )\
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )\
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 )
@@ -412,7 +412,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( karnov )
INPUTS
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:3,4")
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -438,7 +438,7 @@ INPUTS
/* 0x80 called No Die Mode according to the manual, but it doesn't seem
to have any effect */
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x03, "3" )
@@ -465,7 +465,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( wndrplnt )
INPUTS
- PORT_START_TAG("DSW1") /* Dip switch bank 1 */
+ PORT_START("DSW1") /* Dip switch bank 1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -489,7 +489,7 @@ INPUTS
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x03, "3" )
@@ -515,7 +515,7 @@ INPUTS
INPUT_PORTS_END
static INPUT_PORTS_START( chelnov )
- PORT_START_TAG("IN0") /* Player 1 controls */
+ PORT_START("IN0") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -525,7 +525,7 @@ static INPUT_PORTS_START( chelnov )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* Player 2 controls */
+ PORT_START("IN1") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -535,7 +535,7 @@ static INPUT_PORTS_START( chelnov )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* start buttons */
+ PORT_START("IN2") /* start buttons */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -545,12 +545,12 @@ static INPUT_PORTS_START( chelnov )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("FAKE") /* Dummy input for i8751 */
+ PORT_START("FAKE") /* Dummy input for i8751 */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -574,7 +574,7 @@ static INPUT_PORTS_START( chelnov )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x03, "3" )
diff --git a/src/mame/drivers/kchamp.c b/src/mame/drivers/kchamp.c
index 7c6035fe45b..7032107b830 100644
--- a/src/mame/drivers/kchamp.c
+++ b/src/mame/drivers/kchamp.c
@@ -247,7 +247,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( kchampvs )
- PORT_START /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_4WAY
@@ -257,7 +257,7 @@ static INPUT_PORTS_START( kchampvs )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_UP ) PORT_4WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_4WAY
- PORT_START /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_4WAY PORT_PLAYER(2)
@@ -267,7 +267,7 @@ static INPUT_PORTS_START( kchampvs )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_UP ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_4WAY PORT_PLAYER(2)
- PORT_START /* IN2 */
+ PORT_START("SYSTEM") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -277,7 +277,7 @@ static INPUT_PORTS_START( kchampvs )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* DSW0 */
+ PORT_START("DSW") /* DSW0 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -307,7 +307,7 @@ INPUT_PORTS_END
********************/
static INPUT_PORTS_START( kchamp )
- PORT_START /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_4WAY
@@ -317,7 +317,7 @@ static INPUT_PORTS_START( kchamp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_UP ) PORT_4WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_4WAY
- PORT_START /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_4WAY PORT_PLAYER(2)
@@ -327,7 +327,7 @@ static INPUT_PORTS_START( kchamp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_UP ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_4WAY PORT_PLAYER(2)
- PORT_START /* IN2 */
+ PORT_START("SYSTEM") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -337,7 +337,7 @@ static INPUT_PORTS_START( kchamp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* DSW0 */
+ PORT_START("DSW") /* DSW0 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c
index 7b20fe10167..34f4dc5dedc 100644
--- a/src/mame/drivers/kickgoal.c
+++ b/src/mame/drivers/kickgoal.c
@@ -531,7 +531,7 @@ ADDRESS_MAP_END
/* INPUT ports ***************************************************************/
static INPUT_PORTS_START( kickgoal )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -550,7 +550,7 @@ static INPUT_PORTS_START( kickgoal )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c
index bae1664b117..a5509c59283 100644
--- a/src/mame/drivers/kingobox.c
+++ b/src/mame/drivers/kingobox.c
@@ -242,7 +242,7 @@ static ADDRESS_MAP_START( rk_sound_writeport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( kingofb )
- PORT_START /* DSW0 - 0xfc01 */
+ PORT_START("DSW1") /* DSW0 - 0xfc01 */
PORT_DIPNAME( 0x03, 0x01, "Rest Up Points" )
PORT_DIPSETTING( 0x02, "70000" )
PORT_DIPSETTING( 0x01, "100000" )
@@ -264,7 +264,7 @@ static INPUT_PORTS_START( kingofb )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_HIGH )
- PORT_START /* DSW1 - 0xfc01 */
+ PORT_START("DSW2") /* DSW1 - 0xfc01 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x06, DEF_STR( 3C_1C ) )
@@ -290,7 +290,7 @@ static INPUT_PORTS_START( kingofb )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* IN 0 - 0xfc02 */
+ PORT_START("P1") /* IN 0 - 0xfc02 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
@@ -300,7 +300,7 @@ static INPUT_PORTS_START( kingofb )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN 1 - 0xfc03 */
+ PORT_START("P2") /* IN 1 - 0xfc03 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
@@ -310,7 +310,7 @@ static INPUT_PORTS_START( kingofb )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN 2 - 0xfc04 */
+ PORT_START("SYSTEM") /* IN 2 - 0xfc04 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -320,7 +320,7 @@ static INPUT_PORTS_START( kingofb )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN 3 - 0xfc05 */
+ PORT_START("EXTRA") /* IN 3 - 0xfc05 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON3 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -333,7 +333,7 @@ INPUT_PORTS_END
/* Ring King */
static INPUT_PORTS_START( ringking )
- PORT_START /* DSW0 - 0xe000 */
+ PORT_START("DSW1") /* DSW0 - 0xe000 */
PORT_DIPNAME( 0x03, 0x03, "Replay" )
PORT_DIPSETTING( 0x01, "70000" )
PORT_DIPSETTING( 0x02, "100000" )
@@ -353,7 +353,7 @@ static INPUT_PORTS_START( ringking )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START /* DSW1 - 0xe001 */
+ PORT_START("DSW2") /* DSW1 - 0xe001 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -376,7 +376,7 @@ static INPUT_PORTS_START( ringking )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* IN 0 - 0xe002 */
+ PORT_START("P1") /* IN 0 - 0xe002 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
@@ -386,7 +386,7 @@ static INPUT_PORTS_START( ringking )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN 1 - 0xe003 */
+ PORT_START("P2") /* IN 1 - 0xe003 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
@@ -396,7 +396,7 @@ static INPUT_PORTS_START( ringking )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN 2 - 0xe004 */
+ PORT_START("SYSTEM") /* IN 2 - 0xe004 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -406,7 +406,7 @@ static INPUT_PORTS_START( ringking )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN 3 - 0xfc05 */
+ PORT_START("EXTRA") /* IN 3 - 0xfc05 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/kingpin.c b/src/mame/drivers/kingpin.c
index 6f4a2d0a6b3..9ea228d6f14 100644
--- a/src/mame/drivers/kingpin.c
+++ b/src/mame/drivers/kingpin.c
@@ -31,7 +31,7 @@ static READ8_HANDLER( io_read_missing_dips )
/* Ports */
static INPUT_PORTS_START( kingpin )
- PORT_START
+ PORT_START("IN0")
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 )
@@ -41,8 +41,8 @@ static INPUT_PORTS_START( kingpin )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME( "Start" )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_NAME( "Apply Credit" )
- PORT_START
- PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_BUTTON9 )
+ PORT_START("IN1")
+ PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_BUTTON9 )
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_BUTTON10 )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_BUTTON11 )
PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -52,7 +52,7 @@ static INPUT_PORTS_START( kingpin )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_BUTTON14 )
/* There are 3 banks of solder pads, but only one is poupulated with DIPs */
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/kinst.c b/src/mame/drivers/kinst.c
index 9259ff73c49..16c4a0a14fc 100644
--- a/src/mame/drivers/kinst.c
+++ b/src/mame/drivers/kinst.c
@@ -418,7 +418,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( kinst )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -436,7 +436,7 @@ static INPUT_PORTS_START( kinst )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_SPECIAL ) /* door */
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
@@ -454,17 +454,17 @@ static INPUT_PORTS_START( kinst )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BILL1 ) /* bill */
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_SPECIAL ) /* coin door */
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SPECIAL ) /* sound status */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_VOLUME_UP )
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_VOLUME_DOWN )
PORT_BIT( 0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED ) /* verify */
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0003, 0x0003, "Blood Level" )
PORT_DIPSETTING( 0x0003, DEF_STR( High ))
PORT_DIPSETTING( 0x0002, DEF_STR( Medium ))
@@ -522,7 +522,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( kinst2 )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -540,7 +540,7 @@ static INPUT_PORTS_START( kinst2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_SPECIAL ) /* door */
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
@@ -558,17 +558,17 @@ static INPUT_PORTS_START( kinst2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BILL1 ) /* bill */
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_SPECIAL ) /* coin door */
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SPECIAL ) /* sound status */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_VOLUME_UP )
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_VOLUME_DOWN )
PORT_BIT( 0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED ) /* verify */
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0003, 0x0003, "Blood Level" )
PORT_DIPSETTING( 0x0003, DEF_STR( High ))
PORT_DIPSETTING( 0x0002, DEF_STR( Medium ))
diff --git a/src/mame/drivers/kinstb.c b/src/mame/drivers/kinstb.c
index 8d54099b8c8..2b7acc8d858 100644
--- a/src/mame/drivers/kinstb.c
+++ b/src/mame/drivers/kinstb.c
@@ -95,12 +95,12 @@ static ADDRESS_MAP_START( spc_mem, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( kinstb )
- PORT_START_TAG("PAD1L") /* IN 0 : Joypad 1 - L */
+ PORT_START("PAD1L") /* IN 0 : Joypad 1 - L */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("P1 Button A") PORT_PLAYER(1)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("P1 Button X") PORT_PLAYER(1)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("P1 Button L") PORT_PLAYER(1)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("P1 Button R") PORT_PLAYER(1)
- PORT_START_TAG("PAD1H") /* IN 1 : Joypad 1 - H */
+ PORT_START("PAD1H") /* IN 1 : Joypad 1 - H */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("P1 Button B") PORT_PLAYER(1)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("P1 Button Y") PORT_PLAYER(1)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_NAME("P1 Select")
@@ -110,12 +110,12 @@ static INPUT_PORTS_START( kinstb )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
- PORT_START_TAG("PAD2L") /* IN 2 : Joypad 2 - L */
+ PORT_START("PAD2L") /* IN 2 : Joypad 2 - L */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("P2 Button A") PORT_PLAYER(2)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("P2 Button X") PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("P2 Button L") PORT_PLAYER(2)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("P2 Button R") PORT_PLAYER(2)
- PORT_START_TAG("PAD2H") /* IN 3 : Joypad 2 - H */
+ PORT_START("PAD2H") /* IN 3 : Joypad 2 - H */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("P2 Button B") PORT_PLAYER(2)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("P2 Button Y") PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SERVICE2 ) PORT_NAME("P2 Select")
@@ -125,12 +125,12 @@ static INPUT_PORTS_START( kinstb )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_START_TAG("PAD3L") /* IN 4 : Joypad 3 - L */
+ PORT_START("PAD3L") /* IN 4 : Joypad 3 - L */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("P3 Button A") PORT_PLAYER(3)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("P3 Button X") PORT_PLAYER(3)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("P3 Button L") PORT_PLAYER(3)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("P3 Button R") PORT_PLAYER(3)
- PORT_START_TAG("PAD3H") /* IN 5 : Joypad 3 - H */
+ PORT_START("PAD3H") /* IN 5 : Joypad 3 - H */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("P3 Button B") PORT_PLAYER(3)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("P3 Button Y") PORT_PLAYER(3)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SERVICE3 ) PORT_NAME("P3 Select")
@@ -140,12 +140,12 @@ static INPUT_PORTS_START( kinstb )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(3)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(3)
- PORT_START_TAG("PAD4L") /* IN 6 : Joypad 4 - L */
+ PORT_START("PAD4L") /* IN 6 : Joypad 4 - L */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("P4 Button A") PORT_PLAYER(4)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("P4 Button X") PORT_PLAYER(4)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("P4 Button L") PORT_PLAYER(4)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("P4 Button R") PORT_PLAYER(4)
- PORT_START_TAG("PAD4H") /* IN 7 : Joypad 4 - H */
+ PORT_START("PAD4H") /* IN 7 : Joypad 4 - H */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("P4 Button B") PORT_PLAYER(4)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("P4 Button Y") PORT_PLAYER(4)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SERVICE4 ) PORT_NAME("P4 Select")
@@ -155,13 +155,13 @@ static INPUT_PORTS_START( kinstb )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(4)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(4)
- PORT_START_TAG("INTERNAL") /* IN 8 : Internal switches */
+ PORT_START("INTERNAL") /* IN 8 : Internal switches */
PORT_DIPNAME( 0x1, 0x1, "Enforce 32 sprites/line" )
PORT_DIPSETTING( 0x0, DEF_STR( No ) )
PORT_DIPSETTING( 0x1, DEF_STR( Yes ) )
#ifdef MAME_DEBUG
- PORT_START_TAG("DEBUG1") /* IN 9 : debug switches */
+ PORT_START("DEBUG1") /* IN 9 : debug switches */
PORT_DIPNAME( 0x3, 0x0, "Browse tiles" )
PORT_DIPSETTING( 0x0, DEF_STR( Off ) )
PORT_DIPSETTING( 0x1, "2bpl" )
@@ -173,7 +173,7 @@ static INPUT_PORTS_START( kinstb )
PORT_DIPSETTING( 0x8, "4bpl" )
PORT_DIPSETTING( 0xc, "8bpl" )
- PORT_START_TAG("DEBUG2") /* IN 10 : debug switches */
+ PORT_START("DEBUG2") /* IN 10 : debug switches */
PORT_BIT( 0x1, IP_ACTIVE_HIGH, IPT_BUTTON7 ) PORT_NAME("Toggle BG 1") PORT_PLAYER(2)
PORT_BIT( 0x2, IP_ACTIVE_HIGH, IPT_BUTTON8 ) PORT_NAME("Toggle BG 2") PORT_PLAYER(2)
PORT_BIT( 0x4, IP_ACTIVE_HIGH, IPT_BUTTON9 ) PORT_NAME("Toggle BG 3") PORT_PLAYER(2)
@@ -183,15 +183,15 @@ static INPUT_PORTS_START( kinstb )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON9 ) PORT_NAME("Toggle Back col") PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON10 ) PORT_NAME("Toggle Windows") PORT_PLAYER(3)
- PORT_START_TAG("DEBUG3") /* IN 11 : debug input */
+ PORT_START("DEBUG3") /* IN 11 : debug input */
PORT_BIT( 0x1, IP_ACTIVE_HIGH, IPT_BUTTON9 ) PORT_NAME("Pal prev")
PORT_BIT( 0x2, IP_ACTIVE_HIGH, IPT_BUTTON10 ) PORT_NAME("Pal next")
PORT_BIT( 0x4, IP_ACTIVE_HIGH, IPT_BUTTON7 ) PORT_NAME("Toggle Transparency") PORT_PLAYER(4)
#endif
- PORT_START_TAG("DSW") /* IN 12 : dip-switches */
+ PORT_START("DSW") /* IN 12 : dip-switches */
- PORT_START_TAG("COIN") /* IN 13 : coins */
+ PORT_START("COIN") /* IN 13 : coins */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
diff --git a/src/mame/drivers/klax.c b/src/mame/drivers/klax.c
index 07a79b4d68b..31eb7d6faec 100644
--- a/src/mame/drivers/klax.c
+++ b/src/mame/drivers/klax.c
@@ -137,7 +137,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( klax )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x00fc, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -149,7 +149,7 @@ static INPUT_PORTS_START( klax )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x0600, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/kncljoe.c b/src/mame/drivers/kncljoe.c
index 64bb8286361..24da0b97430 100644
--- a/src/mame/drivers/kncljoe.c
+++ b/src/mame/drivers/kncljoe.c
@@ -135,7 +135,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( kncljoe )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -145,7 +145,7 @@ static INPUT_PORTS_START( kncljoe )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -155,7 +155,7 @@ static INPUT_PORTS_START( kncljoe )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN 2 */
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -165,7 +165,7 @@ static INPUT_PORTS_START( kncljoe )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
@@ -188,7 +188,7 @@ static INPUT_PORTS_START( kncljoe )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x01, 0x01, "Unused SW B-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/koftball.c b/src/mame/drivers/koftball.c
index e085721f634..5b1848e59fb 100644
--- a/src/mame/drivers/koftball.c
+++ b/src/mame/drivers/koftball.c
@@ -158,7 +158,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( koftball )
- PORT_START
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("info") PORT_CODE(KEYCODE_Z)//info page
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("test2") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("dec") PORT_CODE(KEYCODE_C)//dec sound test
@@ -176,7 +176,6 @@ static INPUT_PORTS_START( koftball )
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("test16") PORT_CODE(KEYCODE_J)
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Select") PORT_CODE(KEYCODE_K)//test mode select
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("test18") PORT_CODE(KEYCODE_L)
-
INPUT_PORTS_END
diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c
index f0dea2d528d..b9f0f952bce 100644
--- a/src/mame/drivers/koikoi.c
+++ b/src/mame/drivers/koikoi.c
@@ -143,7 +143,7 @@ static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( koikoi )
- PORT_START_TAG("DSW") /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_DIPNAME( 0x03, 0x01, "Timer C" )
PORT_DIPSETTING( 0x00, "50" )
PORT_DIPSETTING( 0x01, "70" )
@@ -172,11 +172,11 @@ static INPUT_PORTS_START( koikoi )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0xbf, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_A) //1
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_S) //2
PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_D) //3
diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c
index f62a285b78e..d5f5fe8e4eb 100644
--- a/src/mame/drivers/konamigq.c
+++ b/src/mame/drivers/konamigq.c
@@ -410,31 +410,31 @@ MACHINE_DRIVER_END
static INPUT_PORTS_START( konamigq )
/* IN 0 */
- PORT_START
+ PORT_START("GUNX1")
PORT_BIT( 0x01ff, 0x011d, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX( 0x007d, 0x01bc ) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1)
/* IN 1 */
- PORT_START
+ PORT_START("GUNY1")
PORT_BIT( 0x00ff, 0x0078, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_MINMAX( 0x0000, 0x00ef ) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1)
/* IN 2 */
- PORT_START
+ PORT_START("GUNX2")
PORT_BIT( 0x01ff, 0x011d, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX( 0x007d, 0x01bc ) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(2)
/* IN 3 */
- PORT_START
+ PORT_START("GUNY2")
PORT_BIT( 0x00ff, 0x0078, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_MINMAX( 0x0000, 0x00ef ) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(2)
/* IN 4 */
- PORT_START
+ PORT_START("GUNX3")
PORT_BIT( 0x01ff, 0x011d, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX( 0x007d, 0x01bc ) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(3)
/* IN 5 */
- PORT_START
+ PORT_START("GUNY3")
PORT_BIT( 0x00ff, 0x0078, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_MINMAX( 0x0000, 0x00ef ) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(3)
/* IN 6 */
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x000001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x000002, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x000004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -453,7 +453,7 @@ static INPUT_PORTS_START( konamigq )
PORT_BIT( 0x800000, IP_ACTIVE_LOW, IPT_UNKNOWN )
/* IN 7 */
- PORT_START
+ PORT_START("IN1")
PORT_BIT( 0x000001, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x000002, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x000004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -472,7 +472,7 @@ static INPUT_PORTS_START( konamigq )
PORT_BIT( 0x800000, IP_ACTIVE_LOW, IPT_UNKNOWN )
/* IN 8 */
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x00000001, 0x01, DEF_STR( Stereo ) )
PORT_DIPSETTING( 0x01, DEF_STR( Stereo ) )
PORT_DIPSETTING( 0x00, DEF_STR( Mono ) )
diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c
index 3726006a237..11675ec0945 100644
--- a/src/mame/drivers/konamigv.c
+++ b/src/mame/drivers/konamigv.c
@@ -377,7 +377,7 @@ static MACHINE_DRIVER_START( konamigv )
MACHINE_DRIVER_END
static INPUT_PORTS_START( konamigv )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_8WAY
PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP) PORT_8WAY
@@ -396,7 +396,7 @@ static INPUT_PORTS_START( konamigv )
PORT_BIT( 0x00008000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xffff0000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -415,7 +415,7 @@ static INPUT_PORTS_START( konamigv )
PORT_BIT( 0x00008000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xffff0000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
@@ -557,10 +557,10 @@ MACHINE_DRIVER_END
static INPUT_PORTS_START( simpbowl )
PORT_INCLUDE( konamigv )
- PORT_START_TAG("TRACK0_X")
+ PORT_START("TRACK0_X")
PORT_BIT( 0xfff, 0x0000, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("TRACK0_Y")
+ PORT_START("TRACK0_Y")
PORT_BIT( 0xfff, 0x0000, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_PLAYER(1)
INPUT_PORTS_END
@@ -645,16 +645,16 @@ MACHINE_DRIVER_END
static INPUT_PORTS_START( btchamp )
PORT_INCLUDE( konamigv )
- PORT_START_TAG("TRACK0_X")
+ PORT_START("TRACK0_X")
PORT_BIT( 0x7ff, 0x0000, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("TRACK0_Y")
+ PORT_START("TRACK0_Y")
PORT_BIT( 0x7ff, 0x0000, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_PLAYER(1)
- PORT_START_TAG("TRACK1_X")
+ PORT_START("TRACK1_X")
PORT_BIT( 0x7ff, 0x0000, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("TRACK1_Y")
+ PORT_START("TRACK1_Y")
PORT_BIT( 0x7ff, 0x0000, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_PLAYER(2)
INPUT_PORTS_END
@@ -745,19 +745,19 @@ static INPUT_PORTS_START( kdeadeye )
PORT_MODIFY("IN2")
PORT_BIT( 0x0000ffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0xffff, 0x0100, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX( 0x004c, 0x01bb ) PORT_SENSITIVITY( 100 ) PORT_KEYDELTA( 5 ) PORT_PLAYER( 1 )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0xffff, 0x0077, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_MINMAX( 0x0000, 0x00ef ) PORT_SENSITIVITY( 100 ) PORT_KEYDELTA( 5 ) PORT_PLAYER( 1 )
- PORT_START_TAG("IN5")
+ PORT_START("IN5")
PORT_BIT( 0xffff, 0x0100, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX( 0x004c, 0x01bb ) PORT_SENSITIVITY( 100 ) PORT_KEYDELTA( 5 ) PORT_PLAYER( 2 )
- PORT_START_TAG("IN6")
+ PORT_START("IN6")
PORT_BIT( 0xffff, 0x0077, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_MINMAX( 0x0000, 0x00ef ) PORT_SENSITIVITY( 100 ) PORT_KEYDELTA( 5 ) PORT_PLAYER( 2 )
- PORT_START_TAG("IN7")
+ PORT_START("IN7")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER( 1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER( 2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c
index 71d92509eb4..a5724f53dfe 100644
--- a/src/mame/drivers/konamigx.c
+++ b/src/mame/drivers/konamigx.c
@@ -1446,7 +1446,7 @@ MACHINE_DRIVER_END
/* here we collect players' inputs: they are shared among all the ports */
static INPUT_PORTS_START( common )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1456,7 +1456,7 @@ static INPUT_PORTS_START( common )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1466,7 +1466,7 @@ static INPUT_PORTS_START( common )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -1476,7 +1476,7 @@ static INPUT_PORTS_START( common )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -1486,7 +1486,7 @@ static INPUT_PORTS_START( common )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
@@ -1496,7 +1496,7 @@ static INPUT_PORTS_START( common )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START_TAG("IN5")
+ PORT_START("IN5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
@@ -1511,7 +1511,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( konamigx )
PORT_INCLUDE( common )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Stereo ))
PORT_DIPSETTING( 0x00, DEF_STR( Stereo ))
PORT_DIPSETTING( 0x01, DEF_STR( Mono ))
@@ -1537,7 +1537,7 @@ static INPUT_PORTS_START( konamigx )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "Foo")
PORT_DIPSETTING( 0x00, "Foo")
PORT_DIPSETTING( 0x01, "Bar")
@@ -1569,12 +1569,12 @@ static INPUT_PORTS_START( racinfrc )
/* racin force needs Player 2 Button 1 ("IN3" & 0x10) set to get past the calibration screen */
PORT_INCLUDE( konamigx )
- PORT_START_TAG("IN6") /* no gun */
+ PORT_START("IN6") /* no gun */
- PORT_START_TAG("AN0") /* mask default type sens delta min max */
+ PORT_START("AN0") /* mask default type sens delta min max */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x38,0xc8) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0,0x68) PORT_SENSITIVITY(35) PORT_KEYDELTA(5) PORT_CODE_INC(KEYCODE_LCONTROL)
INPUT_PORTS_END
@@ -1584,7 +1584,7 @@ static INPUT_PORTS_START( le2 )
PORT_MODIFY("IN1")
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) /* for gun games */
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Stereo ))
PORT_DIPSETTING( 0x01, DEF_STR( Stereo ))
PORT_DIPSETTING( 0x00, DEF_STR( Mono ))
@@ -1610,10 +1610,10 @@ static INPUT_PORTS_START( le2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN6")
+ PORT_START("IN6")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) /* for gun games */
@@ -1623,16 +1623,16 @@ static INPUT_PORTS_START( le2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("LIGHT0_X") /* mask default type sens delta min max */
+ PORT_START("LIGHT0_X") /* mask default type sens delta min max */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("LIGHT0_Y")
+ PORT_START("LIGHT0_Y")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("LIGHT1_X")
+ PORT_START("LIGHT1_X")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(15) PORT_PLAYER(2)
- PORT_START_TAG("LIGHT1_Y")
+ PORT_START("LIGHT1_Y")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(15) PORT_PLAYER(2)
INPUT_PORTS_END
@@ -1642,7 +1642,7 @@ static INPUT_PORTS_START( gokuparo )
PORT_MODIFY("IN0")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Stereo ))
PORT_DIPSETTING( 0x00, DEF_STR( Stereo ))
PORT_DIPSETTING( 0x01, DEF_STR( Mono ))
@@ -1675,7 +1675,7 @@ static INPUT_PORTS_START( puzldama )
PORT_MODIFY("IN0")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Stereo ))
PORT_DIPSETTING( 0x00, DEF_STR( Stereo ))
PORT_DIPSETTING( 0x01, DEF_STR( Mono ))
@@ -1729,7 +1729,7 @@ static INPUT_PORTS_START( dragoonj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Stereo ))
PORT_DIPSETTING( 0x00, DEF_STR( Stereo ))
PORT_DIPSETTING( 0x01, DEF_STR( Mono ))
@@ -1763,7 +1763,7 @@ static INPUT_PORTS_START( type3 )
PORT_MODIFY("IN0")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Stereo ))
PORT_DIPSETTING( 0x00, DEF_STR( Stereo ))
PORT_DIPSETTING( 0x01, DEF_STR( Mono ))
diff --git a/src/mame/drivers/kopunch.c b/src/mame/drivers/kopunch.c
index d7938069f30..3104232ca6e 100644
--- a/src/mame/drivers/kopunch.c
+++ b/src/mame/drivers/kopunch.c
@@ -89,7 +89,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( kopunch )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
@@ -99,7 +99,7 @@ static INPUT_PORTS_START( kopunch )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x07, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* punch strength (high 3 bits) */
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(1)
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -107,7 +107,7 @@ static INPUT_PORTS_START( kopunch )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -133,7 +133,7 @@ static INPUT_PORTS_START( kopunch )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
diff --git a/src/mame/drivers/ksayakyu.c b/src/mame/drivers/ksayakyu.c
index e3a3ddf16df..fd7ab480d75 100644
--- a/src/mame/drivers/ksayakyu.c
+++ b/src/mame/drivers/ksayakyu.c
@@ -136,43 +136,41 @@ static ADDRESS_MAP_START( soundcpu_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( ksayakyu )
- PORT_START
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON2 )
-
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 )
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
-
- PORT_START
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT) PORT_COCKTAIL
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT) PORT_COCKTAIL
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN) PORT_COCKTAIL
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP) PORT_COCKTAIL
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_COCKTAIL
-
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_COCKTAIL
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
-
- PORT_START
- PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) )
- PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
- PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
- PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) )
- PORT_DIPSETTING( 0x02, DEF_STR( 1C_3C ) )
- PORT_DIPNAME( 0x04, 0x00, DEF_STR( Flip_Screen ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x04, DEF_STR( On ) )
- PORT_DIPNAME( 0x08, 0x08, DEF_STR( Cabinet ) )
- PORT_DIPSETTING( 0x08, DEF_STR( Upright ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_DIPNAME( 0x040, 0x00, "Continue" )
- PORT_DIPSETTING( 0x00, "7th inning" )
- PORT_DIPSETTING( 0x040, "1st inning" )
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
+ PORT_START("P1")
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
+ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
+ PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON2 )
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 )
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
+
+ PORT_START("P2")
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT) PORT_COCKTAIL
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT) PORT_COCKTAIL
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN) PORT_COCKTAIL
+ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP) PORT_COCKTAIL
+ PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_COCKTAIL
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_COCKTAIL
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
+
+ PORT_START("DSW")
+ PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) )
+ PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
+ PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) )
+ PORT_DIPSETTING( 0x02, DEF_STR( 1C_3C ) )
+ PORT_DIPNAME( 0x04, 0x00, DEF_STR( Flip_Screen ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x04, DEF_STR( On ) )
+ PORT_DIPNAME( 0x08, 0x08, DEF_STR( Cabinet ) )
+ PORT_DIPSETTING( 0x08, DEF_STR( Upright ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
+ PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_DIPNAME( 0x040, 0x00, "Continue" )
+ PORT_DIPSETTING( 0x00, "7th inning" )
+ PORT_DIPSETTING( 0x040, "1st inning" )
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
INPUT_PORTS_END
static WRITE8_HANDLER(dummy_w)
diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c
index 55aecd42ebd..65b64d07a9f 100644
--- a/src/mame/drivers/ksys573.c
+++ b/src/mame/drivers/ksys573.c
@@ -2759,10 +2759,10 @@ static MACHINE_DRIVER_START( konami573 )
MACHINE_DRIVER_END
static INPUT_PORTS_START( konami573 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0xffffffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x00000001, 0x00000001, "Unused 1" ) PORT_DIPLOCATION( "DIP SW:1" )
PORT_DIPSETTING( 0x00000001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
@@ -2803,7 +2803,7 @@ static INPUT_PORTS_START( konami573 )
// PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_UNKNOWN )
// PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xffff0000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00000100, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x00000200, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -2822,7 +2822,7 @@ static INPUT_PORTS_START( konami573 )
PORT_BIT( 0x00000040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x00000080, IP_ACTIVE_LOW, IPT_START2 ) /* skip init? */
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x00000100, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0x00000200, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
PORT_SERVICE_NO_TOGGLE( 0x00000400, IP_ACTIVE_LOW )
@@ -2833,12 +2833,12 @@ static INPUT_PORTS_START( konami573 )
PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(2)
// PORT_BIT( 0xf0fff0ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("CART")
+ PORT_START("CART")
PORT_CONFNAME( 1, 0, "Security Cart" )
PORT_CONFSETTING( 0, "Install" )
PORT_CONFSETTING( 1, "Game" )
- PORT_START_TAG("CD")
+ PORT_START("CD")
PORT_CONFNAME( 1, 0, "CD" )
PORT_CONFSETTING( 0, "1" )
PORT_CONFSETTING( 1, "2" )
@@ -2849,10 +2849,10 @@ static INPUT_PORTS_START( fbaitbc )
PORT_MODIFY("IN3")
- PORT_START_TAG( "uPD4701_y" )
+ PORT_START( "uPD4701_y" )
PORT_BIT( 0x0fff, 0, IPT_MOUSE_Y ) PORT_MINMAX( 0, 0xfff ) PORT_SENSITIVITY( 15 ) PORT_KEYDELTA( 8 ) PORT_RESET
- PORT_START_TAG( "uPD4701_switches" )
+ PORT_START( "uPD4701_switches" )
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_PLAYER(1)
@@ -2861,10 +2861,10 @@ INPUT_PORTS_END
static INPUT_PORTS_START( fbaitmc )
PORT_INCLUDE( fbaitbc )
- PORT_START_TAG( "analog0" )
+ PORT_START( "analog0" )
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(0x20,0xdf) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_PLAYER(1) PORT_REVERSE
- PORT_START_TAG( "analog1" )
+ PORT_START( "analog1" )
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0x20,0xdf) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_PLAYER(1)
INPUT_PORTS_END
@@ -2874,7 +2874,7 @@ static INPUT_PORTS_START( ddr )
PORT_MODIFY("IN2")
PORT_BIT( 0x00000f0f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(gn845pwbb_read,0)
- PORT_START_TAG( "STAGE" )
+ PORT_START( "STAGE" )
PORT_BIT( 0x00000100, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_16WAY PORT_PLAYER(1)
PORT_BIT( 0x00000200, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_16WAY PORT_PLAYER(1) /* serial? */
PORT_BIT( 0x00000400, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_16WAY PORT_PLAYER(1) /* serial? */
diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c
index a6d61490023..aa7bd17a4b8 100644
--- a/src/mame/drivers/kyugo.c
+++ b/src/mame/drivers/kyugo.c
@@ -187,28 +187,28 @@ Sub_PortMap( flashgla, 0x40, 0x80 )
PORT_DIPSETTING( 0x28, DEF_STR( 1C_3C ) )
#define COMMON_DSW2 \
- PORT_START_TAG("DSW2")\
+ PORT_START("DSW2")\
COIN_A_B\
PORT_DIPUNUSED( 0x40, IP_ACTIVE_LOW )\
PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW )
#define COMMON_END \
- PORT_START_TAG("IN0")\
+ PORT_START("IN0")\
START_COINS\
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )\
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )\
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )\
- PORT_START_TAG("IN1")\
+ PORT_START("IN1")\
JOYSTICK_1\
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )\
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )\
- PORT_START_TAG("IN2")\
+ PORT_START("IN2")\
JOYSTICK_2\
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )\
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
static INPUT_PORTS_START( gyrodine )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -235,7 +235,7 @@ COMMON_END
INPUT_PORTS_END
static INPUT_PORTS_START( sonofphx )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -260,7 +260,7 @@ static INPUT_PORTS_START( sonofphx )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
COIN_A_B
PORT_DIPNAME( 0xc0, 0x80, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Easy ) )
@@ -272,7 +272,7 @@ COMMON_END
INPUT_PORTS_END
static INPUT_PORTS_START( airwolf )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "4" )
PORT_DIPSETTING( 0x02, "5" )
@@ -303,7 +303,7 @@ INPUT_PORTS_END
/* Same as 'airwolf', but different "Lives" Dip Switch */
static INPUT_PORTS_START( skywolf )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -333,7 +333,7 @@ COMMON_END
INPUT_PORTS_END
static INPUT_PORTS_START( flashgal )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -363,7 +363,7 @@ COMMON_END
INPUT_PORTS_END
static INPUT_PORTS_START( srdmissn )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -393,7 +393,7 @@ COMMON_END
INPUT_PORTS_END
static INPUT_PORTS_START( legend )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
diff --git a/src/mame/drivers/labyrunr.c b/src/mame/drivers/labyrunr.c
index 5c5db32a3a3..35211f96e58 100644
--- a/src/mame/drivers/labyrunr.c
+++ b/src/mame/drivers/labyrunr.c
@@ -96,7 +96,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( labyrunr )
- PORT_START /* DSW #1 */
+ PORT_START("DSW1") /* DSW #1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -132,7 +132,7 @@ static INPUT_PORTS_START( labyrunr )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START /* DSW #2 */
+ PORT_START("DSW2") /* DSW #2 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -155,7 +155,7 @@ static INPUT_PORTS_START( labyrunr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW #3 */
+ PORT_START("DSW3") /* DSW #3 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -168,7 +168,7 @@ static INPUT_PORTS_START( labyrunr )
PORT_DIPSETTING( 0x00, "5" )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* COINSW */
+ PORT_START("SYSTEM") /* COINSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -178,7 +178,7 @@ static INPUT_PORTS_START( labyrunr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* PLAYER 1 INPUTS */
+ PORT_START("P1") /* PLAYER 1 INPUTS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -188,7 +188,7 @@ static INPUT_PORTS_START( labyrunr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START /* PLAYER 2 INPUTS */
+ PORT_START("P2") /* PLAYER 2 INPUTS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
diff --git a/src/mame/drivers/ladybug.c b/src/mame/drivers/ladybug.c
index bbde1600b6d..fb80b274796 100644
--- a/src/mame/drivers/ladybug.c
+++ b/src/mame/drivers/ladybug.c
@@ -172,13 +172,13 @@ static CUSTOM_INPUT( ladybug_p2_control_r )
static INPUT_PORTS_START( ladybug )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x1f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(ladybug_p1_control_r, 0)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_TILT )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x1f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(ladybug_p2_control_r, 0)
/* This should be connected to the 4V clock. I don't think the game uses it. */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -187,13 +187,13 @@ static INPUT_PORTS_START( ladybug )
/* them this way is enough to get the game running. */
PORT_BIT( 0xc0, 0x40, IPT_VBLANK )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_UNUSED
PORT_BIT( 0x0e, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Medium ) )
@@ -218,7 +218,7 @@ static INPUT_PORTS_START( ladybug )
PORT_DIPSETTING( 0x80, "3" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x06, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -244,18 +244,18 @@ static INPUT_PORTS_START( ladybug )
PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ) )
/* settings 0x00 thru 0x50 all give 1 Coin/1 Credit */
- PORT_START_TAG("COIN") /* FAKE */
+ PORT_START("COIN") /* FAKE */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED(coin1_inserted, 0)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_CHANGED(coin2_inserted, 0)
- PORT_START_TAG(LADYBUG_P1_CONTROL_PORT_TAG)
+ PORT_START(LADYBUG_P1_CONTROL_PORT_TAG)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_UNUSED
- PORT_START_TAG(LADYBUG_P2_CONTROL_PORT_TAG)
+ PORT_START(LADYBUG_P2_CONTROL_PORT_TAG)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -264,7 +264,7 @@ static INPUT_PORTS_START( ladybug )
INPUT_PORTS_END
static INPUT_PORTS_START( snapjack )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
@@ -274,7 +274,7 @@ static INPUT_PORTS_START( snapjack )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_TILT )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
@@ -287,13 +287,13 @@ static INPUT_PORTS_START( snapjack )
/* them this way is enough to get the game running. */
PORT_BIT( 0xc0, 0x40, IPT_VBLANK )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_UNUSED
PORT_BIT( 0x0e, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Medium ) )
@@ -317,7 +317,7 @@ static INPUT_PORTS_START( snapjack )
PORT_DIPSETTING( 0x80, "4" )
PORT_DIPSETTING( 0x40, "5" )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
/* coinage is slightly different from Lady Bug and Cosmic Avenger */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x05, DEF_STR( 4C_1C ) )
@@ -346,13 +346,13 @@ static INPUT_PORTS_START( snapjack )
PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ) )
/* settings 0x00 thru 0x04 all give 1 Coin/1 Credit */
- PORT_START_TAG("COIN") /* FAKE */
+ PORT_START("COIN") /* FAKE */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED(coin1_inserted, 0)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_CHANGED(coin2_inserted, 0)
INPUT_PORTS_END
static INPUT_PORTS_START( cavenger )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
@@ -362,7 +362,7 @@ static INPUT_PORTS_START( cavenger )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_TILT )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
@@ -375,13 +375,13 @@ static INPUT_PORTS_START( cavenger )
/* them this way is enough to get the game running. */
PORT_BIT( 0xc0, 0x40, IPT_VBLANK )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x0e, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Medium ) )
@@ -404,7 +404,7 @@ static INPUT_PORTS_START( cavenger )
PORT_DIPSETTING( 0x80, "4" )
PORT_DIPSETTING( 0x40, "5" )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x06, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -430,13 +430,13 @@ static INPUT_PORTS_START( cavenger )
PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ) )
/* settings 0x00 thru 0x50 all give 1 Coin/1 Credit */
- PORT_START_TAG("COIN") /* FAKE */
+ PORT_START("COIN") /* FAKE */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED(coin1_inserted, 0)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_CHANGED(coin2_inserted, 0)
INPUT_PORTS_END
static INPUT_PORTS_START( dorodon )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -446,7 +446,7 @@ static INPUT_PORTS_START( dorodon )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_TILT )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -459,13 +459,13 @@ static INPUT_PORTS_START( dorodon )
/* them this way is enough to get the game running. */
PORT_BIT( 0xc0, 0x40, IPT_VBLANK )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* unused */
PORT_BIT( 0x0e, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Medium ) )
@@ -490,7 +490,7 @@ static INPUT_PORTS_START( dorodon )
PORT_DIPSETTING( 0x80, "3" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x06, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -516,13 +516,13 @@ static INPUT_PORTS_START( dorodon )
PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ) )
/* settings 0x00 thru 0x50 all give 1 Coin/1 Credit */
- PORT_START_TAG("COIN") /* FAKE */
+ PORT_START("COIN") /* FAKE */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED(coin1_inserted, 0)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_CHANGED(coin2_inserted, 0)
INPUT_PORTS_END
static INPUT_PORTS_START( sraider )
- PORT_START /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -532,7 +532,7 @@ static INPUT_PORTS_START( sraider )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -542,7 +542,7 @@ static INPUT_PORTS_START( sraider )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Medium ) )
@@ -567,7 +567,7 @@ static INPUT_PORTS_START( sraider )
PORT_DIPSETTING( 0x40, "5" )
/* Free Play setting works when it's set for both */
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
/* settings 0x00 thru 0x05 all give 1 Coin/1 Credit */
PORT_DIPSETTING( 0x06, DEF_STR( 4C_1C ) )
diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c
index d671758dcb6..d64320dacc4 100644
--- a/src/mame/drivers/ladyfrog.c
+++ b/src/mame/drivers/ladyfrog.c
@@ -203,7 +203,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( ladyfrog )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "4" )
PORT_DIPSETTING( 0x01, "2" )
@@ -224,7 +224,7 @@ static INPUT_PORTS_START( ladyfrog )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_3C ) )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x01, DEF_STR( Normal ) )
@@ -234,13 +234,13 @@ static INPUT_PORTS_START( ladyfrog )
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("INPUTS")
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
diff --git a/src/mame/drivers/laserbas.c b/src/mame/drivers/laserbas.c
index 0ac1bb85b57..a41891bbebc 100644
--- a/src/mame/drivers/laserbas.c
+++ b/src/mame/drivers/laserbas.c
@@ -98,25 +98,25 @@ static ADDRESS_MAP_START( laserbas_io, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( laserbas )
- PORT_START
- PORT_DIPNAME( 0x01, 0x00, "0-0" )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x01, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x00, "0-1" )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x02, DEF_STR( On ) )
- PORT_DIPNAME( 0x04, 0x00, "0-2" )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x04, DEF_STR( On ) )
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_DIPNAME( 0x010, 0x10, "0-3" )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x010, DEF_STR( On ) )
- PORT_DIPNAME( 0x020, 0x20, "Test Mode" )
- PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x000, DEF_STR( On ) )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
+ PORT_START("IN0")
+ PORT_DIPNAME( 0x01, 0x00, "0-0" )
+ PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x01, DEF_STR( On ) )
+ PORT_DIPNAME( 0x02, 0x00, "0-1" )
+ PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x02, DEF_STR( On ) )
+ PORT_DIPNAME( 0x04, 0x00, "0-2" )
+ PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x04, DEF_STR( On ) )
+ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START1 )
+ PORT_DIPNAME( 0x010, 0x10, "0-3" )
+ PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x010, DEF_STR( On ) )
+ PORT_DIPNAME( 0x020, 0x20, "Test Mode" )
+ PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x000, DEF_STR( On ) )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
INPUT_PORTS_END
static INTERRUPT_GEN( laserbas_interrupt )
diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c
index 2b3eef6d967..94f16199eda 100644
--- a/src/mame/drivers/laserbat.c
+++ b/src/mame/drivers/laserbat.c
@@ -222,7 +222,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( laserbat )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -232,7 +232,7 @@ static INPUT_PORTS_START( laserbat )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -254,7 +254,7 @@ static INPUT_PORTS_START( laserbat )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Reset")
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) )
@@ -278,7 +278,7 @@ static INPUT_PORTS_START( laserbat )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -296,12 +296,12 @@ static INPUT_PORTS_START( laserbat )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
- PORT_START_TAG("SENSE") /* SENSE */
+ PORT_START("SENSE") /* SENSE */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
INPUT_PORTS_END
static INPUT_PORTS_START( lazarian )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -311,7 +311,7 @@ static INPUT_PORTS_START( lazarian )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -333,7 +333,7 @@ static INPUT_PORTS_START( lazarian )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Reset")
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -356,7 +356,7 @@ static INPUT_PORTS_START( lazarian )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -374,12 +374,12 @@ static INPUT_PORTS_START( lazarian )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
- PORT_START_TAG("SENSE") /* SENSE */
+ PORT_START("SENSE") /* SENSE */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
INPUT_PORTS_END
static INPUT_PORTS_START( catnmous )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -389,7 +389,7 @@ static INPUT_PORTS_START( catnmous )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -407,7 +407,7 @@ static INPUT_PORTS_START( catnmous )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Reset")
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) )
@@ -431,7 +431,7 @@ static INPUT_PORTS_START( catnmous )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -457,7 +457,7 @@ static INPUT_PORTS_START( catnmous )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SENSE") /* SENSE */
+ PORT_START("SENSE") /* SENSE */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
INPUT_PORTS_END
diff --git a/src/mame/drivers/lasso.c b/src/mame/drivers/lasso.c
index 3f4d7a7dafd..139857933cd 100644
--- a/src/mame/drivers/lasso.c
+++ b/src/mame/drivers/lasso.c
@@ -211,7 +211,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( lasso )
- PORT_START_TAG("1804")
+ PORT_START("1804")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -221,7 +221,7 @@ static INPUT_PORTS_START( lasso )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("1805")
+ PORT_START("1805")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
@@ -231,7 +231,7 @@ static INPUT_PORTS_START( lasso )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("1806")
+ PORT_START("1806")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:!1")
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -256,7 +256,7 @@ static INPUT_PORTS_START( lasso )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START_TAG("1807")
+ PORT_START("1807")
PORT_DIPNAME( 0x01, 0x00, "Warm-Up" ) PORT_DIPLOCATION("SW1:!3")
PORT_DIPSETTING( 0x01, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
diff --git a/src/mame/drivers/lastduel.c b/src/mame/drivers/lastduel.c
index 9b7dae8b5ae..7c397bdfeab 100644
--- a/src/mame/drivers/lastduel.c
+++ b/src/mame/drivers/lastduel.c
@@ -347,7 +347,7 @@ MACHINE_DRIVER_END
/******************************************************************************/
static INPUT_PORTS_START( lastduel )
- PORT_START
+ PORT_START("P1_P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -365,7 +365,7 @@ static INPUT_PORTS_START( lastduel )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -375,7 +375,7 @@ static INPUT_PORTS_START( lastduel )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) )
@@ -423,7 +423,7 @@ static INPUT_PORTS_START( lastduel )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -450,7 +450,7 @@ static INPUT_PORTS_START( lastduel )
INPUT_PORTS_END
static INPUT_PORTS_START( madgear )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Allow_Continue ) )
PORT_DIPSETTING( 0x0000, DEF_STR( No ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Yes ) )
@@ -496,7 +496,7 @@ static INPUT_PORTS_START( madgear )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_SERVICE( 0x8000, IP_ACTIVE_LOW )
- PORT_START /* Dip switch C, free play is COIN B all off, COIN A all on */
+ PORT_START("DSW2") /* Dip switch C, free play is COIN B all off, COIN A all on */
PORT_DIPNAME( 0x0f00, 0x0f00, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x0200, DEF_STR( 6C_1C ) )
PORT_DIPSETTING( 0x0400, DEF_STR( 5C_1C ) )
@@ -532,7 +532,7 @@ static INPUT_PORTS_START( madgear )
PORT_DIPSETTING( 0xa000, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Free_Play ) )
- PORT_START
+ PORT_START("P1_P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -550,7 +550,7 @@ static INPUT_PORTS_START( madgear )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_START1 )
diff --git a/src/mame/drivers/lastfght.c b/src/mame/drivers/lastfght.c
index 7d8b1c54c09..b5fc3d07d67 100644
--- a/src/mame/drivers/lastfght.c
+++ b/src/mame/drivers/lastfght.c
@@ -384,7 +384,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( lastfght )
- PORT_START_TAG("IN0") /* IN0 - c00002&3 */
+ PORT_START("IN0") /* IN0 - c00002&3 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Reset") PORT_CODE(KEYCODE_F1)
@@ -403,7 +403,7 @@ static INPUT_PORTS_START( lastfght )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 - c00004&5 */
+ PORT_START("IN1") /* IN1 - c00004&5 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -422,7 +422,7 @@ static INPUT_PORTS_START( lastfght )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("IN2") /* IN2 - c00006&7 */
+ PORT_START("IN2") /* IN2 - c00006&7 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/lazercmd.c b/src/mame/drivers/lazercmd.c
index d1391649858..71cc7a519d3 100644
--- a/src/mame/drivers/lazercmd.c
+++ b/src/mame/drivers/lazercmd.c
@@ -451,21 +451,21 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( lazercmd )
- PORT_START_TAG("IN0") /* IN0 player 1 controls */
+ PORT_START("IN0") /* IN0 player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* IN1 player 2 controls */
+ PORT_START("IN1") /* IN1 player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW") /* IN2 dip switch */
+ PORT_START("DSW") /* IN2 dip switch */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Game_Time ) )
PORT_DIPSETTING( 0x00, "60 seconds" )
PORT_DIPSETTING( 0x01, "90 seconds" )
@@ -482,7 +482,7 @@ static INPUT_PORTS_START( lazercmd )
// PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
// PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN2") /* IN3 coinage & start */
+ PORT_START("IN2") /* IN3 coinage & start */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -491,7 +491,7 @@ static INPUT_PORTS_START( lazercmd )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN3") /* IN4 player 1 + 2 buttons */
+ PORT_START("IN3") /* IN4 player 1 + 2 buttons */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
@@ -500,19 +500,19 @@ static INPUT_PORTS_START( lazercmd )
INPUT_PORTS_END
static INPUT_PORTS_START( medlanes )
- PORT_START_TAG("IN0") /* IN0 player 1 controls */
+ PORT_START("IN0") /* IN0 player 1 controls */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* IN1 player 1 controls */
+ PORT_START("IN1") /* IN1 player 1 controls */
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Hook Left") PORT_CODE(KEYCODE_Z)
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Hook Right") PORT_CODE(KEYCODE_X)
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_START_TAG("DSW") /* IN2 dip switch */
+ PORT_START("DSW") /* IN2 dip switch */
PORT_DIPNAME( 0x01, 0x01, "Game Timer" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -530,7 +530,7 @@ static INPUT_PORTS_START( medlanes )
// PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
// PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN2") /* IN3 coinage & start */
+ PORT_START("IN2") /* IN3 coinage & start */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -538,26 +538,26 @@ static INPUT_PORTS_START( medlanes )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0xf4, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN3") /* IN4 not used */
+ PORT_START("IN3") /* IN4 not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( bbonk )
- PORT_START_TAG("IN0") /* IN0 player 1 controls */
+ PORT_START("IN0") /* IN0 player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* IN1 player 2 controls */
+ PORT_START("IN1") /* IN1 player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW") /* IN2 dip switch */
+ PORT_START("DSW") /* IN2 dip switch */
PORT_DIPNAME( 0x03, 0x02, "Games to win" )
PORT_DIPSETTING( 0x02, "2" )
PORT_DIPSETTING( 0x03, "3" )
@@ -572,7 +572,7 @@ static INPUT_PORTS_START( bbonk )
// PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
// PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN2") /* IN3 coinage & start */
+ PORT_START("IN2") /* IN3 coinage & start */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -580,7 +580,7 @@ static INPUT_PORTS_START( bbonk )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0xf4, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN3") /* IN4 not used */
+ PORT_START("IN3") /* IN4 not used */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/legionna.c b/src/mame/drivers/legionna.c
index 47c5aad0264..ac8570ce9f9 100644
--- a/src/mame/drivers/legionna.c
+++ b/src/mame/drivers/legionna.c
@@ -221,7 +221,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( legionna )
SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x001f, 0x001f, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0015, DEF_STR( 6C_1C ) )
PORT_DIPSETTING( 0x0017, DEF_STR( 5C_1C ) )
@@ -275,7 +275,7 @@ static INPUT_PORTS_START( legionna )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x8000, DEF_STR( On ) )
- PORT_START_TAG("PLAYERS12")
+ PORT_START("PLAYERS12")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -293,7 +293,7 @@ static INPUT_PORTS_START( legionna )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -309,7 +309,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( heatbrl )
SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x001f, 0x001f, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0015, DEF_STR( 6C_1C ) )
PORT_DIPSETTING( 0x0017, DEF_STR( 5C_1C ) )
@@ -361,7 +361,7 @@ static INPUT_PORTS_START( heatbrl )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x8000, DEF_STR( On ) )
- PORT_START_TAG("PLAYERS12")
+ PORT_START("PLAYERS12")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -379,7 +379,7 @@ static INPUT_PORTS_START( heatbrl )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -390,7 +390,7 @@ static INPUT_PORTS_START( heatbrl )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN4 ) // haven't found coin4, maybe it doesn't exist
// PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("PLAYERS34")
+ PORT_START("PLAYERS34")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -413,7 +413,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( godzilla )
SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -463,7 +463,7 @@ static INPUT_PORTS_START( godzilla )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("PLAYERS12")
+ PORT_START("PLAYERS12")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -481,7 +481,7 @@ static INPUT_PORTS_START( godzilla )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -492,7 +492,7 @@ static INPUT_PORTS_START( godzilla )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("PLAYERS34")
+ PORT_START("PLAYERS34")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -514,7 +514,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( sdgndmrb )
SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -564,7 +564,7 @@ static INPUT_PORTS_START( sdgndmrb )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("PLAYERS12")
+ PORT_START("PLAYERS12")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -582,7 +582,7 @@ static INPUT_PORTS_START( sdgndmrb )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -593,7 +593,7 @@ static INPUT_PORTS_START( sdgndmrb )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("PLAYERS34")
+ PORT_START("PLAYERS34")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -611,7 +611,7 @@ static INPUT_PORTS_START( sdgndmrb )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -665,7 +665,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( denjinmk )
SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -726,7 +726,7 @@ static INPUT_PORTS_START( denjinmk )
PORT_DIPSETTING( 0xe000, "e" )
PORT_DIPSETTING( 0xf000, "f" )
- PORT_START_TAG("PLAYERS12")
+ PORT_START("PLAYERS12")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -744,7 +744,7 @@ static INPUT_PORTS_START( denjinmk )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -755,7 +755,7 @@ static INPUT_PORTS_START( denjinmk )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("PLAYERS34")
+ PORT_START("PLAYERS34")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -773,7 +773,7 @@ static INPUT_PORTS_START( denjinmk )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -828,7 +828,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( cupsoc )
SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0007, 0x0007, "Coin 1 (3)" )
PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) )
@@ -871,7 +871,7 @@ static INPUT_PORTS_START( cupsoc )
PORT_DIPSETTING( 0xc000, "3:30" )
PORT_DIPSETTING( 0x4000, "4:00" )
- PORT_START_TAG("PLAYERS12")
+ PORT_START("PLAYERS12")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -889,7 +889,7 @@ static INPUT_PORTS_START( cupsoc )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) //TEST
@@ -899,7 +899,7 @@ static INPUT_PORTS_START( cupsoc )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START4 )
PORT_BIT( 0xfc00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("PLAYERS34")
+ PORT_START("PLAYERS34")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -917,7 +917,7 @@ static INPUT_PORTS_START( cupsoc )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) )
diff --git a/src/mame/drivers/leland.c b/src/mame/drivers/leland.c
index c06ad41cb67..aeb623f5a5f 100644
--- a/src/mame/drivers/leland.c
+++ b/src/mame/drivers/leland.c
@@ -128,43 +128,43 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( cerberus ) /* complete, verified from code */
- PORT_START_TAG("IN0") /* 0x80 */
+ PORT_START("IN0") /* 0x80 */
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_PLAYER(1)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1") /* 0x81 */
+ PORT_START("IN1") /* 0x81 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SLAVEHALT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* 0x90 */
+ PORT_START("IN2") /* 0x90 */
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_PLAYER(2)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_START_TAG("IN3") /* 0x91 */
+ PORT_START("IN3") /* 0x91 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN0") /* Analog joystick 1 */
+ PORT_START("AN0") /* Analog joystick 1 */
PORT_BIT( 0xff, 0, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0xff, 0, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("AN2") /* Analog joystick 2 */
- PORT_START_TAG("AN3")
- PORT_START_TAG("AN4") /* Analog joystick 3 */
- PORT_START_TAG("AN5")
+ PORT_START("AN2") /* Analog joystick 2 */
+ PORT_START("AN3")
+ PORT_START("AN4") /* Analog joystick 3 */
+ PORT_START("AN5")
INPUT_PORTS_END
static INPUT_PORTS_START( mayhem ) /* complete, verified from code */
- PORT_START_TAG("IN0") /* 0xC0 */
+ PORT_START("IN0") /* 0xC0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
@@ -174,14 +174,14 @@ static INPUT_PORTS_START( mayhem ) /* complete, verified from code */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1") /* 0xC1 */
+ PORT_START("IN1") /* 0xC1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SLAVEHALT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* 0xD0 */
+ PORT_START("IN2") /* 0xD0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -191,209 +191,209 @@ static INPUT_PORTS_START( mayhem ) /* complete, verified from code */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
- PORT_START_TAG("IN3") /* 0xD1 */
+ PORT_START("IN3") /* 0xD1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN0") /* Analog joystick 1 */
- PORT_START_TAG("AN1")
- PORT_START_TAG("AN2") /* Analog joystick 2 */
- PORT_START_TAG("AN3")
- PORT_START_TAG("AN4") /* Analog joystick 3 */
- PORT_START_TAG("AN5")
+ PORT_START("AN0") /* Analog joystick 1 */
+ PORT_START("AN1")
+ PORT_START("AN2") /* Analog joystick 2 */
+ PORT_START("AN3")
+ PORT_START("AN4") /* Analog joystick 3 */
+ PORT_START("AN5")
INPUT_PORTS_END
static INPUT_PORTS_START( wseries ) /* complete, verified from code */
- PORT_START_TAG("IN0") /* 0x80 */
+ PORT_START("IN0") /* 0x80 */
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Extra Base") PORT_PLAYER(1)
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Go Back") PORT_PLAYER(1)
- PORT_START_TAG("IN1") /* 0x81 */
+ PORT_START("IN1") /* 0x81 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SLAVEHALT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* 0x90 */
+ PORT_START("IN2") /* 0x90 */
PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Aim") PORT_PLAYER(1)
- PORT_START_TAG("IN3") /* 0x91 */
+ PORT_START("IN3") /* 0x91 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) PORT_PLAYER(1)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN0") /* Analog joystick 1 */
+ PORT_START("AN0") /* Analog joystick 1 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN2") /* Analog joystick 2 */
- PORT_START_TAG("AN3")
- PORT_START_TAG("AN4") /* Analog joystick 3 */
+ PORT_START("AN2") /* Analog joystick 2 */
+ PORT_START("AN3")
+ PORT_START("AN4") /* Analog joystick 3 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("AN5")
+ PORT_START("AN5")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( alleymas ) /* complete, verified from code */
- PORT_START_TAG("IN0") /* 0xC0 */
+ PORT_START("IN0") /* 0xC0 */
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN1") /* 0xC1 */
+ PORT_START("IN1") /* 0xC1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SLAVEHALT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* 0xD0 */
+ PORT_START("IN2") /* 0xD0 */
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
// PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) /* redundant inputs */
// PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* redundant inputs */
- PORT_START_TAG("IN3") /* 0xD1 */
+ PORT_START("IN3") /* 0xD1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) PORT_PLAYER(1)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN0") /* Analog joystick 1 */
+ PORT_START("AN0") /* Analog joystick 1 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0,224) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN2") /* Analog joystick 2 */
- PORT_START_TAG("AN3")
- PORT_START_TAG("AN4") /* Analog joystick 3 */
- PORT_START_TAG("AN5")
+ PORT_START("AN2") /* Analog joystick 2 */
+ PORT_START("AN3")
+ PORT_START("AN4") /* Analog joystick 3 */
+ PORT_START("AN5")
INPUT_PORTS_END
static INPUT_PORTS_START( upyoural ) /* complete, verified from code */
- PORT_START_TAG("IN0") /* 0xC0 */
+ PORT_START("IN0") /* 0xC0 */
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON4 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN1") /* 0xC1 */
+ PORT_START("IN1") /* 0xC1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SLAVEHALT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* 0xD0 */
+ PORT_START("IN2") /* 0xD0 */
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_START_TAG("IN3") /* 0xD1 */
+ PORT_START("IN3") /* 0xD1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) PORT_PLAYER(1)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN0") /* Analog joystick 1 */
+ PORT_START("AN0") /* Analog joystick 1 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0,224) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN2") /* Analog joystick 2 */
- PORT_START_TAG("AN3")
- PORT_START_TAG("AN4") /* Analog joystick 3 */
- PORT_START_TAG("AN5")
+ PORT_START("AN2") /* Analog joystick 2 */
+ PORT_START("AN3")
+ PORT_START("AN4") /* Analog joystick 3 */
+ PORT_START("AN5")
INPUT_PORTS_END
static INPUT_PORTS_START( dangerz ) /* complete, verified from code */
- PORT_START_TAG("IN0") /* 0x80 */
+ PORT_START("IN0") /* 0x80 */
PORT_BIT( 0x1f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* 0x81 */
+ PORT_START("IN1") /* 0x81 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SLAVEHALT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* 0x90 */
+ PORT_START("IN2") /* 0x90 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* 0x91 */
+ PORT_START("IN3") /* 0x91 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN0") /* Analog 1 */
+ PORT_START("AN0") /* Analog 1 */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN1") /* Analog 2 */
+ PORT_START("AN1") /* Analog 2 */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
INPUT_PORTS_END
static INPUT_PORTS_START( basebal2 ) /* complete, verified from code */
- PORT_START_TAG("IN0") /* 0x40/C0 */
+ PORT_START("IN0") /* 0x40/C0 */
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* read by strkzone, but never referenced */
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Extra Base") PORT_PLAYER(1)
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Go Back") PORT_PLAYER(1)
- PORT_START_TAG("IN1") /* 0x41/C1 */
+ PORT_START("IN1") /* 0x41/C1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SLAVEHALT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* 0x50/D0 */
+ PORT_START("IN2") /* 0x50/D0 */
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("R Run/Steal") PORT_PLAYER(1)
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("L Run/Steal") PORT_PLAYER(1)
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Run/Aim") PORT_PLAYER(1)
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Run/Cutoff") PORT_PLAYER(1)
- PORT_START_TAG("IN3") /* 0x51/D1 */
+ PORT_START("IN3") /* 0x51/D1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) PORT_PLAYER(1)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN0") /* Analog joystick 1 */
+ PORT_START("AN0") /* Analog joystick 1 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN2") /* Analog joystick 2 */
- PORT_START_TAG("AN3")
- PORT_START_TAG("AN4") /* Analog joystick 3 */
+ PORT_START("AN2") /* Analog joystick 2 */
+ PORT_START("AN3")
+ PORT_START("AN4") /* Analog joystick 3 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("AN5")
+ PORT_START("AN5")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( redline ) /* complete, verified in code */
- PORT_START_TAG("IN0") /* 0xC0 */
+ PORT_START("IN0") /* 0xC0 */
PORT_BIT( 0x1f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xe0, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0xe0) PORT_SENSITIVITY(100) PORT_KEYDELTA(64) PORT_PLAYER(1)
- PORT_START_TAG("IN1") /* 0xC1 */
+ PORT_START("IN1") /* 0xC1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SLAVEHALT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -401,39 +401,39 @@ static INPUT_PORTS_START( redline ) /* complete, verified in code */
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* used, but for what purpose? */
- PORT_START_TAG("IN2") /* 0xD0 */
+ PORT_START("IN2") /* 0xD0 */
PORT_BIT( 0x1f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xe0, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0xe0) PORT_SENSITIVITY(100) PORT_KEYDELTA(64) PORT_PLAYER(2)
- PORT_START_TAG("IN3") /* 0xD1 */
+ PORT_START("IN3") /* 0xD1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN0") /* Analog wheel 1 */
+ PORT_START("AN0") /* Analog wheel 1 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN1") /* Analog wheel 2 */
+ PORT_START("AN1") /* Analog wheel 2 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( quarterb ) /* complete, verified in code */
- PORT_START_TAG("IN0") /* 0x80 */
+ PORT_START("IN0") /* 0x80 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x0e, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* 0x81 */
+ PORT_START("IN1") /* 0x81 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SLAVEHALT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* 0x90 */
+ PORT_START("IN2") /* 0x90 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
@@ -443,39 +443,39 @@ static INPUT_PORTS_START( quarterb ) /* complete, verified in code */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_START_TAG("IN3") /* 0x91 */
+ PORT_START("IN3") /* 0x91 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN0") /* Analog spring stick 1 */
+ PORT_START("AN0") /* Analog spring stick 1 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN1") /* Analog spring stick 2 */
+ PORT_START("AN1") /* Analog spring stick 2 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN2") /* Analog spring stick 3 */
- PORT_START_TAG("AN3") /* Analog spring stick 4 */
- PORT_START_TAG("AN4") /* Analog spring stick 5 */
- PORT_START_TAG("AN5") /* Analog spring stick 6 */
+ PORT_START("AN2") /* Analog spring stick 3 */
+ PORT_START("AN3") /* Analog spring stick 4 */
+ PORT_START("AN4") /* Analog spring stick 5 */
+ PORT_START("AN5") /* Analog spring stick 6 */
INPUT_PORTS_END
static INPUT_PORTS_START( teamqb ) /* complete, verified in code */
- PORT_START_TAG("IN0") /* 0x80 */
+ PORT_START("IN0") /* 0x80 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x0e, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* 0x81 */
+ PORT_START("IN1") /* 0x81 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SLAVEHALT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* 0x90 */
+ PORT_START("IN2") /* 0x90 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
@@ -485,25 +485,25 @@ static INPUT_PORTS_START( teamqb ) /* complete, verified in code */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_START_TAG("IN3") /* 0x91 */
+ PORT_START("IN3") /* 0x91 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN0") /* Analog spring stick 1 */
+ PORT_START("AN0") /* Analog spring stick 1 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN1") /* Analog spring stick 2 */
+ PORT_START("AN1") /* Analog spring stick 2 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN2") /* Analog spring stick 3 */
- PORT_START_TAG("AN3") /* Analog spring stick 4 */
- PORT_START_TAG("AN4") /* Analog spring stick 5 */
+ PORT_START("AN2") /* Analog spring stick 3 */
+ PORT_START("AN3") /* Analog spring stick 4 */
+ PORT_START("AN4") /* Analog spring stick 5 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(3)
- PORT_START_TAG("AN5") /* Analog spring stick 6 */
+ PORT_START("AN5") /* Analog spring stick 6 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(3)
- PORT_START_TAG("IN4") /* 0x7C */
+ PORT_START("IN4") /* 0x7C */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
PORT_BIT( 0x0e, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
@@ -511,7 +511,7 @@ static INPUT_PORTS_START( teamqb ) /* complete, verified in code */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4 )
- PORT_START_TAG("IN5") /* 0x7F */
+ PORT_START("IN5") /* 0x7F */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(4)
@@ -524,51 +524,51 @@ INPUT_PORTS_END
static INPUT_PORTS_START( aafb2p ) /* complete, verified in code */
- PORT_START_TAG("IN0") /* 0x80 */
+ PORT_START("IN0") /* 0x80 */
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* 0x81 */
+ PORT_START("IN1") /* 0x81 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SLAVEHALT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* 0x90 */
+ PORT_START("IN2") /* 0x90 */
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_START_TAG("IN3") /* 0x91 */
+ PORT_START("IN3") /* 0x91 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN0") /* Analog spring stick 1 */
+ PORT_START("AN0") /* Analog spring stick 1 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN1") /* Analog spring stick 2 */
+ PORT_START("AN1") /* Analog spring stick 2 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN2") /* Analog spring stick 3 */
- PORT_START_TAG("AN3") /* Analog spring stick 4 */
- PORT_START_TAG("AN4") /* Analog spring stick 5 */
+ PORT_START("AN2") /* Analog spring stick 3 */
+ PORT_START("AN3") /* Analog spring stick 4 */
+ PORT_START("AN4") /* Analog spring stick 5 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("AN5") /* Analog spring stick 6 */
+ PORT_START("AN5") /* Analog spring stick 6 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("IN4") /* 0x7C */
+ PORT_START("IN4") /* 0x7C */
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN5") /* 0x7F */
+ PORT_START("IN5") /* 0x7F */
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -578,7 +578,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( offroad ) /* complete, verified from code */
- PORT_START_TAG("IN0") /* 0xC0 */
+ PORT_START("IN0") /* 0xC0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* read */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* read */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* read */
@@ -588,40 +588,40 @@ static INPUT_PORTS_START( offroad ) /* complete, verified from code */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* 0xC1 */
+ PORT_START("IN1") /* 0xC1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SLAVEHALT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* 0xD0 */
+ PORT_START("IN2") /* 0xD0 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* 0xD1 */
+ PORT_START("IN3") /* 0xD1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE_NO_TOGGLE( 0x08, IP_ACTIVE_LOW )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN0") /* Analog pedal 1 */
+ PORT_START("AN0") /* Analog pedal 1 */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN1") /* Analog pedal 2 */
+ PORT_START("AN1") /* Analog pedal 2 */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("AN2") /* Analog pedal 3 */
+ PORT_START("AN2") /* Analog pedal 3 */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(3)
- PORT_START_TAG("AN3") /* Analog wheel 1 */
+ PORT_START("AN3") /* Analog wheel 1 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN4") /* Analog wheel 2 */
+ PORT_START("AN4") /* Analog wheel 2 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("AN5") /* Analog wheel 3 */
+ PORT_START("AN5") /* Analog wheel 3 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(3)
INPUT_PORTS_END
static INPUT_PORTS_START( pigout ) /* complete, verified from code */
- PORT_START_TAG("IN0") /* 0x40 */
+ PORT_START("IN0") /* 0x40 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
@@ -631,14 +631,14 @@ static INPUT_PORTS_START( pigout ) /* complete, verified from code */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("IN1") /* 0x41 */
+ PORT_START("IN1") /* 0x41 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SLAVEHALT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* read, but never referenced */
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* 0x50 */
+ PORT_START("IN2") /* 0x50 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -648,13 +648,13 @@ static INPUT_PORTS_START( pigout ) /* complete, verified from code */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("IN3") /* 0x51 */
+ PORT_START("IN3") /* 0x51 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN4") /* 0x7F */
+ PORT_START("IN4") /* 0x7F */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c
index 5b7c396d5a0..0622f4b1729 100644
--- a/src/mame/drivers/lemmings.c
+++ b/src/mame/drivers/lemmings.c
@@ -134,7 +134,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( lemmings )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Select")
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Hurry")
@@ -152,7 +152,7 @@ static INPUT_PORTS_START( lemmings )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* Credits */
+ PORT_START("IN1") /* Credits */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_SERVICE_NO_TOGGLE(0x0004, IP_ACTIVE_LOW)
@@ -163,7 +163,7 @@ static INPUT_PORTS_START( lemmings )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Credits for 1 Player" )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -186,7 +186,7 @@ static INPUT_PORTS_START( lemmings )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x06, DEF_STR( 1C_2C ) )
@@ -212,16 +212,16 @@ static INPUT_PORTS_START( lemmings )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("AN0")
+ PORT_START("AN0")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("AN3")
+ PORT_START("AN3")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) PORT_PLAYER(2)
INPUT_PORTS_END
diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c
index 1bab23281a7..3d5592c2c40 100644
--- a/src/mame/drivers/lethal.c
+++ b/src/mame/drivers/lethal.c
@@ -523,7 +523,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( lethalen )
/* IN 0 */
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -534,7 +534,7 @@ static INPUT_PORTS_START( lethalen )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
/* IN 1 */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -553,25 +553,25 @@ static INPUT_PORTS_START( lethalen )
PORT_DIPSETTING( 0x0080, DEF_STR( Stereo ) )
/* IN 2 */
- PORT_START_TAG("LIGHT0_X")
+ PORT_START("LIGHT0_X")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1)
/* IN 3 */
- PORT_START_TAG("LIGHT0_Y")
+ PORT_START("LIGHT0_Y")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, -1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1)
/* IN 4 */
- PORT_START_TAG("LIGHT1_X")
+ PORT_START("LIGHT1_X")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(2)
/* IN 5 */
- PORT_START_TAG("LIGHT1_Y")
+ PORT_START("LIGHT1_Y")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, -1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( lethalej )
/* IN 0 */
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -582,7 +582,7 @@ static INPUT_PORTS_START( lethalej )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
/* IN 1 */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -601,19 +601,19 @@ static INPUT_PORTS_START( lethalej )
PORT_DIPSETTING( 0x0080, DEF_STR( Stereo ) )
/* IN 2 */
- PORT_START_TAG("LIGHT0_X")
+ PORT_START("LIGHT0_X")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, -1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1) PORT_REVERSE
/* IN 3 */
- PORT_START_TAG("LIGHT0_Y")
+ PORT_START("LIGHT0_Y")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, -1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1) PORT_REVERSE
/* IN 4 */
- PORT_START_TAG("LIGHT1_X")
+ PORT_START("LIGHT1_X")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, -1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(2) PORT_REVERSE
/* IN 5 */
- PORT_START_TAG("LIGHT1_Y")
+ PORT_START("LIGHT1_Y")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, -1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(2) PORT_REVERSE
INPUT_PORTS_END
diff --git a/src/mame/drivers/lethalj.c b/src/mame/drivers/lethalj.c
index 5895a763817..44bb54940c9 100644
--- a/src/mame/drivers/lethalj.c
+++ b/src/mame/drivers/lethalj.c
@@ -143,14 +143,14 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( lethalj )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0003, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* ??? Seems to be rigged up to the auto scroll, and acts as a fast forward*/
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0xffe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -190,22 +190,22 @@ static INPUT_PORTS_START( lethalj )
PORT_DIPSETTING( 0x0000, "-2.5" )
PORT_DIPSETTING( 0x8000, "+0" )
- PORT_START_TAG("LIGHT0_X") /* fake analog X */
+ PORT_START("LIGHT0_X") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("LIGHT0_Y") /* fake analog Y */
+ PORT_START("LIGHT0_Y") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10)
- PORT_START_TAG("LIGHT1_X") /* fake analog X */
+ PORT_START("LIGHT1_X") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("LIGHT1_Y") /* fake analog Y */
+ PORT_START("LIGHT1_Y") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( eggventr )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -235,7 +235,7 @@ static INPUT_PORTS_START( eggventr )
PORT_DIPSETTING( 0x1000, DEF_STR( On ) ) // but not actually called (EC).
PORT_BIT( 0xe000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
@@ -244,22 +244,22 @@ static INPUT_PORTS_START( eggventr )
PORT_BIT( 0x7f00, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("LIGHT0_X") /* fake analog X */
+ PORT_START("LIGHT0_X") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("LIGHT0_Y") /* fake analog Y */
+ PORT_START("LIGHT0_Y") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10)
- PORT_START_TAG("LIGHT1_X") /* fake analog X */
+ PORT_START("LIGHT1_X") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("LIGHT1_Y") /* fake analog Y */
+ PORT_START("LIGHT1_Y") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( eggvntdx )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -286,7 +286,7 @@ static INPUT_PORTS_START( eggvntdx )
PORT_DIPSETTING( 0x0000, DEF_STR( Hard ) )
PORT_BIT( 0xe000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
@@ -295,28 +295,28 @@ static INPUT_PORTS_START( eggvntdx )
PORT_BIT( 0x7f00, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("LIGHT0_X") /* fake analog X */
+ PORT_START("LIGHT0_X") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("LIGHT0_Y") /* fake analog Y */
+ PORT_START("LIGHT0_Y") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10)
- PORT_START_TAG("LIGHT1_X") /* fake analog X */
+ PORT_START("LIGHT1_X") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("LIGHT1_Y") /* fake analog Y */
+ PORT_START("LIGHT1_Y") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( ripribit )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(ticket_status, NULL)
PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE_NO_TOGGLE( 0x0002, IP_ACTIVE_HIGH )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -356,15 +356,15 @@ static INPUT_PORTS_START( ripribit )
PORT_DIPSETTING( 0x2000, "800" )
PORT_DIPSETTING( 0x0000, "1000" )
- PORT_START_TAG("LIGHT0_X") /* fake analog X */
- PORT_START_TAG("LIGHT0_Y") /* fake analog Y */
- PORT_START_TAG("LIGHT1_X") /* fake analog X */
- PORT_START_TAG("LIGHT1_Y") /* fake analog Y */
+ PORT_START("LIGHT0_X") /* fake analog X */
+ PORT_START("LIGHT0_Y") /* fake analog Y */
+ PORT_START("LIGHT1_X") /* fake analog X */
+ PORT_START("LIGHT1_Y") /* fake analog Y */
INPUT_PORTS_END
static INPUT_PORTS_START( cfarm )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE_NO_TOGGLE( 0x0002, IP_ACTIVE_HIGH )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -404,7 +404,7 @@ static INPUT_PORTS_START( cfarm )
PORT_DIPSETTING( 0x2000, "8" )
PORT_DIPSETTING( 0x0000, "10" )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(ticket_status, NULL)
PORT_BIT( 0x0006, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -412,15 +412,15 @@ static INPUT_PORTS_START( cfarm )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("LIGHT0_X") /* fake analog X */
- PORT_START_TAG("LIGHT0_Y") /* fake analog Y */
- PORT_START_TAG("LIGHT1_X") /* fake analog X */
- PORT_START_TAG("LIGHT1_Y") /* fake analog Y */
+ PORT_START("LIGHT0_X") /* fake analog X */
+ PORT_START("LIGHT0_Y") /* fake analog Y */
+ PORT_START("LIGHT1_X") /* fake analog X */
+ PORT_START("LIGHT1_Y") /* fake analog Y */
INPUT_PORTS_END
static INPUT_PORTS_START( cclownz )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE_NO_TOGGLE( 0x0002, IP_ACTIVE_HIGH )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -460,19 +460,19 @@ static INPUT_PORTS_START( cclownz )
PORT_DIPSETTING( 0x2000, "2400" )
PORT_DIPSETTING( 0x0000, "3000" )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0f0f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(cclownz_paddle, NULL)
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(ticket_status, NULL)
PORT_BIT( 0x0060, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("LIGHT0_X") /* fake analog X */
- PORT_START_TAG("LIGHT0_Y") /* fake analog Y */
- PORT_START_TAG("LIGHT1_X") /* fake analog X */
- PORT_START_TAG("LIGHT1_Y") /* fake analog Y */
+ PORT_START("LIGHT0_X") /* fake analog X */
+ PORT_START("LIGHT0_Y") /* fake analog Y */
+ PORT_START("LIGHT1_X") /* fake analog X */
+ PORT_START("LIGHT1_Y") /* fake analog Y */
- PORT_START_TAG("PADDLE")
+ PORT_START("PADDLE")
PORT_BIT( 0x00ff, 0x0000, IPT_PADDLE ) PORT_PLAYER(1) PORT_SENSITIVITY(50) PORT_KEYDELTA(8) PORT_CENTERDELTA(0) PORT_REVERSE
INPUT_PORTS_END
diff --git a/src/mame/drivers/lgp.c b/src/mame/drivers/lgp.c
index 0eaecd9b72e..b29c806c868 100644
--- a/src/mame/drivers/lgp.c
+++ b/src/mame/drivers/lgp.c
@@ -165,7 +165,7 @@ ADDRESS_MAP_END
/* PORTS */
/* (DIPLOCATION diplay inverted) */
static INPUT_PORTS_START( lgp )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x03, 0x03, "1st Round" ) PORT_DIPLOCATION("SWA:2,1")
PORT_DIPSETTING( 0x03, "68 Seconds" )
PORT_DIPSETTING( 0x02, "66 Seconds" )
@@ -187,7 +187,7 @@ static INPUT_PORTS_START( lgp )
PORT_DIPSETTING( 0x40, "40 Seconds" )
PORT_DIPSETTING( 0x00, "38 Seconds" )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SWB:4,3,2,1")
PORT_DIPSETTING( 0x00, DEF_STR( 9C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 8C_1C ) )
@@ -223,7 +223,7 @@ static INPUT_PORTS_START( lgp )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_8C ) )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SWC:1")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -250,7 +250,7 @@ static INPUT_PORTS_START( lgp )
PORT_DIPSETTING( 0x80, "2-Ways" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE ) /* Manual says service switch simply increases credit count. */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_TILT )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -260,7 +260,7 @@ static INPUT_PORTS_START( lgp )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 )
@@ -271,7 +271,7 @@ static INPUT_PORTS_START( lgp )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON6 )
/*
- PORT_START_TAG("IN_TEST")
+ PORT_START("IN_TEST")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 )
diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c
index 0abeac8b7e9..f147e43acbb 100644
--- a/src/mame/drivers/liberate.c
+++ b/src/mame/drivers/liberate.c
@@ -201,10 +201,10 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( generic_input )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -214,7 +214,7 @@ static INPUT_PORTS_START( generic_input )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -224,7 +224,7 @@ static INPUT_PORTS_START( generic_input )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -234,7 +234,7 @@ static INPUT_PORTS_START( generic_input )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -258,7 +258,7 @@ static INPUT_PORTS_START( generic_input )
PORT_DIPSETTING( 0x00, "Data East USA" )
PORT_DIPSETTING( 0x80, "Data East Corporation" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/liberatr.c b/src/mame/drivers/liberatr.c
index ad7fe1ffe91..48810ff857c 100644
--- a/src/mame/drivers/liberatr.c
+++ b/src/mame/drivers/liberatr.c
@@ -275,7 +275,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( liberatr )
- PORT_START_TAG("IN0") /* IN0 - $5000 */
+ PORT_START("IN0") /* IN0 - $5000 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -287,7 +287,7 @@ static INPUT_PORTS_START( liberatr )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN1") /* IN1 - $5001 */
+ PORT_START("IN1") /* IN1 - $5001 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -297,7 +297,7 @@ static INPUT_PORTS_START( liberatr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH,IPT_VBLANK )
- PORT_START_TAG("DSW1") /* IN2 - Game Option switches DSW @ D4 on PCB */
+ PORT_START("DSW1") /* IN2 - Game Option switches DSW @ D4 on PCB */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "4" )
PORT_DIPSETTING( 0x01, "5" )
@@ -320,7 +320,7 @@ static INPUT_PORTS_START( liberatr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* IN3 - Pricing Option switches DSW @ A4 on PCB */
+ PORT_START("DSW2") /* IN3 - Pricing Option switches DSW @ A4 on PCB */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) )
@@ -345,7 +345,7 @@ static INPUT_PORTS_START( liberatr )
PORT_DIPSETTING ( 0xc0, "Freeze Mode" )
PORT_DIPSETTING ( 0xe0, "Freeze Mode" )
- PORT_START_TAG("FAKE") /* IN4 - FAKE - overlaps IN0 in the HW */
+ PORT_START("FAKE") /* IN4 - FAKE - overlaps IN0 in the HW */
PORT_BIT( 0x0f, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10)
PORT_BIT( 0xf0, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10)
INPUT_PORTS_END
diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c
index dfaeff349ef..0ce20489d49 100644
--- a/src/mame/drivers/limenko.c
+++ b/src/mame/drivers/limenko.c
@@ -313,7 +313,7 @@ static VIDEO_UPDATE( limenko )
*****************************************************************************************************/
static INPUT_PORTS_START( legendoh )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x00040000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -332,7 +332,7 @@ static INPUT_PORTS_START( legendoh )
PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(3)
PORT_BIT( 0x0000ffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x00040000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -351,7 +351,7 @@ static INPUT_PORTS_START( legendoh )
PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(4)
PORT_BIT( 0x0000ffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x00040000, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -373,7 +373,7 @@ static INPUT_PORTS_START( legendoh )
INPUT_PORTS_END
static INPUT_PORTS_START( sb2003 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x00040000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -384,7 +384,7 @@ static INPUT_PORTS_START( sb2003 )
PORT_BIT( 0x00800000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0xff00ffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x00040000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -395,7 +395,7 @@ static INPUT_PORTS_START( sb2003 )
PORT_BIT( 0x00800000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
PORT_BIT( 0xff00ffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x00040000, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -411,7 +411,7 @@ static INPUT_PORTS_START( sb2003 )
INPUT_PORTS_END
static INPUT_PORTS_START( spotty )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_NAME("Hold 1")
PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_NAME("Hold 2")
PORT_BIT( 0x00040000, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_NAME("Hold 3")
@@ -422,7 +422,7 @@ static INPUT_PORTS_START( spotty )
PORT_BIT( 0x00800000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xff00ffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x00040000, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -433,7 +433,7 @@ static INPUT_PORTS_START( spotty )
PORT_BIT( 0x00800000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xff00ffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x00040000, IP_ACTIVE_LOW, IPT_COIN1 )
diff --git a/src/mame/drivers/littlerb.c b/src/mame/drivers/littlerb.c
index 07609e381e1..3c850ca2901 100644
--- a/src/mame/drivers/littlerb.c
+++ b/src/mame/drivers/littlerb.c
@@ -211,7 +211,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( littlerb )
- PORT_START /* 16bit */
+ PORT_START("DSW") /* 16bit */
PORT_DIPNAME( 0x0003, 0x0001, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0003, "2" )
PORT_DIPSETTING( 0x0001, "3" )
@@ -260,7 +260,7 @@ static INPUT_PORTS_START( littlerb )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START /* 16bit */
+ PORT_START("P1") /* 16bit */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -280,7 +280,7 @@ static INPUT_PORTS_START( littlerb )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 16bit */
+ PORT_START("P2") /* 16bit */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c
index 63416375365..7fc805be3ab 100644
--- a/src/mame/drivers/lkage.c
+++ b/src/mame/drivers/lkage.c
@@ -145,7 +145,7 @@ ADDRESS_MAP_END
/***************************************************************************/
static INPUT_PORTS_START( lkage )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x03, "30000 100000" ) /* unverified */
PORT_DIPSETTING( 0x02, "30000 70000" ) /* unverified */
@@ -169,7 +169,7 @@ static INPUT_PORTS_START( lkage )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0f, DEF_STR( 9C_1C ) )
PORT_DIPSETTING( 0x0e, DEF_STR( 8C_1C ) )
@@ -205,7 +205,7 @@ static INPUT_PORTS_START( lkage )
PORT_DIPSETTING( 0x60, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x70, DEF_STR( 1C_8C ) )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -230,7 +230,7 @@ static INPUT_PORTS_START( lkage )
PORT_DIPSETTING( 0x80, "A and B" )
PORT_DIPSETTING( 0x00, "A only" )
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -240,7 +240,7 @@ static INPUT_PORTS_START( lkage )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -250,7 +250,7 @@ static INPUT_PORTS_START( lkage )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c
index f7b3e3bd099..702a1fcec94 100644
--- a/src/mame/drivers/lockon.c
+++ b/src/mame/drivers/lockon.c
@@ -239,7 +239,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( lockon )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
/* DSW 1 - verified on PCB as a 8 position dipswitch block */
PORT_DIPNAME( 0x0003, 0x0000, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x0001, "2" )
@@ -296,7 +296,7 @@ static INPUT_PORTS_START( lockon )
PORT_DIPSETTING( 0x4000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
-PORT_START_TAG("YM2203")
+PORT_START("YM2203")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -310,13 +310,13 @@ PORT_START_TAG("YM2203")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-PORT_START_TAG("ADC_BANK")
+PORT_START("ADC_BANK")
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_X ) PORT_MINMAX(0,0xff) PORT_SENSITIVITY(25) PORT_KEYDELTA(15)
-PORT_START_TAG("ADC_PITCH")
+PORT_START("ADC_PITCH")
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_Y ) PORT_MINMAX(0,0xff) PORT_SENSITIVITY(25) PORT_KEYDELTA(15)
-PORT_START_TAG("ADC_MISSILE")
+PORT_START("ADC_MISSILE")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_BUTTON3 )
-PORT_START_TAG("ADC_HOVER")
+PORT_START("ADC_HOVER")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_BUTTON4 )
INPUT_PORTS_END
diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c
index af376895544..db270a3a954 100644
--- a/src/mame/drivers/looping.c
+++ b/src/mame/drivers/looping.c
@@ -641,7 +641,7 @@ MACHINE_DRIVER_END
*************************************/
static INPUT_PORTS_START( looping )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Shoot")
@@ -651,7 +651,7 @@ static INPUT_PORTS_START( looping )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("IN1") /* cocktail? */
+ PORT_START("IN1") /* cocktail? */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -659,7 +659,7 @@ static INPUT_PORTS_START( looping )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c
index 62948d84e2f..87fca8ccaea 100644
--- a/src/mame/drivers/lordgun.c
+++ b/src/mame/drivers/lordgun.c
@@ -328,7 +328,7 @@ GFXDECODE_END
***************************************************************************/
static INPUT_PORTS_START( lordgun )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_DIPNAME( 0x01, 0x01, "Game Mode" )
PORT_DIPSETTING( 0x01, "Arcade" )
PORT_DIPSETTING( 0x00, "Street" )
@@ -346,7 +346,7 @@ static INPUT_PORTS_START( lordgun )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) // eeprom
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -355,7 +355,7 @@ static INPUT_PORTS_START( lordgun )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE2 ) // cheat: skip ahead
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -365,7 +365,7 @@ static INPUT_PORTS_START( lordgun )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -375,7 +375,7 @@ static INPUT_PORTS_START( lordgun )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -385,16 +385,16 @@ static INPUT_PORTS_START( lordgun )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("LIGHT0_X")
+ PORT_START("LIGHT0_X")
PORT_BIT( 0x1ff, 0x100, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX(0,0x1ff) PORT_SENSITIVITY(35) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("LIGHT1_X")
+ PORT_START("LIGHT1_X")
PORT_BIT( 0x1ff, 0x100, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX(0,0x1ff) PORT_SENSITIVITY(35) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("LIGHT0_Y")
+ PORT_START("LIGHT0_Y")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("LIGHT1_Y")
+ PORT_START("LIGHT1_Y")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(10) PORT_PLAYER(2)
INPUT_PORTS_END
diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c
index f076cad6531..cfb933a8eea 100644
--- a/src/mame/drivers/lsasquad.c
+++ b/src/mame/drivers/lsasquad.c
@@ -240,7 +240,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( lsasquad )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -262,7 +262,7 @@ static INPUT_PORTS_START( lsasquad )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Medium ) )
@@ -285,7 +285,7 @@ static INPUT_PORTS_START( lsasquad )
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
PORT_DIPSETTING( 0x80, DEF_STR( Japanese ) )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPNAME( 0x01, 0x01, "Freeze" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -311,7 +311,7 @@ static INPUT_PORTS_START( lsasquad )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("MCU?")
+ PORT_START("MCU?")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* 68705 ready to receive cmd */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* 0 = 68705 has sent result */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -321,7 +321,7 @@ static INPUT_PORTS_START( lsasquad )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -331,7 +331,7 @@ static INPUT_PORTS_START( lsasquad )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -341,7 +341,7 @@ static INPUT_PORTS_START( lsasquad )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -351,7 +351,7 @@ static INPUT_PORTS_START( lsasquad )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -399,7 +399,7 @@ static ADDRESS_MAP_START( sound_mem_daikaiju, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( daikaiju )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -421,7 +421,7 @@ static INPUT_PORTS_START( daikaiju )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) // detailed description at the top of file
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Medium ) )
@@ -444,11 +444,11 @@ static INPUT_PORTS_START( daikaiju )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
//unused
- PORT_START_TAG("MCU?")
+ PORT_START("MCU?")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* 68705 ready to receive cmd */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* 0 = 68705 has sent result */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -458,7 +458,7 @@ static INPUT_PORTS_START( daikaiju )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -468,7 +468,7 @@ static INPUT_PORTS_START( daikaiju )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -478,7 +478,7 @@ static INPUT_PORTS_START( daikaiju )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -488,7 +488,7 @@ static INPUT_PORTS_START( daikaiju )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/ltcasino.c b/src/mame/drivers/ltcasino.c
index 9bbb314ea62..6fd4117b7f0 100644
--- a/src/mame/drivers/ltcasino.c
+++ b/src/mame/drivers/ltcasino.c
@@ -94,7 +94,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( ltcasino )
- PORT_START /* Q in service */
+ PORT_START("IN0") /* Q in service */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_CODE(KEYCODE_Z) PORT_NAME("Hold 1")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_CODE(KEYCODE_X) PORT_NAME("Hold 2")
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_CODE(KEYCODE_C) PORT_NAME("Hold 3")
@@ -110,7 +110,7 @@ static INPUT_PORTS_START( ltcasino )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x00, "1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -134,7 +134,7 @@ static INPUT_PORTS_START( ltcasino )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START /* R in service */
+ PORT_START("IN2") /* R in service */
PORT_DIPNAME( 0x01, 0x00, "2" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -160,7 +160,7 @@ static INPUT_PORTS_START( ltcasino )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN3")
PORT_DIPNAME( 0x01, 0x00, "3" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -184,7 +184,7 @@ static INPUT_PORTS_START( ltcasino )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN2 )
- PORT_START /* S in service */
+ PORT_START("IN4") /* S in service */
PORT_DIPNAME( 0x01, 0x00, "4" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -208,7 +208,7 @@ static INPUT_PORTS_START( ltcasino )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* T in service */
+ PORT_START("IN5") /* T in service */
PORT_DIPNAME( 0x01, 0x00, "5" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -234,7 +234,7 @@ static INPUT_PORTS_START( ltcasino )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-/* PORT_START // A and B in service //is there a switch?
+/* PORT_START("IN6") // A and B in service //is there a switch?
PORT_DIPNAME( 0x01, 0x01, "6" ) // from 1 to 0x40 seem affect the credit
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -260,7 +260,7 @@ static INPUT_PORTS_START( ltcasino )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
*/
- PORT_START
+ PORT_START("BUTTONS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 )
@@ -273,7 +273,7 @@ static INPUT_PORTS_START( ltcasino )
INPUT_PORTS_END
static INPUT_PORTS_START( ltcasinn )
- PORT_START /* Q in service */
+ PORT_START("IN0") /* Q in service */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 ) //start?
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -297,7 +297,7 @@ static INPUT_PORTS_START( ltcasinn )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x00, "1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -323,7 +323,7 @@ static INPUT_PORTS_START( ltcasinn )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* R in service */
+ PORT_START("IN2") /* R in service */
PORT_DIPNAME( 0x01, 0x00, "2" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -349,7 +349,7 @@ static INPUT_PORTS_START( ltcasinn )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN3")
PORT_DIPNAME( 0x01, 0x00, "3" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -375,7 +375,7 @@ static INPUT_PORTS_START( ltcasinn )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* S in service */
+ PORT_START("IN4") /* S in service */
PORT_DIPNAME( 0x01, 0x01, "Plug the Keyboard" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -399,7 +399,7 @@ static INPUT_PORTS_START( ltcasinn )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* T in service */
+ PORT_START("IN5") /* T in service */
PORT_DIPNAME( 0x01, 0x00, "5" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -425,7 +425,7 @@ static INPUT_PORTS_START( ltcasinn )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-/* PORT_START // A and B in service //is there a switch?
+/* PORT_START("IN6") // A and B in service //is there a switch?
PORT_DIPNAME( 0x01, 0x01, "6" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -452,7 +452,7 @@ static INPUT_PORTS_START( ltcasinn )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
*/
- PORT_START
+ PORT_START("BUTTONS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 )
@@ -466,7 +466,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mv4in1 )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_CODE(KEYCODE_Z) PORT_NAME("Hold 1")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_CODE(KEYCODE_X) PORT_NAME("Hold 2")
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_CODE(KEYCODE_C) PORT_NAME("Hold 3")
@@ -483,7 +483,7 @@ static INPUT_PORTS_START( mv4in1 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -507,7 +507,7 @@ static INPUT_PORTS_START( mv4in1 )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START
+ PORT_START("IN2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -533,7 +533,7 @@ static INPUT_PORTS_START( mv4in1 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN3")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -557,7 +557,7 @@ static INPUT_PORTS_START( mv4in1 )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN2 )
- PORT_START
+ PORT_START("IN4")
PORT_DIPNAME( 0x01, 0x01, "Keyboard" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -581,7 +581,7 @@ static INPUT_PORTS_START( mv4in1 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN5")
PORT_DIPNAME( 0x01, 0x00, "5" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -608,7 +608,7 @@ static INPUT_PORTS_START( mv4in1 )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("BUTTONS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 )
diff --git a/src/mame/drivers/lucky74.c b/src/mame/drivers/lucky74.c
index cb790a86032..d7e0add7c49 100644
--- a/src/mame/drivers/lucky74.c
+++ b/src/mame/drivers/lucky74.c
@@ -557,7 +557,7 @@ static INPUT_PORTS_START( lucky74 )
/* Player buttons are the same for players 1 & 2.
Test mode shows them as dupes. Maybe are multiplexed?
*/
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Hold 1") PORT_CODE(KEYCODE_Z) /* 'A' in test mode */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Hold 2") PORT_CODE(KEYCODE_X) /* 'B' in test mode */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Hold 3") PORT_CODE(KEYCODE_C) /* 'C' in test mode */
@@ -567,7 +567,7 @@ static INPUT_PORTS_START( lucky74 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Input G") PORT_CODE(KEYCODE_J) /* 'G' in test mode (inverted screen) */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Input H") PORT_CODE(KEYCODE_K) /* 'H' in test mode */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Bet") PORT_CODE(KEYCODE_2) /* 'I' in test mode */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_NAME("Start") PORT_CODE(KEYCODE_1) /* 'J' in test mode */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_NAME("Cancel") PORT_CODE(KEYCODE_N) /* 'K' in test mode */
@@ -577,7 +577,7 @@ static INPUT_PORTS_START( lucky74 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Input O") PORT_CODE(KEYCODE_M) /* 'O' in test mode (normal screen) */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* not in test mode */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Books") PORT_CODE(KEYCODE_0)
@@ -587,7 +587,7 @@ static INPUT_PORTS_START( lucky74 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* YM2149, port A */
+ PORT_START("IN3") /* YM2149, port A */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2) /* Coin A */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Key In") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(2) /* Coin B */
@@ -597,7 +597,7 @@ static INPUT_PORTS_START( lucky74 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Memory Reset Switch") PORT_CODE(KEYCODE_R)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -607,7 +607,7 @@ static INPUT_PORTS_START( lucky74 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "Auto Hold" ) PORT_DIPLOCATION("DSW1:1") /* see note 1 */
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x01, DEF_STR( Yes ) )
@@ -638,7 +638,7 @@ static INPUT_PORTS_START( lucky74 )
PORT_DIPSETTING( 0x00, "Without" )
PORT_DIPSETTING( 0x80, "With" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
/* DIPs 1-4 handle the harcoded coinage for Coin A, B and Remote credits (B = A x 5; R = A x 10) */
PORT_DIPNAME( 0x0f, 0x0f, "Coinage A, B & Remote" ) PORT_DIPLOCATION("DSW2:1,2,3,4")
PORT_DIPSETTING( 0x00, "A: 20 Coins/1 Credit; B: 4 Coins/1 Credit; R: 2 Pulses/1 Credit " )
@@ -676,7 +676,7 @@ static INPUT_PORTS_START( lucky74 )
PORT_DIPSETTING( 0xe0, "1 Coin/40 Credits" )
PORT_DIPSETTING( 0xf0, "1 Coin/50 Credits" )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, "Bet Max" ) PORT_DIPLOCATION("DSW3:1")
PORT_DIPSETTING( 0x01, "20" )
PORT_DIPSETTING( 0x00, "40" )
@@ -700,7 +700,7 @@ static INPUT_PORTS_START( lucky74 )
PORT_DIPSETTING( 0x80, "A - Hold" )
PORT_DIPSETTING( 0x00, "B - Discard" )
- PORT_START_TAG("DSW4")
+ PORT_START("DSW4")
PORT_DIPNAME( 0x01, 0x01, "Hopper Coin SW" ) PORT_DIPLOCATION("DSW4:1")
PORT_DIPSETTING( 0x01, "Active Low" )
PORT_DIPSETTING( 0x00, "Active High" )
diff --git a/src/mame/drivers/lucky8.c b/src/mame/drivers/lucky8.c
index a241b87a032..91be3b620c3 100644
--- a/src/mame/drivers/lucky8.c
+++ b/src/mame/drivers/lucky8.c
@@ -124,7 +124,7 @@ static ADDRESS_MAP_START( lucky8_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( lucky8 )
- PORT_START_TAG("B800")
+ PORT_START("B800")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 0") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 1") PORT_CODE(KEYCODE_W)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 2") PORT_CODE(KEYCODE_E)
@@ -134,7 +134,7 @@ static INPUT_PORTS_START( lucky8 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 6") PORT_CODE(KEYCODE_U)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 7") PORT_CODE(KEYCODE_I)
- PORT_START_TAG("B801")
+ PORT_START("B801")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 0") PORT_CODE(KEYCODE_A)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 1") PORT_CODE(KEYCODE_S)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 2") PORT_CODE(KEYCODE_D)
@@ -144,7 +144,7 @@ static INPUT_PORTS_START( lucky8 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 6") PORT_CODE(KEYCODE_J)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 7") PORT_CODE(KEYCODE_K)
- PORT_START_TAG("B802")
+ PORT_START("B802")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 0") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 1") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 2") PORT_CODE(KEYCODE_C)
@@ -154,7 +154,7 @@ static INPUT_PORTS_START( lucky8 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 6") PORT_CODE(KEYCODE_M)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 7") PORT_CODE(KEYCODE_L)
- PORT_START_TAG("B810")
+ PORT_START("B810")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START3 )
@@ -164,7 +164,7 @@ static INPUT_PORTS_START( lucky8 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 )
- PORT_START_TAG("B811")
+ PORT_START("B811")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -174,7 +174,7 @@ static INPUT_PORTS_START( lucky8 )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE3 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -200,7 +200,7 @@ static INPUT_PORTS_START( lucky8 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x07, 0x07, "Main Game" )
PORT_DIPSETTING( 0x07, "80%" )
PORT_DIPSETTING( 0x06, "83%" )
@@ -226,7 +226,7 @@ static INPUT_PORTS_START( lucky8 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -252,7 +252,7 @@ static INPUT_PORTS_START( lucky8 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW4")
+ PORT_START("DSW4")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/lvcards.c b/src/mame/drivers/lvcards.c
index 9bcd254454d..63e2fd10f8a 100644
--- a/src/mame/drivers/lvcards.c
+++ b/src/mame/drivers/lvcards.c
@@ -192,7 +192,7 @@ static ADDRESS_MAP_START( lvpoker_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( lvcards )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Analyzer") PORT_CODE(KEYCODE_0)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -202,7 +202,7 @@ static INPUT_PORTS_START( lvcards )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Red") PORT_CODE(KEYCODE_N)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Black") PORT_CODE(KEYCODE_M)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Hold 1") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Hold 2") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Hold 3") PORT_CODE(KEYCODE_C)
@@ -212,7 +212,7 @@ static INPUT_PORTS_START( lvcards )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Bet") PORT_CODE(KEYCODE_LCONTROL)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Cancel / Take Score") PORT_CODE(KEYCODE_SPACE)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -222,7 +222,7 @@ static INPUT_PORTS_START( lvcards )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -248,7 +248,7 @@ static INPUT_PORTS_START( lvcards )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x07, "1 COIN =" )
PORT_DIPSETTING( 0x06, "5$" )
PORT_DIPSETTING( 0x05, "10$" )
@@ -276,7 +276,7 @@ static INPUT_PORTS_START( lvcards )
INPUT_PORTS_END
static INPUT_PORTS_START( lvpoker )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Analyzer") PORT_TOGGLE
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_MINUS) PORT_NAME("Memory Reset")
@@ -286,7 +286,7 @@ static INPUT_PORTS_START( lvpoker )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Red")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Black")
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_CODE(KEYCODE_Z) PORT_NAME("Hold 1")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_CODE(KEYCODE_X) PORT_NAME("Hold 2")
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_CODE(KEYCODE_C) PORT_NAME("Hold 3")
@@ -296,7 +296,7 @@ static INPUT_PORTS_START( lvpoker )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_2) PORT_NAME("Bet")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_NAME("Remove Credit as coins") PORT_CODE(KEYCODE_A)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SPECIAL ) // Token Drop
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_SPACE) PORT_NAME("Cancel / Take Score")
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(3)
@@ -306,7 +306,7 @@ static INPUT_PORTS_START( lvpoker )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) // Token Out
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL)
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x07, 0x07, "Winning Percentage" )
PORT_DIPSETTING( 0x06, "70%" )
PORT_DIPSETTING( 0x05, "74%" )
@@ -331,7 +331,7 @@ static INPUT_PORTS_START( lvpoker )
PORT_DIPSETTING( 0x80, "Disabled" )
PORT_DIPSETTING( 0x00, "Enabled" )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x06, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x04, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 2C_1C ) )
@@ -359,7 +359,7 @@ static INPUT_PORTS_START( lvpoker )
INPUT_PORTS_END
static INPUT_PORTS_START( ponttehk )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Reset All")
@@ -369,7 +369,7 @@ static INPUT_PORTS_START( ponttehk )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -379,7 +379,7 @@ static INPUT_PORTS_START( ponttehk )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Use Credit") PORT_CODE(KEYCODE_L)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Remove Credit as coins") PORT_CODE(KEYCODE_A)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SPECIAL )// Token Drop
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(3)
@@ -389,7 +389,7 @@ static INPUT_PORTS_START( ponttehk )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_3) PORT_NAME("Coinout Sensor") //Token Out
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL )//Motor On?
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x07, "Winning Percentage" )
PORT_DIPSETTING( 0x06, "70%" )
PORT_DIPSETTING( 0x05, "74%" )
@@ -409,7 +409,7 @@ static INPUT_PORTS_START( ponttehk )
PORT_DIPSETTING( 0x80, "Disabled" )
PORT_DIPSETTING( 0x00, "Enabled" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x07, 0x06, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x04, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 2C_1C ) )
diff --git a/src/mame/drivers/lwings.c b/src/mame/drivers/lwings.c
index 385ef28f23d..84185148451 100644
--- a/src/mame/drivers/lwings.c
+++ b/src/mame/drivers/lwings.c
@@ -392,7 +392,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( lwings_generic )
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
@@ -402,7 +402,7 @@ static INPUT_PORTS_START( lwings_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -412,7 +412,7 @@ static INPUT_PORTS_START( lwings_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -440,7 +440,7 @@ static INPUT_PORTS_START( sectionz )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_SERVICE_DIPLOC( 0x01, IP_ACTIVE_LOW, "SWA:8" )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SWA:7")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -461,7 +461,7 @@ static INPUT_PORTS_START( sectionz )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_3C ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SWB:8")
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x01, DEF_STR( Yes ) )
@@ -489,7 +489,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( lwings )
PORT_INCLUDE( lwings_generic )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPUNUSED_DIPLOC( 0x0001, 0x0001, "SWA:8" )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SWA:7")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -510,7 +510,7 @@ static INPUT_PORTS_START( lwings )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_3C ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPUNUSED_DIPLOC( 0x0001, 0x0001, "SWB:8" )
PORT_DIPNAME( 0x06, 0x06, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SWB:7,6")
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
@@ -557,7 +557,7 @@ static INPUT_PORTS_START( trojanls )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SWB:8,7")
PORT_DIPSETTING( 0x00, "Upright 1 Player" )
PORT_DIPSETTING( 0x02, "Upright 2 Players" )
@@ -576,7 +576,7 @@ static INPUT_PORTS_START( trojanls )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SWB:2" )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SWB:1" )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SWA:8,7")
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -617,7 +617,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( avengers )
PORT_INCLUDE( lwings_generic )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SWB:8")
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x01, DEF_STR( Yes ) )
@@ -640,7 +640,7 @@ static INPUT_PORTS_START( avengers )
PORT_DIPSETTING( 0x80, "5" )
PORT_DIPSETTING( 0x00, "6" )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_SERVICE_DIPLOC( 0x01, IP_ACTIVE_LOW, "SWA:8")
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SWA:7")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
diff --git a/src/mame/drivers/m10.c b/src/mame/drivers/m10.c
index f6504dbf184..7f853fd2b9b 100644
--- a/src/mame/drivers/m10.c
+++ b/src/mame/drivers/m10.c
@@ -523,7 +523,7 @@ ADDRESS_MAP_END
#define CAB_PORTENV \
/* fake port for cabinet type */ \
- PORT_START_TAG("CAB") \
+ PORT_START("CAB") \
PORT_CONFNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) \
PORT_CONFSETTING( 0x00, DEF_STR( Upright ) ) \
PORT_CONFSETTING( 0x01, DEF_STR( Cocktail ) ) \
@@ -534,7 +534,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( skychut )
- PORT_START
+ PORT_START("INPUTS")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 )
@@ -544,7 +544,7 @@ static INPUT_PORTS_START( skychut )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
- PORT_START /* IN1 */
+ PORT_START("DSW") /* IN1 */
PORT_DIPNAME(0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING ( 0x00, "3" )
PORT_DIPSETTING ( 0x01, "4" )
@@ -568,14 +568,14 @@ static INPUT_PORTS_START( skychut )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* FAKE */
+ PORT_START("FAKE") /* FAKE */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
CAB_PORTENV
INPUT_PORTS_END
static INPUT_PORTS_START( ipminvad )
- PORT_START
+ PORT_START("INPUTS")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 )
@@ -585,7 +585,7 @@ static INPUT_PORTS_START( ipminvad )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
- PORT_START /* IN1 */
+ PORT_START("DSW") /* IN1 */
PORT_DIPNAME(0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING ( 0x00, "3" )
PORT_DIPSETTING ( 0x01, "4" )
@@ -609,21 +609,21 @@ static INPUT_PORTS_START( ipminvad )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* FAKE */
+ PORT_START("FAKE") /* FAKE */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
CAB_PORTENV
INPUT_PORTS_END
static INPUT_PORTS_START( spacbeam )
- PORT_START
+ PORT_START("INPUTS")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
- PORT_START /* IN1 */
+ PORT_START("DSW") /* IN1 */
PORT_DIPNAME(0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING ( 0x00, "2" )
PORT_DIPSETTING ( 0x01, "3" )
@@ -637,10 +637,10 @@ static INPUT_PORTS_START( spacbeam )
PORT_DIPSETTING ( 0x10, "1 Coin 1 Play" )
PORT_DIPSETTING ( 0x20, "1 Coin 2 Plays" )
- PORT_START /* FAKE */
+ PORT_START("FAKE") /* FAKE */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
- PORT_START /* IN3 */
+ PORT_START("P2") /* IN3 */
PORT_BIT( 0x03, 0, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
@@ -650,7 +650,7 @@ static INPUT_PORTS_START( spacbeam )
INPUT_PORTS_END
static INPUT_PORTS_START( headoni )
- PORT_START
+ PORT_START("INPUTS")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 )
@@ -660,7 +660,7 @@ static INPUT_PORTS_START( headoni )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START("DSW") /* IN1 */
PORT_DIPNAME(0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING ( 0x00, "2" )
PORT_DIPSETTING ( 0x01, "3" )
@@ -674,10 +674,10 @@ static INPUT_PORTS_START( headoni )
PORT_DIPSETTING ( 0x10, "1 Coin 1 Play" )
PORT_DIPSETTING ( 0x20, "1 Coin 2 Plays" )
- PORT_START /* FAKE */
+ PORT_START("FAKE") /* FAKE */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
- PORT_START /* IN3 */
+ PORT_START("P2") /* IN3 */
PORT_BIT( 0x03, 0, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c
index 67848b29147..51689746160 100644
--- a/src/mame/drivers/m107.c
+++ b/src/mame/drivers/m107.c
@@ -193,7 +193,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( m107_2player )
- PORT_START_TAG("JOY12")
+ PORT_START("JOY12")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -211,7 +211,7 @@ static INPUT_PORTS_START( m107_2player )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START_TAG("COINS_DIPS")
+ PORT_START("COINS_DIPS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -231,7 +231,7 @@ static INPUT_PORTS_START( m107_2player )
PORT_DIPUNKNOWN( 0x4000, 0x4000 )
PORT_DIPUNKNOWN( 0x8000, 0x8000 )
- PORT_START_TAG("DIPS21")
+ PORT_START("DIPS21")
/* Dip switch bank 1 */
PORT_DIPUNKNOWN( 0x0001, 0x0001 )
PORT_DIPUNKNOWN( 0x0002, 0x0002 )
@@ -276,7 +276,7 @@ static INPUT_PORTS_START( m107_2player )
PORT_DIPSETTING( 0x5000, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Free_Play ) )
- PORT_START_TAG("JOY34")
+ PORT_START("JOY34")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
@@ -380,7 +380,7 @@ static INPUT_PORTS_START( dsoccr94 )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_SERVICE( 0x0080, IP_ACTIVE_LOW )
- PORT_START /* Dip switch bank 3 */
+ PORT_START("DSW3") /* Dip switch bank 3 */
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/m52.c b/src/mame/drivers/m52.c
index 43c13f9d15b..6ed84d6b2b2 100644
--- a/src/mame/drivers/m52.c
+++ b/src/mame/drivers/m52.c
@@ -109,7 +109,7 @@ ADDRESS_MAP_END
/* Same as m57, m58 and m62 (IREM Z80 hardware) */
static INPUT_PORTS_START( m52 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
/* Start 1 & 2 also restarts and freezes the game with stop mode on
and are used in test mode to enter and esc the various tests */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
@@ -119,7 +119,7 @@ static INPUT_PORTS_START( m52 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -129,7 +129,7 @@ static INPUT_PORTS_START( m52 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -141,7 +141,7 @@ static INPUT_PORTS_START( m52 )
/* DSW1 is so different from game to game that it isn't included here */
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -186,7 +186,7 @@ static INPUT_PORTS_START( mpatrol )
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x01, "2" )
@@ -214,14 +214,14 @@ INPUT_PORTS_END
static INPUT_PORTS_START( alpha1v )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -231,7 +231,7 @@ static INPUT_PORTS_START( alpha1v )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -241,7 +241,7 @@ static INPUT_PORTS_START( alpha1v )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -258,7 +258,7 @@ static INPUT_PORTS_START( alpha1v )
PORT_DIPUNUSED( 0x40, IP_ACTIVE_LOW )
PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) ) /* table at 0x5ef4 - 16 bytes (coins) + 16 bytes (credits) */
PORT_DIPSETTING( 0x0b, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0c, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/m57.c b/src/mame/drivers/m57.c
index 877a63d33a0..275badfda66 100644
--- a/src/mame/drivers/m57.c
+++ b/src/mame/drivers/m57.c
@@ -88,7 +88,7 @@ ADDRESS_MAP_END
/* Same as m52, m58 and m62 (IREM Z80 hardware) */
static INPUT_PORTS_START( m57 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
/* Start 1 & 2 also restarts and freezes the game with stop mode on
and are used in test mode to enter and esc the various tests */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
@@ -98,7 +98,7 @@ static INPUT_PORTS_START( m57 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -108,7 +108,7 @@ static INPUT_PORTS_START( m57 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -120,7 +120,7 @@ static INPUT_PORTS_START( m57 )
/* DSW1 is so different from game to game that it isn't included here */
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -172,7 +172,7 @@ static INPUT_PORTS_START( troangel )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPUNUSED_DIPLOC( 0x20, IP_ACTIVE_LOW, "SW2:6" )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Time" ) PORT_DIPLOCATION("SW1:1,2") /* table at 0x6110 - 4 * 8 bytes (B1 B2 bonus A1 A2 bonus M1 M2) */
PORT_DIPSETTING( 0x03, "B:180/A:160/M:140/BG:120" )
PORT_DIPSETTING( 0x02, "B:160/A:140/M:120/BG:100" )
diff --git a/src/mame/drivers/m58.c b/src/mame/drivers/m58.c
index 1136d13f89d..8bc052f747b 100644
--- a/src/mame/drivers/m58.c
+++ b/src/mame/drivers/m58.c
@@ -52,7 +52,7 @@ ADDRESS_MAP_END
/* Same as m52, m57 and m62 (IREM Z80 hardware) */
static INPUT_PORTS_START( m58 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
/* Start 1 & 2 also restarts and freezes the game with stop mode on
and are used in test mode to enter and esc the various tests */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
@@ -62,7 +62,7 @@ static INPUT_PORTS_START( m58 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -72,7 +72,7 @@ static INPUT_PORTS_START( m58 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -84,7 +84,7 @@ static INPUT_PORTS_START( m58 )
/* DSW1 is so different from game to game that it isn't included here */
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -124,7 +124,7 @@ static INPUT_PORTS_START( yard )
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPUNUSED_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW1:1" )
PORT_DIPUNUSED_DIPLOC( 0x02, IP_ACTIVE_LOW, "SW1:2" )
PORT_DIPNAME( 0x0c, 0x0c, "Time Reduced by Ball Dead" ) PORT_DIPLOCATION("SW1:3,4")
diff --git a/src/mame/drivers/m62.c b/src/mame/drivers/m62.c
index 972f2ce56fe..5f005065483 100644
--- a/src/mame/drivers/m62.c
+++ b/src/mame/drivers/m62.c
@@ -533,10 +533,10 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( kungfum )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
IN0_PORT
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
@@ -546,7 +546,7 @@ static INPUT_PORTS_START( kungfum )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
@@ -556,7 +556,7 @@ static INPUT_PORTS_START( kungfum )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hard ) )
@@ -570,7 +570,7 @@ static INPUT_PORTS_START( kungfum )
PORT_DIPSETTING( 0x00, "5" )
COINAGE_DSW
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -600,16 +600,16 @@ static INPUT_PORTS_START( kungfum )
INPUT_PORTS_END
static INPUT_PORTS_START( battroad )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
IN0_PORT
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
IN1_PORT
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
IN2_PORT
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Fuel Decrease" )
PORT_DIPSETTING( 0x03, "Slow" )
PORT_DIPSETTING( 0x02, DEF_STR( Medium ) )
@@ -623,7 +623,7 @@ static INPUT_PORTS_START( battroad )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
COINAGE_DSW
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -651,16 +651,16 @@ static INPUT_PORTS_START( battroad )
INPUT_PORTS_END
static INPUT_PORTS_START( ldrun )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
IN0_PORT
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
IN1_PORT
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
IN2_PORT
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Timer" )
PORT_DIPSETTING( 0x03, "Slow" )
PORT_DIPSETTING( 0x02, DEF_STR( Medium ) )
@@ -673,7 +673,7 @@ static INPUT_PORTS_START( ldrun )
PORT_DIPSETTING( 0x00, "5" )
COINAGE_DSW
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -702,16 +702,16 @@ static INPUT_PORTS_START( ldrun )
INPUT_PORTS_END
static INPUT_PORTS_START( ldrun2 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
IN0_PORT
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
IN1_PORT
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
IN2_PORT
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "Timer" )
PORT_DIPSETTING( 0x01, "Slow" )
PORT_DIPSETTING( 0x00, "Fast" )
@@ -725,7 +725,7 @@ static INPUT_PORTS_START( ldrun2 )
PORT_DIPSETTING( 0x00, "5" )
COINAGE_DSW
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -754,16 +754,16 @@ static INPUT_PORTS_START( ldrun2 )
INPUT_PORTS_END
static INPUT_PORTS_START( ldrun3 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
IN0_PORT
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
IN1_PORT
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
IN2_PORT
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "Timer" )
PORT_DIPSETTING( 0x01, "Slow" )
PORT_DIPSETTING( 0x00, "Fast" )
@@ -777,7 +777,7 @@ static INPUT_PORTS_START( ldrun3 )
PORT_DIPSETTING( 0x00, "5" )
COINAGE_DSW
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -806,16 +806,16 @@ static INPUT_PORTS_START( ldrun3 )
INPUT_PORTS_END
static INPUT_PORTS_START( ldrun4 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
IN0_PORT
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
IN1_PORT
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
IN2_PORT
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "Timer" )
PORT_DIPSETTING( 0x01, "Slow" )
PORT_DIPSETTING( 0x00, "Fast" )
@@ -829,7 +829,7 @@ static INPUT_PORTS_START( ldrun4 )
PORT_DIPSETTING( 0x00, "5" )
COINAGE_DSW
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -859,16 +859,16 @@ static INPUT_PORTS_START( ldrun4 )
INPUT_PORTS_END
static INPUT_PORTS_START( lotlot )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
IN0_PORT
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
IN1_PORT
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
IN2_PORT
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Speed" )
PORT_DIPSETTING( 0x03, "Very Slow" )
PORT_DIPSETTING( 0x02, "Slow" )
@@ -881,7 +881,7 @@ static INPUT_PORTS_START( lotlot )
PORT_DIPSETTING( 0x00, "4" )
COINAGE2_DSW
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -909,16 +909,16 @@ static INPUT_PORTS_START( lotlot )
INPUT_PORTS_END
static INPUT_PORTS_START( kidniki )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
IN0_PORT
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
IN1_PORT
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
IN2_PORT
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x02, "2" )
PORT_DIPSETTING( 0x03, "3" )
@@ -932,7 +932,7 @@ static INPUT_PORTS_START( kidniki )
PORT_DIPSETTING( 0x00, "80000" )
COINAGE2_DSW
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -959,16 +959,16 @@ static INPUT_PORTS_START( kidniki )
INPUT_PORTS_END
static INPUT_PORTS_START( spelunkr )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
IN0_PORT
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
IN1_PORT
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
IN2_PORT
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Energy Decrease" )
PORT_DIPSETTING( 0x03, "Slow" )
PORT_DIPSETTING( 0x02, DEF_STR( Medium ) )
@@ -981,7 +981,7 @@ static INPUT_PORTS_START( spelunkr )
PORT_DIPSETTING( 0x00, "5" )
COINAGE2_DSW
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1010,18 +1010,18 @@ static INPUT_PORTS_START( spelunkr )
INPUT_PORTS_END
static INPUT_PORTS_START( spelunk2 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
IN0_PORT
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
IN1_PORT
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
IN2_PORT
/* Factory shipment setting is all OFF */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Energy Decrease" )
PORT_DIPSETTING( 0x03, "Slow" )
PORT_DIPSETTING( 0x02, DEF_STR( Medium ) )
@@ -1034,7 +1034,7 @@ static INPUT_PORTS_START( spelunk2 )
PORT_DIPSETTING( 0x00, "5" )
COINAGE2_DSW
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1062,16 +1062,16 @@ static INPUT_PORTS_START( spelunk2 )
INPUT_PORTS_END
static INPUT_PORTS_START( youjyudn )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
IN0_PORT
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
IN1_PORT
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
IN2_PORT
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x02, "2" )
PORT_DIPSETTING( 0x03, "3" )
@@ -1085,7 +1085,7 @@ static INPUT_PORTS_START( youjyudn )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
COINAGE2_DSW
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1113,16 +1113,16 @@ static INPUT_PORTS_START( youjyudn )
INPUT_PORTS_END
static INPUT_PORTS_START( horizon )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
IN0_PORT
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
IN1_PORT
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
IN2_PORT
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x03, "3" )
@@ -1135,7 +1135,7 @@ static INPUT_PORTS_START( horizon )
PORT_DIPSETTING( 0x04, "80k and every 120k" )
COINAGE3_DSW
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c
index 92b403ba31d..50beb8c630f 100644
--- a/src/mame/drivers/m63.c
+++ b/src/mame/drivers/m63.c
@@ -431,7 +431,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( wilytowr )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -441,7 +441,7 @@ static INPUT_PORTS_START( wilytowr )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -451,7 +451,7 @@ static INPUT_PORTS_START( wilytowr )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:!1,!2")
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "3" )
@@ -490,7 +490,7 @@ static INPUT_PORTS_START( wilytowr )
PORT_DIPSETTING( 0x70, DEF_STR( 1C_9C ) )
PORT_DIPSETTING( 0xf0, DEF_STR( Free_Play ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:!1")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -515,7 +515,7 @@ static INPUT_PORTS_START( wilytowr )
INPUT_PORTS_END
static INPUT_PORTS_START( fghtbskt )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
@@ -525,7 +525,7 @@ static INPUT_PORTS_START( fghtbskt )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
@@ -535,7 +535,7 @@ static INPUT_PORTS_START( fghtbskt )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x03, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c
index ab71f85bc19..19cda5e90fa 100644
--- a/src/mame/drivers/m72.c
+++ b/src/mame/drivers/m72.c
@@ -909,7 +909,7 @@ ADDRESS_MAP_END
PORT_DIPSETTING( 0x0000, DEF_STR( 1C_6C ) )
static INPUT_PORTS_START( common )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
JOYSTICK_1
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON4 )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 )
@@ -921,7 +921,7 @@ static INPUT_PORTS_START( common )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -936,7 +936,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( rtype )
PORT_INCLUDE( common )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0002, "2" )
PORT_DIPSETTING( 0x0003, "3" )
@@ -990,7 +990,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( bchopper )
PORT_INCLUDE( common )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0000, "1" )
PORT_DIPSETTING( 0x0002, "2" )
@@ -1034,7 +1034,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( nspirit )
PORT_INCLUDE( common )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0002, "2" )
PORT_DIPSETTING( 0x0003, "3" )
@@ -1077,7 +1077,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( imgfight )
PORT_INCLUDE( common )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0002, "2" )
PORT_DIPSETTING( 0x0003, "3" )
@@ -1118,7 +1118,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( loht )
PORT_INCLUDE( common )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0000, "2" )
PORT_DIPSETTING( 0x0003, "3" )
@@ -1159,7 +1159,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( xmultipl )
PORT_INCLUDE( common )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Very_Easy ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Easy ) )
@@ -1201,7 +1201,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( dbreed )
PORT_INCLUDE( common )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0002, "2" )
PORT_DIPSETTING( 0x0003, "3" )
@@ -1242,7 +1242,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( rtype2 )
PORT_INCLUDE( common )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0002, "2" )
PORT_DIPSETTING( 0x0003, "3" )
@@ -1281,7 +1281,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( hharry )
PORT_INCLUDE( common )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0002, "2" )
PORT_DIPSETTING( 0x0003, "3" )
@@ -1335,7 +1335,7 @@ static INPUT_PORTS_START( hharry )
INPUT_PORTS_END
static INPUT_PORTS_START( poundfor )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x001f, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* high bits of trackball X */
PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
@@ -1345,7 +1345,7 @@ static INPUT_PORTS_START( poundfor )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -1356,7 +1356,7 @@ static INPUT_PORTS_START( poundfor )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) /* sprite DMA complete */
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, "Round Time" )
PORT_DIPSETTING( 0x0002, "60" )
PORT_DIPSETTING( 0x0003, "90" )
@@ -1410,23 +1410,23 @@ static INPUT_PORTS_START( poundfor )
/* Coin Mode 2, not supported yet */
// COIN_MODE_2
- PORT_START_TAG("TRACK0_X")
+ PORT_START("TRACK0_X")
PORT_BIT( 0xffff, 0x0000, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(30) PORT_PLAYER(1)
- PORT_START_TAG("TRACK0_Y")
+ PORT_START("TRACK0_Y")
PORT_BIT( 0xffff, 0x0000, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(30) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("TRACK1_X")
+ PORT_START("TRACK1_X")
PORT_BIT( 0xffff, 0x0000, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(30) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("TRACK1_Y")
+ PORT_START("TRACK1_Y")
PORT_BIT( 0xffff, 0x0000, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(30) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( airduel )
PORT_INCLUDE( common )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0002, "2" )
PORT_DIPSETTING( 0x0003, "3" )
@@ -1474,7 +1474,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( gallop )
PORT_INCLUDE( common )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0002, "2" )
PORT_DIPSETTING( 0x0003, "3" )
@@ -1528,7 +1528,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( kengo )
PORT_INCLUDE( common )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0002, "2" )
PORT_DIPSETTING( 0x0003, "3" )
diff --git a/src/mame/drivers/m79amb.c b/src/mame/drivers/m79amb.c
index a5f7a9f57d8..03ac37be98a 100644
--- a/src/mame/drivers/m79amb.c
+++ b/src/mame/drivers/m79amb.c
@@ -140,7 +140,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( m79amb )
- PORT_START_TAG("8000") /* 8000 */
+ PORT_START("8000") /* 8000 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* dip switch */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -150,7 +150,7 @@ static INPUT_PORTS_START( m79amb )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("8002") /* 8002 */
+ PORT_START("8002") /* 8002 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -160,13 +160,13 @@ static INPUT_PORTS_START( m79amb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("8004") /* 8004 */
+ PORT_START("8004") /* 8004 */
PORT_BIT( 0x1f, 0x10, IPT_PADDLE ) PORT_MINMAX(0,0x1f) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_CENTERDELTA(0)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("8005") /* 8005 */
+ PORT_START("8005") /* 8005 */
PORT_BIT( 0x1f, 0x10, IPT_PADDLE ) PORT_MINMAX(0,0x1f) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/m90.c b/src/mame/drivers/m90.c
index 2eabf2eb23a..c0b2429885a 100644
--- a/src/mame/drivers/m90.c
+++ b/src/mame/drivers/m90.c
@@ -195,7 +195,7 @@ static INPUT_PORTS_START( hasamu )
IREM_COINS
- PORT_START /* Dip switch bank 1 */
+ PORT_START("DSW") /* Dip switch bank 1 */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -242,7 +242,7 @@ static INPUT_PORTS_START( dynablst )
IREM_COINS
- PORT_START_TAG("DSW") /* Dip switch bank 1 */
+ PORT_START("DSW") /* Dip switch bank 1 */
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x0002, "2" )
PORT_DIPSETTING( 0x0003, "3" )
@@ -284,7 +284,7 @@ static INPUT_PORTS_START( dynablst )
INPUT_PORTS_END
static INPUT_PORTS_START( dynablsb )
- PORT_START
+ PORT_START("JOY12")
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -304,7 +304,7 @@ static INPUT_PORTS_START( dynablsb )
IREM_COINS
- PORT_START_TAG("DSW") /* Dip switch bank 1 */
+ PORT_START("DSW") /* Dip switch bank 1 */
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x0002, "2" )
PORT_DIPSETTING( 0x0003, "3" )
@@ -360,7 +360,7 @@ static INPUT_PORTS_START( bombrman ) /* Does not appear to support 4 players or
IREM_COINS
- PORT_START /* Dip switch bank 1 */
+ PORT_START("DSW") /* Dip switch bank 1 */
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0002, "2" )
PORT_DIPSETTING( 0x0003, "3" )
@@ -405,7 +405,7 @@ static INPUT_PORTS_START( bbmanw )
IREM_COINS
- PORT_START_TAG("DSW") /* Dip switch bank 1 */
+ PORT_START("DSW") /* Dip switch bank 1 */
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x0002, "2" )
PORT_DIPSETTING( 0x0003, "3" )
@@ -456,7 +456,7 @@ static INPUT_PORTS_START( bbmanwj )
INPUT_PORTS_END
static INPUT_PORTS_START( quizf1 )
- PORT_START
+ PORT_START("JOY12")
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -476,7 +476,7 @@ static INPUT_PORTS_START( quizf1 )
IREM_COINS
- PORT_START /* Dip switch bank 1 */
+ PORT_START("DSW") /* Dip switch bank 1 */
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x0002, "2" )
PORT_DIPSETTING( 0x0003, "3" )
@@ -518,7 +518,7 @@ static INPUT_PORTS_START( quizf1 )
INPUT_PORTS_END
static INPUT_PORTS_START( matchit2 )
- PORT_START
+ PORT_START("JOY12")
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -536,7 +536,7 @@ static INPUT_PORTS_START( matchit2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -546,7 +546,7 @@ static INPUT_PORTS_START( matchit2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* Dip switch bank 1 */
+ PORT_START("DSW") /* Dip switch bank 1 */
PORT_DIPNAME( 0x0001, 0x0001, "Girls Mode" ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0001, DEF_STR( On ) )
@@ -585,7 +585,7 @@ static INPUT_PORTS_START( matchit2 )
INPUT_PORTS_END
static INPUT_PORTS_START( shisen2 )
- PORT_START
+ PORT_START("JOY12")
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -603,7 +603,7 @@ static INPUT_PORTS_START( shisen2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -613,7 +613,7 @@ static INPUT_PORTS_START( shisen2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* Dip switch bank 1 */
+ PORT_START("DSW") /* Dip switch bank 1 */
PORT_DIPNAME( 0x0001, 0x0001, "Girls Mode" ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0001, DEF_STR( On ) )
@@ -658,7 +658,7 @@ static INPUT_PORTS_START( riskchal )
IREM_COINS
- PORT_START /* Dip switch bank 1 */
+ PORT_START("DSW") /* Dip switch bank 1 */
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x0002, "2" )
PORT_DIPSETTING( 0x0003, "3" )
diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c
index 3448c66f9d5..1ed92b960c7 100644
--- a/src/mame/drivers/m92.c
+++ b/src/mame/drivers/m92.c
@@ -423,7 +423,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( m92_2player )
- PORT_START_TAG("JOY12")
+ PORT_START("JOY12")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -441,7 +441,7 @@ static INPUT_PORTS_START( m92_2player )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START_TAG("COINS_DIPS")
+ PORT_START("COINS_DIPS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -460,7 +460,7 @@ static INPUT_PORTS_START( m92_2player )
PORT_DIPUNKNOWN( 0x4000, 0x4000 )
PORT_DIPUNKNOWN( 0x8000, 0x8000 )
- PORT_START_TAG("DIPS21")
+ PORT_START("DIPS21")
/* Dip switch bank 1 */
PORT_DIPUNKNOWN( 0x0001, 0x0001 )
PORT_DIPUNKNOWN( 0x0002, 0x0002 )
@@ -505,7 +505,7 @@ static INPUT_PORTS_START( m92_2player )
PORT_DIPSETTING( 0x5000, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Free_Play ) )
- PORT_START_TAG("JOY34")
+ PORT_START("JOY34")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/m92.h b/src/mame/drivers/m92.h
index 7ed3738c99d..03cd847794c 100644
--- a/src/mame/drivers/m92.h
+++ b/src/mame/drivers/m92.h
@@ -7,7 +7,7 @@
*******************************************************************************/
#define IREM_JOYSTICKS_1_2 \
- PORT_START_TAG("JOY12") \
+ PORT_START("JOY12") \
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) \
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) \
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) \
@@ -26,7 +26,7 @@
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
#define IREM_JOYSTICKS_3_4 \
- PORT_START_TAG("JOY34") \
+ PORT_START("JOY34") \
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3) \
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3) \
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3) \
@@ -45,7 +45,7 @@
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
#define IREM_COINS \
- PORT_START \
+ PORT_START("SYSTEM") \
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) \
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) \
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) \
diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c
index 0f0093d7e0f..d0268b95e10 100644
--- a/src/mame/drivers/macrossp.c
+++ b/src/mame/drivers/macrossp.c
@@ -369,7 +369,7 @@ ADDRESS_MAP_END
/*** INPUT PORTS *************************************************************/
static INPUT_PORTS_START( macrossp )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -387,7 +387,7 @@ static INPUT_PORTS_START( macrossp )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_START_TAG("KEYS")
+ PORT_START("KEYS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -396,7 +396,7 @@ static INPUT_PORTS_START( macrossp )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNUSED ) /* Unknown use */
- PORT_START_TAG("DSW") /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0005, DEF_STR( 3C_1C ) )
@@ -452,7 +452,7 @@ static INPUT_PORTS_START( macrossp )
PORT_DIPSETTING( 0x0000, DEF_STR( English ) )
PORT_SERVICE_DIPLOC( 0x8000, IP_ACTIVE_LOW, "SW2:8" )
- PORT_START_TAG("UNK")
+ PORT_START("UNK")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED ) /* Unknown use, but not dipswitches */
INPUT_PORTS_END
diff --git a/src/mame/drivers/macs.c b/src/mame/drivers/macs.c
index b9be1af208c..83fdb041e8a 100644
--- a/src/mame/drivers/macs.c
+++ b/src/mame/drivers/macs.c
@@ -148,7 +148,7 @@ GFXDECODE_END
static INPUT_PORTS_START( macs )
/*0*/
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x01, "DSW0 - BIT 1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -175,7 +175,7 @@ static INPUT_PORTS_START( macs )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
/*1*/
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "DSW1 - BIT 1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -202,7 +202,7 @@ static INPUT_PORTS_START( macs )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
/*2*/
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, "DSW 2 - BIT 1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -229,7 +229,7 @@ static INPUT_PORTS_START( macs )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
/*3*/
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, "DSW3 - BIT 1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -256,7 +256,7 @@ static INPUT_PORTS_START( macs )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
/*4 - external (printer in cultname)*/
- PORT_START_TAG("DSW4")
+ PORT_START("DSW4")
PORT_DIPNAME( 0x01, 0x01, "DSW4 - BIT 1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -283,7 +283,7 @@ static INPUT_PORTS_START( macs )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
/*(COMMON) MAHJONG PANEL*/
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
@@ -292,7 +292,7 @@ static INPUT_PORTS_START( macs )
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
@@ -301,7 +301,7 @@ static INPUT_PORTS_START( macs )
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
@@ -310,7 +310,7 @@ static INPUT_PORTS_START( macs )
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
@@ -318,7 +318,7 @@ static INPUT_PORTS_START( macs )
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
@@ -328,11 +328,11 @@ static INPUT_PORTS_START( macs )
/*
Note: These could likely to be switches that are on the game board and not Dip Switches
*/
- PORT_START_TAG("SYS0")
+ PORT_START("SYS0")
PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Note In") PORT_CODE(KEYCODE_4_PAD)
- PORT_START_TAG("SYS1")
+ PORT_START("SYS1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Clear Coin Counter") PORT_CODE(KEYCODE_1_PAD)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Memory Reset") PORT_CODE(KEYCODE_2_PAD)
diff --git a/src/mame/drivers/madalien.c b/src/mame/drivers/madalien.c
index 763ad75c8cc..fba74c055c8 100644
--- a/src/mame/drivers/madalien.c
+++ b/src/mame/drivers/madalien.c
@@ -119,7 +119,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( madalien )
- PORT_START_TAG("PLAYER1")
+ PORT_START("PLAYER1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
@@ -129,7 +129,7 @@ static INPUT_PORTS_START( madalien )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DIP")
+ PORT_START("DIP")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives )) PORT_DIPLOCATION("SW:1,2")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -149,7 +149,7 @@ static INPUT_PORTS_START( madalien )
PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ))
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("PLAYER2")
+ PORT_START("PLAYER2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c
index cdef93ee367..2c0c4d2ae8b 100644
--- a/src/mame/drivers/madmotor.c
+++ b/src/mame/drivers/madmotor.c
@@ -133,7 +133,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( madmotor )
- PORT_START
+ PORT_START("P1_P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -151,7 +151,7 @@ static INPUT_PORTS_START( madmotor )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED ) /* button 3 - unused */
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) )
@@ -199,7 +199,7 @@ static INPUT_PORTS_START( madmotor )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START /* Credits */
+ PORT_START("SYSTEM") /* Credits */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
diff --git a/src/mame/drivers/magic10.c b/src/mame/drivers/magic10.c
index 7b493cc7e84..12fceed5ac5 100644
--- a/src/mame/drivers/magic10.c
+++ b/src/mame/drivers/magic10.c
@@ -130,7 +130,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( magic10 )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 )
@@ -148,7 +148,7 @@ static INPUT_PORTS_START( magic10 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN5 ) PORT_NAME("Note D")
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Collect") PORT_CODE(KEYCODE_C)
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0001, 0x0001, "Display Logo" )
PORT_DIPSETTING( 0x0000, DEF_STR( No ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Yes ) )
@@ -195,7 +195,7 @@ static INPUT_PORTS_START( magic10 )
INPUT_PORTS_END
static INPUT_PORTS_START( magic102 )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_NAME("Note A")
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_NAME("Note B")
@@ -206,7 +206,7 @@ static INPUT_PORTS_START( magic102 )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 )
@@ -220,7 +220,7 @@ static INPUT_PORTS_START( magic102 )
/*
credits inputs
- PORT_START
+ PORT_START("CRED1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -247,7 +247,7 @@ static INPUT_PORTS_START( magic102 )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START
+ PORT_START("CRED2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
diff --git a/src/mame/drivers/magicfly.c b/src/mame/drivers/magicfly.c
index 5e38b076a39..e80c5f4485c 100644
--- a/src/mame/drivers/magicfly.c
+++ b/src/mame/drivers/magicfly.c
@@ -482,7 +482,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( magicfly )
/* Multiplexed 4 x 5 bits.
Code accept only bits 0, 1, 2, 3 and 5 as valid. */
- PORT_START_TAG("IN0-0")
+ PORT_START("IN0-0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* present in the input test */
@@ -492,7 +492,7 @@ static INPUT_PORTS_START( magicfly )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-1")
+ PORT_START("IN0-1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* present in the input test */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* present in the input test */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Payout") PORT_CODE(KEYCODE_Q)
@@ -502,7 +502,7 @@ static INPUT_PORTS_START( magicfly )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-2")
+ PORT_START("IN0-2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* present in the input test */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* present in the input test */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
@@ -512,7 +512,7 @@ static INPUT_PORTS_START( magicfly )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-3")
+ PORT_START("IN0-3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Deal / Last Bet") PORT_CODE(KEYCODE_C)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Cancel") PORT_CODE(KEYCODE_V)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE )
@@ -522,7 +522,7 @@ static INPUT_PORTS_START( magicfly )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW0") /* Only 4 phisical DIP switches (valid bits = 4, 6, 7) */
+ PORT_START("DSW0") /* Only 4 phisical DIP switches (valid bits = 4, 6, 7) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -544,7 +544,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( 7mezzo )
/* Multiplexed 4 x 5 bits.
Code accept only bits 0, 1, 2, 3 and 5 as valid. */
- PORT_START_TAG("IN0-0")
+ PORT_START("IN0-0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* present in the input test */
@@ -554,7 +554,7 @@ static INPUT_PORTS_START( 7mezzo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-1")
+ PORT_START("IN0-1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Big") PORT_CODE(KEYCODE_A)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Small") PORT_CODE(KEYCODE_S)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Payout") PORT_CODE(KEYCODE_Q)
@@ -564,7 +564,7 @@ static INPUT_PORTS_START( 7mezzo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-2")
+ PORT_START("IN0-2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* present in the input test */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* present in the input test */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* present in the input test */
@@ -574,7 +574,7 @@ static INPUT_PORTS_START( 7mezzo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-3")
+ PORT_START("IN0-3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Deal / Last Bet") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Stand") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE )
@@ -584,7 +584,7 @@ static INPUT_PORTS_START( 7mezzo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW0") /* Only 4 phisical DIP switches (valid bits = 4, 6, 7) */
+ PORT_START("DSW0") /* Only 4 phisical DIP switches (valid bits = 4, 6, 7) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/magmax.c b/src/mame/drivers/magmax.c
index 7a08e8a3b37..d75cbe81e8c 100644
--- a/src/mame/drivers/magmax.c
+++ b/src/mame/drivers/magmax.c
@@ -242,7 +242,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( magmax )
- PORT_START /* Player 1 controls */
+ PORT_START("P1") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -252,7 +252,7 @@ static INPUT_PORTS_START( magmax )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* Player 2 controls */
+ PORT_START("P2") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -262,7 +262,7 @@ static INPUT_PORTS_START( magmax )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* Coin, Start, Test, Dipswitch */
+ PORT_START("SYSTEM") /* Coin, Start, Test, Dipswitch */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -272,7 +272,7 @@ static INPUT_PORTS_START( magmax )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* Dipswitch */
+ PORT_START("DSW") /* Dipswitch */
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x0003, "3" )
PORT_DIPSETTING( 0x0002, "4" )
diff --git a/src/mame/drivers/mainevt.c b/src/mame/drivers/mainevt.c
index a053e946b09..484e0db41bd 100644
--- a/src/mame/drivers/mainevt.c
+++ b/src/mame/drivers/mainevt.c
@@ -233,7 +233,7 @@ ADDRESS_MAP_END
/*****************************************************************************/
static INPUT_PORTS_START( mainevt )
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -243,7 +243,7 @@ static INPUT_PORTS_START( mainevt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE4 )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -253,7 +253,7 @@ static INPUT_PORTS_START( mainevt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -263,7 +263,7 @@ static INPUT_PORTS_START( mainevt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN1 */
+ PORT_START("P3") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
@@ -273,7 +273,7 @@ static INPUT_PORTS_START( mainevt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN2 */
+ PORT_START("P4") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
@@ -283,7 +283,7 @@ static INPUT_PORTS_START( mainevt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -314,7 +314,7 @@ static INPUT_PORTS_START( mainevt )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -338,7 +338,7 @@ static INPUT_PORTS_START( mainevt )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -353,7 +353,7 @@ static INPUT_PORTS_START( mainevt )
INPUT_PORTS_END
static INPUT_PORTS_START( mainev2p )
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -363,7 +363,7 @@ static INPUT_PORTS_START( mainev2p )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -373,7 +373,7 @@ static INPUT_PORTS_START( mainev2p )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -383,13 +383,13 @@ static INPUT_PORTS_START( mainev2p )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START /* IN1 */
+ PORT_START("P3") /* IN1 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN2 */
+ PORT_START("P4") /* IN2 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -425,7 +425,7 @@ static INPUT_PORTS_START( mainev2p )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -449,7 +449,7 @@ static INPUT_PORTS_START( mainev2p )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -464,7 +464,7 @@ static INPUT_PORTS_START( mainev2p )
INPUT_PORTS_END
static INPUT_PORTS_START( devstors )
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -474,7 +474,7 @@ static INPUT_PORTS_START( devstors )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -484,7 +484,7 @@ static INPUT_PORTS_START( devstors )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -494,13 +494,13 @@ static INPUT_PORTS_START( devstors )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START
+ PORT_START("P3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("P4")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -536,7 +536,7 @@ static INPUT_PORTS_START( devstors )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -559,7 +559,7 @@ static INPUT_PORTS_START( devstors )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -575,7 +575,7 @@ INPUT_PORTS_END
/* Same as 'devstors', but additional "Cocktail" Dip Switch (even if I don't see the use) */
static INPUT_PORTS_START( devstor2 )
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -585,7 +585,7 @@ static INPUT_PORTS_START( devstor2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -595,7 +595,7 @@ static INPUT_PORTS_START( devstor2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -605,13 +605,13 @@ static INPUT_PORTS_START( devstor2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START
+ PORT_START("P3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("P4")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -647,7 +647,7 @@ static INPUT_PORTS_START( devstor2 )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -670,7 +670,7 @@ static INPUT_PORTS_START( devstor2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/mainsnk.c b/src/mame/drivers/mainsnk.c
index e8e637e5c71..a8651572c29 100644
--- a/src/mame/drivers/mainsnk.c
+++ b/src/mame/drivers/mainsnk.c
@@ -154,7 +154,7 @@ static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( mainsnk )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -163,22 +163,22 @@ static INPUT_PORTS_START( mainsnk )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* sound CPU status */
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) /* ?? */
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) ) /* also 02,04 */
PORT_DIPSETTING( 0x06, DEF_STR( 2C_1C ) )
@@ -201,11 +201,11 @@ static INPUT_PORTS_START( mainsnk )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN5")
+ PORT_START("IN5")
INPUT_PORTS_END
static INPUT_PORTS_START( canvas )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -214,7 +214,7 @@ static INPUT_PORTS_START( canvas )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* sound CPU status? or vbl? */
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
@@ -228,7 +228,7 @@ static INPUT_PORTS_START( canvas )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2") /* 8bit */
+ PORT_START("IN2") /* 8bit */
PORT_DIPNAME( 0x01, 0x01, "2" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -254,7 +254,7 @@ static INPUT_PORTS_START( canvas )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN3") /* 8bit */
+ PORT_START("IN3") /* 8bit */
PORT_DIPNAME( 0x01, 0x01, "3" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -280,7 +280,7 @@ static INPUT_PORTS_START( canvas )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN4") /* 8bit */
+ PORT_START("IN4") /* 8bit */
PORT_DIPNAME( 0x01, 0x01, "4" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -306,7 +306,7 @@ static INPUT_PORTS_START( canvas )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN5") /* 8bit */
+ PORT_START("IN5") /* 8bit */
PORT_DIPNAME( 0x01, 0x01, "5" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/malzak.c b/src/mame/drivers/malzak.c
index 19adab42dac..22a6d3b6144 100644
--- a/src/mame/drivers/malzak.c
+++ b/src/mame/drivers/malzak.c
@@ -192,7 +192,7 @@ static INPUT_PORTS_START( malzak )
/* Malzak has an 8-way stick
and only one button (firing and bomb dropping on the same button) */
- PORT_START_TAG("IN0") /* I/O port 0x80 */
+ PORT_START("IN0") /* I/O port 0x80 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -202,10 +202,10 @@ static INPUT_PORTS_START( malzak )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
- PORT_START_TAG("POT")
+ PORT_START("POT")
/* No POT switch on Malzak as far as I know */
- PORT_START_TAG("SENSE") /* SENSE */
+ PORT_START("SENSE") /* SENSE */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
INPUT_PORTS_END
@@ -215,7 +215,7 @@ static INPUT_PORTS_START( malzak2 )
/* Same as Malzak, but with additional POT switch, and
possibly a reset button too. */
- PORT_START_TAG("IN0") /* I/O port 0x80 */
+ PORT_START("IN0") /* I/O port 0x80 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -225,14 +225,14 @@ static INPUT_PORTS_START( malzak2 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
- PORT_START_TAG("POT") /* Fake DIP switch to handle the POT switch */
+ PORT_START("POT") /* Fake DIP switch to handle the POT switch */
PORT_DIPNAME( 0x03, 0x00, "POT switch position" )
PORT_DIPSETTING( 0x00, "1" ) // Normal play
PORT_DIPSETTING( 0x01, "2" )
PORT_DIPSETTING( 0x02, "3" )
PORT_DIPSETTING( 0x03, "4" ) // Change settings
- PORT_START_TAG("SENSE") /* SENSE */
+ PORT_START("SENSE") /* SENSE */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
INPUT_PORTS_END
diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c
index 345cbb3d6b4..c518b0fa44e 100644
--- a/src/mame/drivers/mappy.c
+++ b/src/mame/drivers/mappy.c
@@ -927,7 +927,7 @@ ADDRESS_MAP_END
#define NAMCO_56IN0\
- PORT_START_TAG("IN0") /* 56XX #0 pins 22-29 */\
+ PORT_START("IN0") /* 56XX #0 pins 22-29 */\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY\
@@ -938,7 +938,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
#define NAMCO_5XIN0\
- PORT_START_TAG("IN0") /* 56XX #0 pins 22-29 */\
+ PORT_START("IN0") /* 56XX #0 pins 22-29 */\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY\
@@ -949,7 +949,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
#define NAMCO_56IN1\
- PORT_START_TAG("IN1") /* 56XX #0 pins 30-33 and 38-41 */\
+ PORT_START("IN1") /* 56XX #0 pins 30-33 and 38-41 */\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )\
@@ -960,7 +960,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
#define NAMCO_56DSW0\
- PORT_START_TAG("DSW0") /* 56XX #1 pins 30-33 */\
+ PORT_START("DSW0") /* 56XX #1 pins 30-33 */\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )\
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Cabinet ) )\
@@ -973,7 +973,7 @@ NAMCO_56IN0
NAMCO_56IN1
NAMCO_56DSW0
- PORT_START_TAG("DSW1") /* 56XX #1 pins 22-29 */
+ PORT_START("DSW1") /* 56XX #1 pins 22-29 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0f, "Rank 0-Normal" )
PORT_DIPSETTING( 0x0e, "Rank 1-Easiest" )
@@ -1003,7 +1003,7 @@ NAMCO_56DSW0
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* 56XX #1 pins 38-41 multiplexed */
+ PORT_START("DSW2") /* 56XX #1 pins 38-41 multiplexed */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
@@ -1042,7 +1042,7 @@ NAMCO_56IN0
NAMCO_56IN1
NAMCO_56DSW0
- PORT_START_TAG("DSW1") /* ???? #1 pins ??-?? */
+ PORT_START("DSW1") /* ???? #1 pins ??-?? */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
@@ -1074,7 +1074,7 @@ NAMCO_56DSW0
PORT_DIPSETTING( 0x40, "3" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_START_TAG("DSW2") /* ???? #1 pins ??-?? */
+ PORT_START("DSW2") /* ???? #1 pins ??-?? */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -1104,7 +1104,7 @@ static INPUT_PORTS_START( grobda )
NAMCO_5XIN0
NAMCO_56IN1
- PORT_START_TAG("DSW0") /* 56XX #1 pins 30-33 */
+ PORT_START("DSW0") /* 56XX #1 pins 30-33 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Cabinet ) )
@@ -1112,7 +1112,7 @@ NAMCO_56IN1
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) // service mode again
- PORT_START_TAG("DSW1") /* 56XX #1 pins 22-29 */
+ PORT_START("DSW1") /* 56XX #1 pins 22-29 */
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0e, 0x08, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
@@ -1136,7 +1136,7 @@ NAMCO_56IN1
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* 56XX #1 pins 38-41 multiplexed */
+ PORT_START("DSW2") /* 56XX #1 pins 38-41 multiplexed */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x02, "1" )
PORT_DIPSETTING( 0x01, "2" )
@@ -1166,7 +1166,7 @@ NAMCO_5XIN0
NAMCO_56IN1
NAMCO_56DSW0
- PORT_START_TAG("DSW1") /* 56XX #1 pins 22-29 */
+ PORT_START("DSW1") /* 56XX #1 pins 22-29 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1193,7 +1193,7 @@ NAMCO_56DSW0
PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSW2") /* 56XX #1 pins 38-41 multiplexed */
+ PORT_START("DSW2") /* 56XX #1 pins 38-41 multiplexed */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x02, "1" )
PORT_DIPSETTING( 0x03, "3" )
@@ -1228,7 +1228,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mappy )
- PORT_START_TAG("IN0") /* 58XX #0 pins 22-29 */
+ PORT_START("IN0") /* 58XX #0 pins 22-29 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1241,7 +1241,7 @@ static INPUT_PORTS_START( mappy )
NAMCO_56IN1
NAMCO_56DSW0
- PORT_START_TAG("DSW1") /* 58XX #1 pins 22-29 */
+ PORT_START("DSW1") /* 58XX #1 pins 22-29 */
/* According to the manual, 0x04, 0x08 and 0x10 should always be off, but... */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "Rank A" )
@@ -1267,7 +1267,7 @@ NAMCO_56DSW0
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* 58XX #1 pins 38-41 multiplexed */
+ PORT_START("DSW2") /* 58XX #1 pins 38-41 multiplexed */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
@@ -1305,7 +1305,7 @@ static INPUT_PORTS_START( todruaga )
NAMCO_56IN0
NAMCO_56IN1
- PORT_START_TAG("DSW0") /* 56XX #1 pins 30-33 */
+ PORT_START("DSW0") /* 56XX #1 pins 30-33 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Cabinet ) )
@@ -1313,7 +1313,7 @@ NAMCO_56IN1
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) // service mode again
- PORT_START_TAG("DSW1") /* 56XX #1 pins 22-29 */
+ PORT_START("DSW1") /* 56XX #1 pins 22-29 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -1334,7 +1334,7 @@ NAMCO_56IN1
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSW2") /* 56XX #1 pins 38-41 multiplexed */
+ PORT_START("DSW2") /* 56XX #1 pins 38-41 multiplexed */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1366,7 +1366,7 @@ static INPUT_PORTS_START( digdug2 )
NAMCO_56IN0
NAMCO_56IN1
- PORT_START_TAG("DSW0") /* 56XX #1 pins 30-33 */
+ PORT_START("DSW0") /* 56XX #1 pins 30-33 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Cabinet ) )
@@ -1374,7 +1374,7 @@ NAMCO_56IN1
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) // service mode again
- PORT_START_TAG("DSW1") /* 56XX #1 pins 22-29 */
+ PORT_START("DSW1") /* 56XX #1 pins 22-29 */
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x02, "3" )
@@ -1396,7 +1396,7 @@ NAMCO_56IN1
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* 56XX #1 pins 38-41 multiplexed */
+ PORT_START("DSW2") /* 56XX #1 pins 38-41 multiplexed */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1428,7 +1428,7 @@ static INPUT_PORTS_START( motos )
NAMCO_5XIN0
NAMCO_56IN1
- PORT_START_TAG("DSW0") /* 56XX #1 pins 30-33 */
+ PORT_START("DSW0") /* 56XX #1 pins 30-33 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Cabinet ) )
@@ -1436,7 +1436,7 @@ NAMCO_56IN1
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) // service mode again
- PORT_START_TAG("DSW1") /* 56XX #1 pins 22-29 */
+ PORT_START("DSW1") /* 56XX #1 pins 22-29 */
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x06, 0x06, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
@@ -1458,7 +1458,7 @@ NAMCO_56IN1
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* 56XX #1 pins 38-41 multiplexed */
+ PORT_START("DSW2") /* 56XX #1 pins 38-41 multiplexed */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/marineb.c b/src/mame/drivers/marineb.c
index b4855cb931b..b06fd8031ce 100644
--- a/src/mame/drivers/marineb.c
+++ b/src/mame/drivers/marineb.c
@@ -86,21 +86,21 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( marineb )
- PORT_START /* IN0 */
+ PORT_START("P2") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x3c, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x3c, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
- PORT_START /* DSW1 */
+ PORT_START("DSW") /* DSW1 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -125,7 +125,7 @@ static INPUT_PORTS_START( marineb )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* IN3 */
+ PORT_START("SYSTEM") /* IN3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -136,21 +136,21 @@ static INPUT_PORTS_START( marineb )
INPUT_PORTS_END
static INPUT_PORTS_START( changes )
- PORT_START /* IN0 */
+ PORT_START("P2") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x3c, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x3c, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
- PORT_START /* DSW1 */
+ PORT_START("DSW") /* DSW1 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -174,7 +174,7 @@ static INPUT_PORTS_START( changes )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* IN3 */
+ PORT_START("SYSTEM") /* IN3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -183,21 +183,21 @@ static INPUT_PORTS_START( changes )
INPUT_PORTS_END
static INPUT_PORTS_START( hoccer )
- PORT_START /* IN0 */
+ PORT_START("P2") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x3c, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x3c, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
- PORT_START /* DSW1 */
+ PORT_START("DSW") /* DSW1 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -220,7 +220,7 @@ static INPUT_PORTS_START( hoccer )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_3C ) )
- PORT_START /* IN3 */
+ PORT_START("SYSTEM") /* IN3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -231,7 +231,7 @@ static INPUT_PORTS_START( hoccer )
INPUT_PORTS_END
static INPUT_PORTS_START( wanted )
- PORT_START /* IN0 */
+ PORT_START("P2") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -241,7 +241,7 @@ static INPUT_PORTS_START( wanted )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -251,7 +251,7 @@ static INPUT_PORTS_START( wanted )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -276,7 +276,7 @@ static INPUT_PORTS_START( wanted )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -309,7 +309,7 @@ static INPUT_PORTS_START( wanted )
INPUT_PORTS_END
static INPUT_PORTS_START( bcruzm12 )
- PORT_START /* IN0 */
+ PORT_START("P2") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -319,7 +319,7 @@ static INPUT_PORTS_START( bcruzm12 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -329,7 +329,7 @@ static INPUT_PORTS_START( bcruzm12 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -351,7 +351,7 @@ static INPUT_PORTS_START( bcruzm12 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x03, 0x01, "2nd Bonus Life" )
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
PORT_DIPSETTING( 0x01, "60000" )
diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c
index 6f0e3bfa182..85835452fde 100644
--- a/src/mame/drivers/marinedt.c
+++ b/src/mame/drivers/marinedt.c
@@ -298,7 +298,7 @@ static ADDRESS_MAP_START( marinedt_writeport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( marinedt )
- PORT_START_TAG("DSW0") /* IN0 */
+ PORT_START("DSW0") /* IN0 */
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0f, DEF_STR( 9C_1C ) )
PORT_DIPSETTING( 0x0e, DEF_STR( 8C_1C ) )
@@ -334,7 +334,7 @@ static INPUT_PORTS_START( marinedt )
PORT_DIPSETTING( 0x60, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x70, DEF_STR( 1C_8C ) )
- PORT_START_TAG("IN0") /* IN1 */
+ PORT_START("IN0") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 )
@@ -344,7 +344,7 @@ static INPUT_PORTS_START( marinedt )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START_TAG("DSW1") /* IN2 */
+ PORT_START("DSW1") /* IN2 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x01, "5000" )
PORT_DIPSETTING( 0x00, "10000" )
@@ -370,11 +370,11 @@ static INPUT_PORTS_START( marinedt )
PORT_DIPSETTING( 0x80, "5" )
PORT_DIPSETTING( 0xc0, "6" )
- PORT_START_TAG("TRACKX") /* IN3 - FAKE MUXED */
+ PORT_START("TRACKX") /* IN3 - FAKE MUXED */
//check all bits are used
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_REVERSE
- PORT_START_TAG("TRACKY") /* IN4 - FAKE MUXED */
+ PORT_START("TRACKY") /* IN4 - FAKE MUXED */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10)
INPUT_PORTS_END
diff --git a/src/mame/drivers/mario.c b/src/mame/drivers/mario.c
index 0705b299da0..0fa19706096 100644
--- a/src/mame/drivers/mario.c
+++ b/src/mame/drivers/mario.c
@@ -199,7 +199,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( mario )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -209,7 +209,7 @@ static INPUT_PORTS_START( mario )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_HIGH )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -219,7 +219,7 @@ static INPUT_PORTS_START( mario )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 ) /* doesn't work in game, but does in service mode */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:!1,!2")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -241,7 +241,7 @@ static INPUT_PORTS_START( mario )
PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Hardest ) )
- PORT_START_TAG("MONITOR")
+ PORT_START("MONITOR")
PORT_CONFNAME( 0x01, 0x00, "Monitor" )
PORT_CONFSETTING( 0x00, "Nintendo" )
PORT_CONFSETTING( 0x01, "Std 15.72Khz" )
diff --git a/src/mame/drivers/markham.c b/src/mame/drivers/markham.c
index d7ff2e59588..65b52ee5ac5 100644
--- a/src/mame/drivers/markham.c
+++ b/src/mame/drivers/markham.c
@@ -83,7 +83,7 @@ ADDRESS_MAP_END
/****************************************************************************/
static INPUT_PORTS_START( markham )
- PORT_START /* dsw1 */
+ PORT_START("DSW1") /* dsw1 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "5" )
@@ -114,7 +114,7 @@ static INPUT_PORTS_START( markham )
PORT_DIPSETTING( 0xe0, "1C 2C / 1C 6C" )
PORT_DIPSETTING( 0xf0, DEF_STR( Free_Play ) )
- PORT_START /* dsw2 */
+ PORT_START("DSW2") /* dsw2 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
PORT_DIPSETTING( 0x01, "20000" )
@@ -131,7 +131,7 @@ static INPUT_PORTS_START( markham )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* e002 */
+ PORT_START("P1") /* e002 */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 )
@@ -141,7 +141,7 @@ static INPUT_PORTS_START( markham )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
- PORT_START /* e003 */
+ PORT_START("P2") /* e003 */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -151,7 +151,7 @@ static INPUT_PORTS_START( markham )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* e005 */
+ PORT_START("SYSTEM") /* e005 */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )
diff --git a/src/mame/drivers/marvins.c b/src/mame/drivers/marvins.c
index 7f00b273dba..d66f56631bd 100644
--- a/src/mame/drivers/marvins.c
+++ b/src/mame/drivers/marvins.c
@@ -221,7 +221,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( marvins )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 )
@@ -231,7 +231,7 @@ static INPUT_PORTS_START( marvins )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* sound CPU status */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* player#1 controls */
+ PORT_START("IN1") /* player#1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -240,7 +240,7 @@ static INPUT_PORTS_START( marvins )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* player#2 controls */
+ PORT_START("IN2") /* player#2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -249,7 +249,7 @@ static INPUT_PORTS_START( marvins )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x01, "2" )
@@ -274,7 +274,7 @@ static INPUT_PORTS_START( marvins )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x07, 0x00, "1st Bonus Life" ) PORT_DIPLOCATION("SW2:1,2,3")
PORT_DIPSETTING( 0x00, "10000" )
PORT_DIPSETTING( 0x01, "20000" )
@@ -302,7 +302,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( vangrd2 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -312,7 +312,7 @@ static INPUT_PORTS_START( vangrd2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* player#1 controls */
+ PORT_START("IN1") /* player#1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -321,7 +321,7 @@ static INPUT_PORTS_START( vangrd2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* player#2 controls */
+ PORT_START("IN2") /* player#2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -330,7 +330,7 @@ static INPUT_PORTS_START( vangrd2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x00, DEF_STR( 6C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 5C_1C ) )
@@ -355,7 +355,7 @@ static INPUT_PORTS_START( vangrd2 )
PORT_DIPSETTING( 0x80, "3" )
PORT_DIPSETTING( 0xc0, "5" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -384,7 +384,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( madcrash )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -394,7 +394,7 @@ static INPUT_PORTS_START( madcrash )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN1") /* player#1 controls */
+ PORT_START("IN1") /* player#1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -403,7 +403,7 @@ static INPUT_PORTS_START( madcrash )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* player#2 controls */
+ PORT_START("IN2") /* player#2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -412,7 +412,7 @@ static INPUT_PORTS_START( madcrash )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPUNUSED_DIPLOC(0x01, IP_ACTIVE_LOW, "SW1:1") /* Listed as Unused */
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:2")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
@@ -435,7 +435,7 @@ static INPUT_PORTS_START( madcrash )
PORT_DIPSETTING( 0x40, "50000 120000" )
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, "Bonus Life Occurence" ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, "1st, 2nd, then every 2nd" ) /* Check the "Non Bugs" page */
PORT_DIPSETTING( 0x00, "1st and 2nd only" )
diff --git a/src/mame/drivers/mastboy.c b/src/mame/drivers/mastboy.c
index 6d99eeb44f6..1e491477087 100644
--- a/src/mame/drivers/mastboy.c
+++ b/src/mame/drivers/mastboy.c
@@ -727,21 +727,21 @@ ADDRESS_MAP_END
/* Input Ports */
static INPUT_PORTS_START( mastboy )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x1e, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x1e, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "Game Mode" )
PORT_DIPSETTING( 0x01, "1" ) /* 1: Counts only the right or wrong answer from the player who answered first. */
PORT_DIPSETTING( 0x00, "2" ) /* 2: Waits until both players have answered and then counts the right or wrong answers. */
@@ -770,7 +770,7 @@ static INPUT_PORTS_START( mastboy )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 9C_1C ) )
PORT_DIPSETTING( 0x10, DEF_STR( 8C_1C ) )
diff --git a/src/mame/drivers/matmania.c b/src/mame/drivers/matmania.c
index 891742f4078..edbc214bebe 100644
--- a/src/mame/drivers/matmania.c
+++ b/src/mame/drivers/matmania.c
@@ -172,7 +172,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( matmania )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -182,7 +182,7 @@ static INPUT_PORTS_START( matmania )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -192,7 +192,7 @@ static INPUT_PORTS_START( matmania )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME(0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -212,7 +212,7 @@ static INPUT_PORTS_START( matmania )
PORT_SERVICE_DIPLOC( 0x40, IP_ACTIVE_LOW, "SW1:7" )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK ) /* Listed as always ON among DIPs in the manual */
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME(0x03, 0x02, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Medium ) ) /* According to the manual, default is Medium */
diff --git a/src/mame/drivers/maxaflex.c b/src/mame/drivers/maxaflex.c
index 434cf8bd2c7..568e920e770 100644
--- a/src/mame/drivers/maxaflex.c
+++ b/src/mame/drivers/maxaflex.c
@@ -267,12 +267,12 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( a600xl )
- PORT_START_TAG("console") /* IN0 console keys & switch settings */
+ PORT_START("console") /* IN0 console keys & switch settings */
PORT_BIT(0x04, 0x04, IPT_KEYBOARD) PORT_NAME("Option") PORT_CODE(KEYCODE_F2)
PORT_BIT(0x02, 0x02, IPT_KEYBOARD) PORT_NAME("Select") PORT_CODE(KEYCODE_F1)
PORT_BIT(0x01, 0x01, IPT_START1 )
- PORT_START_TAG("djoy_0_1") /* IN1 digital joystick #1 + #2 (PIA port A) */
+ PORT_START("djoy_0_1") /* IN1 digital joystick #1 + #2 (PIA port A) */
PORT_BIT(0x01, 0x01, IPT_JOYSTICK_UP) PORT_PLAYER(1)
PORT_BIT(0x02, 0x02, IPT_JOYSTICK_DOWN) PORT_PLAYER(1)
PORT_BIT(0x04, 0x04, IPT_JOYSTICK_LEFT) PORT_PLAYER(1)
@@ -283,7 +283,7 @@ static INPUT_PORTS_START( a600xl )
PORT_BIT(0x40, 0x40, IPT_JOYSTICK_LEFT) PORT_PLAYER(2)
PORT_BIT(0x80, 0x80, IPT_JOYSTICK_RIGHT) PORT_PLAYER(2)
- PORT_START_TAG("djoy_2_3") /* IN2 digital joystick #3 + #4 (PIA port B) */
+ PORT_START("djoy_2_3") /* IN2 digital joystick #3 + #4 (PIA port B) */
/* not connected */
PORT_BIT(0x01, 0x01, IPT_JOYSTICK_UP) PORT_PLAYER(3)
PORT_BIT(0x02, 0x02, IPT_JOYSTICK_DOWN) PORT_PLAYER(3)
@@ -294,7 +294,7 @@ static INPUT_PORTS_START( a600xl )
PORT_BIT(0x40, 0x40, IPT_JOYSTICK_LEFT) PORT_PLAYER(4)
PORT_BIT(0x80, 0x80, IPT_JOYSTICK_RIGHT) PORT_PLAYER(4)
- PORT_START_TAG("djoy_b") /* IN3 digital joystick buttons (GTIA button bits) */
+ PORT_START("djoy_b") /* IN3 digital joystick buttons (GTIA button bits) */
PORT_BIT(0x01, 0x01, IPT_BUTTON1) PORT_PLAYER(1)
PORT_BIT(0x02, 0x02, IPT_BUTTON1) PORT_PLAYER(2)
PORT_BIT(0x04, 0x04, IPT_BUTTON1) PORT_PLAYER(3)
@@ -305,10 +305,10 @@ static INPUT_PORTS_START( a600xl )
PORT_BIT(0x80, 0x80, IPT_BUTTON2) PORT_PLAYER(4)
/* Max-A-Flex specific ports */
- PORT_START_TAG("coin") /* IN4 coin */
+ PORT_START("coin") /* IN4 coin */
PORT_BIT(0x1, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
- PORT_START_TAG("dsw") /* IN5 DSW */
+ PORT_START("dsw") /* IN5 DSW */
PORT_DIPNAME(0xf, 0x9, "Coin/Time" )
PORT_DIPSETTING( 0x0, "30 sec" )
PORT_DIPSETTING( 0x1, "60 sec" )
diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c
index fc1414e6382..70d1feb5e94 100644
--- a/src/mame/drivers/mayumi.c
+++ b/src/mame/drivers/mayumi.c
@@ -106,7 +106,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mayumi )
- PORT_START_TAG("DSW1") /* dsw1 */
+ PORT_START("DSW1") /* dsw1 */
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -131,7 +131,7 @@ static INPUT_PORTS_START( mayumi )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* dsw2 */
+ PORT_START("DSW2") /* dsw2 */
PORT_DIPNAME( 0x80, 0x80, "Unknown 2-1" )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -157,7 +157,7 @@ static INPUT_PORTS_START( mayumi )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("KEY0") /* P1 IN0 (2) */
+ PORT_START("KEY0") /* P1 IN0 (2) */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_I )
@@ -166,7 +166,7 @@ static INPUT_PORTS_START( mayumi )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY1") /* P1 IN1 (3) */
+ PORT_START("KEY1") /* P1 IN1 (3) */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_J )
@@ -175,7 +175,7 @@ static INPUT_PORTS_START( mayumi )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY2") /* P1 IN2 (4) */
+ PORT_START("KEY2") /* P1 IN2 (4) */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_C )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_K )
@@ -184,7 +184,7 @@ static INPUT_PORTS_START( mayumi )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY3") /* P1 IN3 (5) */
+ PORT_START("KEY3") /* P1 IN3 (5) */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_D )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_L )
@@ -193,11 +193,11 @@ static INPUT_PORTS_START( mayumi )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY4") /* P1 IN4 (6) */
+ PORT_START("KEY4") /* P1 IN4 (6) */
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY5") /* P2 IN0 (7) */ \
+ PORT_START("KEY5") /* P2 IN0 (7) */ \
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_PLAYER(2)
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_PLAYER(2)
@@ -206,7 +206,7 @@ static INPUT_PORTS_START( mayumi )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY6") /* P2 IN1 (8) */
+ PORT_START("KEY6") /* P2 IN1 (8) */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_PLAYER(2)
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_PLAYER(2)
@@ -215,7 +215,7 @@ static INPUT_PORTS_START( mayumi )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY7") /* P2 IN2 (9) */
+ PORT_START("KEY7") /* P2 IN2 (9) */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_PLAYER(2)
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_K ) PORT_PLAYER(2)
@@ -224,7 +224,7 @@ static INPUT_PORTS_START( mayumi )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY8") /* P2 IN3 (10) */
+ PORT_START("KEY8") /* P2 IN3 (10) */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_PLAYER(2)
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_PLAYER(2)
@@ -233,11 +233,11 @@ static INPUT_PORTS_START( mayumi )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY9") /* P2 IN4 (11) */
+ PORT_START("KEY9") /* P2 IN4 (11) */
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW , IPT_COIN1 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )
diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c
index 4abb5595dce..7ee0f6f207b 100644
--- a/src/mame/drivers/mazerbla.c
+++ b/src/mame/drivers/mazerbla.c
@@ -1152,7 +1152,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mazerbla )
- PORT_START_TAG("ZPU") /* Strobe 0: ZPU Switches */
+ PORT_START("ZPU") /* Strobe 0: ZPU Switches */
PORT_DIPNAME( 0x40, 0x40, "ZPU Switch 1" )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1160,7 +1160,7 @@ static INPUT_PORTS_START( mazerbla )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW0") /* Strobe 1: Dip Switches 28-35*/
+ PORT_START("DSW0") /* Strobe 1: Dip Switches 28-35*/
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "6" )
PORT_DIPSETTING( 0x02, "5" )
@@ -1182,7 +1182,7 @@ static INPUT_PORTS_START( mazerbla )
PORT_DIPSETTING( 0x40, "60000" )
PORT_DIPSETTING( 0x00, "70000" )
- PORT_START_TAG("DSW1") /* Strobe 2: Dip Switches 20-27*/
+ PORT_START("DSW1") /* Strobe 2: Dip Switches 20-27*/
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x06, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_3C ) )
@@ -1219,7 +1219,7 @@ static INPUT_PORTS_START( mazerbla )
PORT_DIPSETTING( 0x80, "1 Coin/10 Credits" )
PORT_DIPSETTING( 0x70, "1 Coin/14 Credits" )
- PORT_START_TAG("DSW2") /* Strobe 3: Dip Switches 12-19*/
+ PORT_START("DSW2") /* Strobe 3: Dip Switches 12-19*/
PORT_DIPNAME( 0x01, 0x01, "Service Index" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1245,7 +1245,7 @@ static INPUT_PORTS_START( mazerbla )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* Strobe 4: Dip Switches 4-11 */
+ PORT_START("DSW3") /* Strobe 4: Dip Switches 4-11 */
PORT_DIPNAME( 0x03, 0x02, "Number of Freezes" )
PORT_DIPSETTING( 0x03, "4" )
PORT_DIPSETTING( 0x02, "3" )
@@ -1271,7 +1271,7 @@ static INPUT_PORTS_START( mazerbla )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("BUTTONS") /* Strobe 5: coin1&2, start1&2, fire */
+ PORT_START("BUTTONS") /* Strobe 5: coin1&2, start1&2, fire */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1281,20 +1281,20 @@ static INPUT_PORTS_START( mazerbla )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("STICK0_X") /* Strobe 6: horizontal movement of gun */
+ PORT_START("STICK0_X") /* Strobe 6: horizontal movement of gun */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(7) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("STICK0_Y") /* Strobe 7: vertical movement of gun */
+ PORT_START("STICK0_Y") /* Strobe 7: vertical movement of gun */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(7) PORT_PLAYER(1)
/* Mazer Blazer cabinet has only one gun, really */
- PORT_START_TAG("STICK1_X") /* Strobe 8: horizontal movement of gun */
+ PORT_START("STICK1_X") /* Strobe 8: horizontal movement of gun */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(7) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("STICK1_Y") /* Strobe 9: vertical movement of gun */
+ PORT_START("STICK1_Y") /* Strobe 9: vertical movement of gun */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(7) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( greatgun )
- PORT_START_TAG("ZPU") /* Strobe 0: ZPU Switches */
+ PORT_START("ZPU") /* Strobe 0: ZPU Switches */
PORT_DIPNAME( 0x40, 0x40, "ZPU Switch 1" )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1302,7 +1302,7 @@ static INPUT_PORTS_START( greatgun )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW0") /* Strobe 1: Dip Switches 28-35*/
+ PORT_START("DSW0") /* Strobe 1: Dip Switches 28-35*/
PORT_DIPNAME( 0x03, 0x00, "Starting Number of Bullets/Credit" )
PORT_DIPSETTING( 0x03, "60" )
PORT_DIPSETTING( 0x02, "70" )
@@ -1329,7 +1329,7 @@ static INPUT_PORTS_START( greatgun )
PORT_DIPSETTING( 0x80, "1" )
PORT_DIPSETTING( 0x00, "2" )
- PORT_START_TAG("DSW1") /* Strobe 2: Dip Switches 20-27*/
+ PORT_START("DSW1") /* Strobe 2: Dip Switches 20-27*/
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x06, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_3C ) )
@@ -1366,7 +1366,7 @@ static INPUT_PORTS_START( greatgun )
PORT_DIPSETTING( 0x80, "1 Coin/10 Credits" )
PORT_DIPSETTING( 0x70, "1 Coin/14 Credits" )
- PORT_START_TAG("DSW2") /* Strobe 3: Dip Switches 12-19*/
+ PORT_START("DSW2") /* Strobe 3: Dip Switches 12-19*/
PORT_DIPNAME( 0x01, 0x01, "Service Index" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1392,7 +1392,7 @@ static INPUT_PORTS_START( greatgun )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* Strobe 4: Dip Switches 4-11 */
+ PORT_START("DSW3") /* Strobe 4: Dip Switches 4-11 */
PORT_DIPNAME( 0x01, 0x01, "Free game/coin return" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1419,7 +1419,7 @@ static INPUT_PORTS_START( greatgun )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("BUTTONS") /* Strobe 5: coin1&2, start1&2, fire */
+ PORT_START("BUTTONS") /* Strobe 5: coin1&2, start1&2, fire */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1429,14 +1429,14 @@ static INPUT_PORTS_START( greatgun )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 )
- PORT_START_TAG("STICK0_X") /* Strobe 6: horizontal movement of gun */
+ PORT_START("STICK0_X") /* Strobe 6: horizontal movement of gun */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(7) PORT_PLAYER(1)
- PORT_START_TAG("STICK0_Y") /* Strobe 7: vertical movement of gun */
+ PORT_START("STICK0_Y") /* Strobe 7: vertical movement of gun */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(7) PORT_PLAYER(1)
- PORT_START_TAG("STICK1_X") /* Strobe 8: horizontal movement of gun */
+ PORT_START("STICK1_X") /* Strobe 8: horizontal movement of gun */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(7) PORT_PLAYER(2)
- PORT_START_TAG("STICK1_Y") /* Strobe 9: vertical movement of gun */
+ PORT_START("STICK1_Y") /* Strobe 9: vertical movement of gun */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(7) PORT_PLAYER(2)
INPUT_PORTS_END
diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c
index 6d1e099e42d..1becf010613 100644
--- a/src/mame/drivers/mcatadv.c
+++ b/src/mame/drivers/mcatadv.c
@@ -305,7 +305,7 @@ ADDRESS_MAP_END
/*** Inputs ***/
static INPUT_PORTS_START( mcatadv )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -317,7 +317,7 @@ static INPUT_PORTS_START( mcatadv )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xfe00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -330,7 +330,7 @@ static INPUT_PORTS_START( mcatadv )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0xfc00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -358,7 +358,7 @@ static INPUT_PORTS_START( mcatadv )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW1",0x08,PORTCOND_EQUALS,0x08)
PORT_DIPSETTING( 0x80, DEF_STR( 1C_4C ) ) PORT_CONDITION("DSW1",0x08,PORTCOND_EQUALS,0x00)
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -382,7 +382,7 @@ static INPUT_PORTS_START( mcatadv )
INPUT_PORTS_END
static INPUT_PORTS_START( nost )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -396,7 +396,7 @@ static INPUT_PORTS_START( nost )
PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // Must be LOW or startup freezes !
PORT_BIT( 0xf400, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -409,7 +409,7 @@ static INPUT_PORTS_START( nost )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0xfc00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x02, "2" )
PORT_DIPSETTING( 0x03, "3" )
@@ -432,7 +432,7 @@ static INPUT_PORTS_START( nost )
PORT_DIPSETTING( 0x40, "1000k 2000k" )
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 2C_1C ) )
diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c
index 1c0ec99c7d7..15eb1977fa8 100644
--- a/src/mame/drivers/mcr.c
+++ b/src/mame/drivers/mcr.c
@@ -719,7 +719,7 @@ ADDRESS_MAP_END
/* verified from wiring diagram, plus DIP switches from manual */
static INPUT_PORTS_START( solarfox )
- PORT_START_TAG("SSIO.IP0") /* J4 1-8 */
+ PORT_START("SSIO.IP0") /* J4 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -729,7 +729,7 @@ static INPUT_PORTS_START( solarfox )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("SSIO.IP1") /* J4 10-13,15-18 */
+ PORT_START("SSIO.IP1") /* J4 10-13,15-18 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
@@ -739,11 +739,11 @@ static INPUT_PORTS_START( solarfox )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
- PORT_START_TAG("SSIO.IP2") /* J5 1-8 */
+ PORT_START("SSIO.IP2") /* J5 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.IP3") /* DIPSW @ B3 */
+ PORT_START("SSIO.IP3") /* DIPSW @ B3 */
PORT_DIPNAME( 0x03, 0x03, "Bonus" )
PORT_DIPSETTING( 0x02, DEF_STR( None ) )
PORT_DIPSETTING( 0x03, "After 10 racks" )
@@ -760,17 +760,17 @@ static INPUT_PORTS_START( solarfox )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ))
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ))
- PORT_START_TAG("SSIO.IP4") /* J6 1-8 */
+ PORT_START("SSIO.IP4") /* J6 1-8 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.DIP")
+ PORT_START("SSIO.DIP")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
/* verified from wiring diagram, plus DIP switches from manual */
static INPUT_PORTS_START( kick )
- PORT_START_TAG("SSIO.IP0") /* J4 1-8 */
+ PORT_START("SSIO.IP0") /* J4 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -780,32 +780,32 @@ static INPUT_PORTS_START( kick )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("SSIO.IP1") /* J4 10-13,15-18 */
+ PORT_START("SSIO.IP1") /* J4 10-13,15-18 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(3) PORT_KEYDELTA(50) PORT_REVERSE
- PORT_START_TAG("SSIO.IP2") /* J5 1-8 */
+ PORT_START("SSIO.IP2") /* J5 1-8 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.IP3") /* DIPSW @ B3 */
+ PORT_START("SSIO.IP3") /* DIPSW @ B3 */
PORT_DIPNAME( 0x01, 0x00, "Music" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ))
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SSIO.IP4") /* J6 1-8 */
+ PORT_START("SSIO.IP4") /* J6 1-8 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.DIP")
+ PORT_START("SSIO.DIP")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DIAL2")
+ PORT_START("DIAL2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
/* verified from wiring diagram, plus DIP switches from manual */
static INPUT_PORTS_START( kickc )
- PORT_START_TAG("SSIO.IP0") /* J4 1-8 */
+ PORT_START("SSIO.IP0") /* J4 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -815,14 +815,14 @@ static INPUT_PORTS_START( kickc )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("SSIO.IP1") /* J4 10-13,15-18 */
+ PORT_START("SSIO.IP1") /* J4 10-13,15-18 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(3) PORT_KEYDELTA(50) PORT_REVERSE
- PORT_START_TAG("SSIO.IP2") /* J5 1-8 */
+ PORT_START("SSIO.IP2") /* J5 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.IP3") /* DIPSW @ B3 */
+ PORT_START("SSIO.IP3") /* DIPSW @ B3 */
PORT_DIPNAME( 0x01, 0x00, "Music" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ))
@@ -832,20 +832,20 @@ static INPUT_PORTS_START( kickc )
PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ))
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SSIO.IP4") /* J6 1-8 */
+ PORT_START("SSIO.IP4") /* J6 1-8 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SSIO.DIP")
+ PORT_START("SSIO.DIP")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DIAL2")
+ PORT_START("DIAL2")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(3) PORT_KEYDELTA(50) PORT_REVERSE PORT_COCKTAIL
INPUT_PORTS_END
/* verified from wiring diagram, plus DIP switches from manual */
static INPUT_PORTS_START( shollow )
- PORT_START_TAG("SSIO.IP0") /* J4 1-8 */
+ PORT_START("SSIO.IP0") /* J4 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -855,7 +855,7 @@ static INPUT_PORTS_START( shollow )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("SSIO.IP1") /* J4 10-13,15-18 */
+ PORT_START("SSIO.IP1") /* J4 10-13,15-18 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -865,10 +865,10 @@ static INPUT_PORTS_START( shollow )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("SSIO.IP2") /* J5 1-8 */
+ PORT_START("SSIO.IP2") /* J5 1-8 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.IP3") /* DIPSW @ B3 */
+ PORT_START("SSIO.IP3") /* DIPSW @ B3 */
PORT_DIPNAME( 0x01, 0x01, "Coin Meters" )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x00, "2" )
@@ -877,17 +877,17 @@ static INPUT_PORTS_START( shollow )
PORT_DIPSETTING( 0x02, DEF_STR( Cocktail ) )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SSIO.IP4") /* J6 1-8 */
+ PORT_START("SSIO.IP4") /* J6 1-8 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.DIP")
+ PORT_START("SSIO.DIP")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
/* verified from wiring diagram, plus DIP switches from manual */
static INPUT_PORTS_START( tron )
- PORT_START_TAG("SSIO.IP0") /* J4 1-8 */
+ PORT_START("SSIO.IP0") /* J4 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -897,10 +897,10 @@ static INPUT_PORTS_START( tron )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("SSIO.IP1") /* J4 10-13,15-18 */
+ PORT_START("SSIO.IP1") /* J4 10-13,15-18 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X) PORT_REVERSE
- PORT_START_TAG("SSIO.IP2") /* J5 1-8 */
+ PORT_START("SSIO.IP2") /* J5 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -910,7 +910,7 @@ static INPUT_PORTS_START( tron )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("SSIO.IP3") /* DIPSW @ B3 */
+ PORT_START("SSIO.IP3") /* DIPSW @ B3 */
PORT_DIPNAME( 0x01, 0x00, "Coin Meters" ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x00, "2" )
@@ -928,10 +928,10 @@ static INPUT_PORTS_START( tron )
// According to the manual, SW1 is a bank of *10* switches (9 is unused and 10 is freeze)
// Where are the values for the other two bits read?
- PORT_START_TAG("SSIO.IP4") /* J6 1-8 */
+ PORT_START("SSIO.IP4") /* J6 1-8 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_COCKTAIL
- PORT_START_TAG("SSIO.DIP")
+ PORT_START("SSIO.DIP")
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -940,7 +940,7 @@ INPUT_PORTS_END
/* verified from wiring diagram, plus DIP switches from manual */
static INPUT_PORTS_START( kroozr )
- PORT_START_TAG("SSIO.IP0") /* J4 1-8 */
+ PORT_START("SSIO.IP0") /* J4 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -950,7 +950,7 @@ static INPUT_PORTS_START( kroozr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("SSIO.IP1") /* J4 10-13,15-18 */
+ PORT_START("SSIO.IP1") /* J4 10-13,15-18 */
PORT_BIT( 0x07, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* low 3 bits of spinner */
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* sensor J1-10 */
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* sensor J1-9 */
@@ -958,30 +958,30 @@ static INPUT_PORTS_START( kroozr )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* upper 1 bit of spinner */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_START_TAG("SSIO.IP2") /* J5 1-8 */
+ PORT_START("SSIO.IP2") /* J5 1-8 */
PORT_BIT( 0xff, 0x64, IPT_AD_STICK_X ) PORT_MINMAX(48,152) PORT_SENSITIVITY(100) PORT_KEYDELTA(52)
- PORT_START_TAG("SSIO.IP3") /* DIPSW @ B3 */
+ PORT_START("SSIO.IP3") /* DIPSW @ B3 */
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x40, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SSIO.IP4") /* J6 1-8 */
+ PORT_START("SSIO.IP4") /* J6 1-8 */
PORT_BIT( 0xff, 0x64, IPT_AD_STICK_Y ) PORT_MINMAX(48,152) PORT_SENSITIVITY(100) PORT_KEYDELTA(52)
- PORT_START_TAG("SSIO.DIP")
+ PORT_START("SSIO.DIP")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DIAL")
+ PORT_START("DIAL")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(40) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X) PORT_REVERSE
INPUT_PORTS_END
/* verified from wiring diagram, plus DIP switches from manual */
static INPUT_PORTS_START( domino )
- PORT_START_TAG("SSIO.IP0") /* J4 1-8 */
+ PORT_START("SSIO.IP0") /* J4 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -991,14 +991,14 @@ static INPUT_PORTS_START( domino )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("SSIO.IP1") /* J4 10-13,15-18 */
+ PORT_START("SSIO.IP1") /* J4 10-13,15-18 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.IP2") /* J5 1-8 */
+ PORT_START("SSIO.IP2") /* J5 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -1006,7 +1006,7 @@ static INPUT_PORTS_START( domino )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.IP3") /* DIPSW @ B3 */
+ PORT_START("SSIO.IP3") /* DIPSW @ B3 */
PORT_DIPNAME( 0x01, 0x00, "Music" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ))
@@ -1021,17 +1021,17 @@ static INPUT_PORTS_START( domino )
PORT_DIPSETTING( 0x80, "1" )
PORT_DIPSETTING( 0x00, "2" )
- PORT_START_TAG("SSIO.IP4") /* J6 1-8 */
+ PORT_START("SSIO.IP4") /* J6 1-8 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SSIO.DIP")
+ PORT_START("SSIO.DIP")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
/* verified from wiring diagram, plus DIP switches from manual */
static INPUT_PORTS_START( journey )
- PORT_START_TAG("SSIO.IP0") /* J4 1-8 */
+ PORT_START("SSIO.IP0") /* J4 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1041,14 +1041,14 @@ static INPUT_PORTS_START( journey )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("SSIO.IP1") /* J4 10-13,15-18 */
+ PORT_START("SSIO.IP1") /* J4 10-13,15-18 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.IP2") /* J5 1-8 */
+ PORT_START("SSIO.IP2") /* J5 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -1056,7 +1056,7 @@ static INPUT_PORTS_START( journey )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.IP3") /* DIPSW @ B3 */
+ PORT_START("SSIO.IP3") /* DIPSW @ B3 */
PORT_DIPNAME( 0x01, 0x01, "Coin Meters" )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x00, "2" )
@@ -1065,17 +1065,17 @@ static INPUT_PORTS_START( journey )
PORT_DIPSETTING( 0x02, DEF_STR( Cocktail ) )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.IP4") /* J6 1-8 */
+ PORT_START("SSIO.IP4") /* J6 1-8 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SSIO.DIP")
+ PORT_START("SSIO.DIP")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
/* verified from wiring diagram, plus DIP switches from manual */
static INPUT_PORTS_START( wacko )
- PORT_START_TAG("SSIO.IP0") /* J4 1-8 */
+ PORT_START("SSIO.IP0") /* J4 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1085,13 +1085,13 @@ static INPUT_PORTS_START( wacko )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("SSIO.IP1") /* J4 10-13,15-18 */
+ PORT_START("SSIO.IP1") /* J4 10-13,15-18 */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("SSIO.IP2") /* J5 1-8 */
+ PORT_START("SSIO.IP2") /* J5 1-8 */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE
- PORT_START_TAG("SSIO.IP3") /* DIPSW @ B3 */
+ PORT_START("SSIO.IP3") /* DIPSW @ B3 */
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x40, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
@@ -1100,7 +1100,7 @@ static INPUT_PORTS_START( wacko )
PORT_DIPSETTING( 0x80, "1" )
PORT_DIPSETTING( 0x00, "2" )
- PORT_START_TAG("SSIO.IP4") /* J6 1-8 */
+ PORT_START("SSIO.IP4") /* J6 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_4WAY
@@ -1110,20 +1110,20 @@ static INPUT_PORTS_START( wacko )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_4WAY PORT_COCKTAIL
- PORT_START_TAG("SSIO.DIP")
+ PORT_START("SSIO.DIP")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SSIO.IP1.ALT")
+ PORT_START("SSIO.IP1.ALT")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_COCKTAIL
- PORT_START_TAG("SSIO.IP2.ALT")
+ PORT_START("SSIO.IP2.ALT")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_COCKTAIL
INPUT_PORTS_END
/* not verified, no manual found */
static INPUT_PORTS_START( twotiger )
- PORT_START_TAG("SSIO.IP0") /* J4 1-8 */
+ PORT_START("SSIO.IP0") /* J4 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
@@ -1133,13 +1133,13 @@ static INPUT_PORTS_START( twotiger )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("SSIO.IP1") /* J4 10-13,15-18 */
+ PORT_START("SSIO.IP1") /* J4 10-13,15-18 */
PORT_BIT( 0xff, 0x67, IPT_AD_STICK_X ) PORT_MINMAX(0, 206) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("SSIO.IP2") /* J5 1-8 */
+ PORT_START("SSIO.IP2") /* J5 1-8 */
PORT_BIT( 0xff, 0x67, IPT_AD_STICK_X ) PORT_MINMAX(0, 206) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("SSIO.IP3") /* DIPSW @ B3 */
+ PORT_START("SSIO.IP3") /* DIPSW @ B3 */
PORT_DIPNAME( 0x01, 0x00, "Shot Speed" )
PORT_DIPSETTING( 0x01, "Fast" )
PORT_DIPSETTING( 0x00, "Slow" )
@@ -1148,7 +1148,7 @@ static INPUT_PORTS_START( twotiger )
PORT_DIPSETTING( 0x02, "2 Credits" )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.IP4") /* J6 1-8 */
+ PORT_START("SSIO.IP4") /* J6 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -1157,14 +1157,14 @@ static INPUT_PORTS_START( twotiger )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.DIP")
+ PORT_START("SSIO.DIP")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
/* not verified, no manual found */
static INPUT_PORTS_START( twotigrc )
- PORT_START_TAG("SSIO.IP0") /* J4 1-8 */
+ PORT_START("SSIO.IP0") /* J4 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1174,30 +1174,30 @@ static INPUT_PORTS_START( twotigrc )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("SSIO.IP1") /* J4 10-13,15-18 */
+ PORT_START("SSIO.IP1") /* J4 10-13,15-18 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(10) PORT_KEYDELTA(10) PORT_REVERSE
- PORT_START_TAG("SSIO.IP2") /* J5 1-8 */
+ PORT_START("SSIO.IP2") /* J5 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.IP3") /* DIPSW @ B3 */
+ PORT_START("SSIO.IP3") /* DIPSW @ B3 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.IP4") /* J6 1-8 */
+ PORT_START("SSIO.IP4") /* J6 1-8 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(10) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("SSIO.DIP")
+ PORT_START("SSIO.DIP")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
/* verified from wiring diagram, plus DIP switches from manual */
static INPUT_PORTS_START( tapper )
- PORT_START_TAG("SSIO.IP0") /* J4 1-8 */
+ PORT_START("SSIO.IP0") /* J4 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1207,7 +1207,7 @@ static INPUT_PORTS_START( tapper )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("SSIO.IP1") /* J4 10-13,15-18 */
+ PORT_START("SSIO.IP1") /* J4 10-13,15-18 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
@@ -1215,7 +1215,7 @@ static INPUT_PORTS_START( tapper )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.IP2") /* J5 1-8 */
+ PORT_START("SSIO.IP2") /* J5 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
@@ -1223,7 +1223,7 @@ static INPUT_PORTS_START( tapper )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.IP3") /* DIPSW @ B3 */
+ PORT_START("SSIO.IP3") /* DIPSW @ B3 */
PORT_BIT( 0x03, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -1236,17 +1236,17 @@ static INPUT_PORTS_START( tapper )
PORT_DIPSETTING( 0x80, "1" )
PORT_DIPSETTING( 0x00, "2" )
- PORT_START_TAG("SSIO.IP4") /* J6 1-8 */
+ PORT_START("SSIO.IP4") /* J6 1-8 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.DIP")
+ PORT_START("SSIO.DIP")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
/* not verified, no manual found */
static INPUT_PORTS_START( timber )
- PORT_START_TAG("SSIO.IP0") /* J4 1-8 */
+ PORT_START("SSIO.IP0") /* J4 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1256,7 +1256,7 @@ static INPUT_PORTS_START( timber )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("SSIO.IP1") /* J4 10-13,15-18 */
+ PORT_START("SSIO.IP1") /* J4 10-13,15-18 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
@@ -1265,7 +1265,7 @@ static INPUT_PORTS_START( timber )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.IP2") /* J5 1-8 */
+ PORT_START("SSIO.IP2") /* J5 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2)
@@ -1274,7 +1274,7 @@ static INPUT_PORTS_START( timber )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.IP3") /* DIPSW @ B3 */
+ PORT_START("SSIO.IP3") /* DIPSW @ B3 */
PORT_BIT( 0x03, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -1287,17 +1287,17 @@ static INPUT_PORTS_START( timber )
PORT_DIPSETTING( 0x80, "1" )
PORT_DIPSETTING( 0x00, "2" )
- PORT_START_TAG("SSIO.IP4") /* J6 1-8 */
+ PORT_START("SSIO.IP4") /* J6 1-8 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.DIP")
+ PORT_START("SSIO.DIP")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
/* verified from wiring diagram, plus DIP switches from manual */
static INPUT_PORTS_START( dotron )
- PORT_START_TAG("SSIO.IP0") /* J4 1-8 */
+ PORT_START("SSIO.IP0") /* J4 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1307,11 +1307,11 @@ static INPUT_PORTS_START( dotron )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("SSIO.IP1") /* J4 10-13,15-18 */
+ PORT_START("SSIO.IP1") /* J4 10-13,15-18 */
PORT_BIT( 0x7f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X) PORT_REVERSE
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.IP2") /* J5 1-8 */
+ PORT_START("SSIO.IP2") /* J5 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -1323,19 +1323,19 @@ static INPUT_PORTS_START( dotron )
PORT_DIPSETTING( 0x00, "Environmental" )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
- PORT_START_TAG("SSIO.IP3") /* DIPSW @ B3 */
+ PORT_START("SSIO.IP3") /* DIPSW @ B3 */
PORT_DIPNAME( 0x01, 0x01, "Coin Meters" )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x00, "2" )
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.IP4") /* J6 1-8 */
+ PORT_START("SSIO.IP4") /* J6 1-8 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.DIP")
+ PORT_START("SSIO.DIP")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("FAKE") /* fake port to make aiming up & down easier */
+ PORT_START("FAKE") /* fake port to make aiming up & down easier */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
INPUT_PORTS_END
@@ -1351,7 +1351,7 @@ INPUT_PORTS_END
/* verified from wiring diagram, plus DIP switches from manual */
static INPUT_PORTS_START( nflfoot )
- PORT_START_TAG("SSIO.IP0") /* J4 1-8 */
+ PORT_START("SSIO.IP0") /* J4 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BILL1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) /* continue game */
@@ -1361,7 +1361,7 @@ static INPUT_PORTS_START( nflfoot )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("SSIO.IP1") /* J4 10-13,15-18 */
+ PORT_START("SSIO.IP1") /* J4 10-13,15-18 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) /* left engage */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) /* left select #1 play */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) /* left select #2 play */
@@ -1371,7 +1371,7 @@ static INPUT_PORTS_START( nflfoot )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_PLAYER(1) /* select one player */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SSIO.IP2") /* J5 1-8 */
+ PORT_START("SSIO.IP2") /* J5 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) /* right engage */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) /* right select #1 play */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) /* right select #2 play */
@@ -1381,16 +1381,16 @@ static INPUT_PORTS_START( nflfoot )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_PLAYER(2) /* select two player */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) /* connects to IPU board */
- PORT_START_TAG("SSIO.IP3") /* DIPSW @ B3 */
+ PORT_START("SSIO.IP3") /* DIPSW @ B3 */
PORT_DIPNAME( 0x01, 0x01, "Coin Meters" )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x00, "2" )
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.IP4") /* J6 1-8 */
+ PORT_START("SSIO.IP4") /* J6 1-8 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.DIP")
+ PORT_START("SSIO.DIP")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -1398,7 +1398,7 @@ INPUT_PORTS_END
/* "wiring diagram was not available at time of publication" according to the manual */
/* DIPs verified from the manual */
static INPUT_PORTS_START( demoderb )
- PORT_START_TAG("SSIO.IP0") /* J4 1-8 */
+ PORT_START("SSIO.IP0") /* J4 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1408,17 +1408,17 @@ static INPUT_PORTS_START( demoderb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.IP1") /* J4 10-13,15-18 */ /* The high 6 bits contain the steering wheel value */
+ PORT_START("SSIO.IP1") /* J4 10-13,15-18 */ /* The high 6 bits contain the steering wheel value */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0xfc, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("SSIO.IP2") /* J5 1-8 */ /* The high 6 bits contain the steering wheel value */
+ PORT_START("SSIO.IP2") /* J5 1-8 */ /* The high 6 bits contain the steering wheel value */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0xfc, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("SSIO.IP3") /* DIPSW @ B3 */
+ PORT_START("SSIO.IP3") /* DIPSW @ B3 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, "2P Upright" )
PORT_DIPSETTING( 0x00, "4P Cocktail" )
@@ -1438,7 +1438,7 @@ static INPUT_PORTS_START( demoderb )
PORT_DIPSETTING( 0x10, DEF_STR( 1C_2C ) )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SSIO.IP4") /* J6 1-8 */
+ PORT_START("SSIO.IP4") /* J6 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START3 )
@@ -1448,15 +1448,15 @@ static INPUT_PORTS_START( demoderb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
- PORT_START_TAG("SSIO.DIP")
+ PORT_START("SSIO.DIP")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SSIO.IP1.ALT") /* IN1 (muxed) -- the high 6 bits contain the steering wheel value */
+ PORT_START("SSIO.IP1.ALT") /* IN1 (muxed) -- the high 6 bits contain the steering wheel value */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0xfc, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(3)
- PORT_START_TAG("SSIO.IP2.ALT") /* IN2 (muxed) -- the high 6 bits contain the steering wheel value */
+ PORT_START("SSIO.IP2.ALT") /* IN2 (muxed) -- the high 6 bits contain the steering wheel value */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0xfc, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(4)
diff --git a/src/mame/drivers/mcr3.c b/src/mame/drivers/mcr3.c
index 2e093af79a9..a42bd1e81f0 100644
--- a/src/mame/drivers/mcr3.c
+++ b/src/mame/drivers/mcr3.c
@@ -513,7 +513,7 @@ ADDRESS_MAP_END
/* verified from wiring diagram, plus DIP switches from manual */
static INPUT_PORTS_START( demoderm )
- PORT_START_TAG("MONO.IP0") /* J2 1-8 */
+ PORT_START("MONO.IP0") /* J2 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -523,17 +523,17 @@ static INPUT_PORTS_START( demoderm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MONO.IP1") /* J2 10-13,15-18 */ /* The high 6 bits contain the steering wheel value */
+ PORT_START("MONO.IP1") /* J2 10-13,15-18 */ /* The high 6 bits contain the steering wheel value */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0xfc, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("MONO.IP2") /* J3 1-8 */ /* The high 6 bits contain the steering wheel value */
+ PORT_START("MONO.IP2") /* J3 1-8 */ /* The high 6 bits contain the steering wheel value */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0xfc, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("MONO.IP3") /* DIPSW @ B3 */
+ PORT_START("MONO.IP3") /* DIPSW @ B3 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, "2P Upright" )
PORT_DIPSETTING( 0x00, "4P Cocktail" )
@@ -553,7 +553,7 @@ static INPUT_PORTS_START( demoderm )
PORT_DIPSETTING( 0x10, DEF_STR( 1C_2C ) )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("MONO.IP4") /* J4 1-7,9 */
+ PORT_START("MONO.IP4") /* J4 1-7,9 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START3 )
@@ -563,12 +563,12 @@ static INPUT_PORTS_START( demoderm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
- PORT_START_TAG("MONO.IP1.ALT") /* IN1 (muxed) -- the high 6 bits contain the steering wheel value */
+ PORT_START("MONO.IP1.ALT") /* IN1 (muxed) -- the high 6 bits contain the steering wheel value */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0xfc, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(3)
- PORT_START_TAG("MONO.IP2.ALT") /* IN2 (muxed) -- the high 6 bits contain the steering wheel value */
+ PORT_START("MONO.IP2.ALT") /* IN2 (muxed) -- the high 6 bits contain the steering wheel value */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0xfc, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(4)
@@ -577,7 +577,7 @@ INPUT_PORTS_END
/* not verified, no manual found */
static INPUT_PORTS_START( sarge )
- PORT_START_TAG("MONO.IP0") /* J2 1-8 */
+ PORT_START("MONO.IP0") /* J2 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -586,7 +586,7 @@ static INPUT_PORTS_START( sarge )
PORT_SERVICE( 0x20, IP_ACTIVE_LOW )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MONO.IP1") /* J2 10-13,15-18 */
+ PORT_START("MONO.IP1") /* J2 10-13,15-18 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_UP ) PORT_2WAY PORT_PLAYER(1)
@@ -594,7 +594,7 @@ static INPUT_PORTS_START( sarge )
PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_START_TAG("MONO.IP2") /* J3 1-8 */
+ PORT_START("MONO.IP2") /* J3 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_UP ) PORT_2WAY PORT_PLAYER(2)
@@ -602,7 +602,7 @@ static INPUT_PORTS_START( sarge )
PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_START_TAG("MONO.IP3")
+ PORT_START("MONO.IP3")
PORT_DIPNAME( 0x08, 0x08, DEF_STR( Free_Play ) )
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -613,14 +613,14 @@ static INPUT_PORTS_START( sarge )
/* 0x00 says 2 Coins/2 Credits in service mode, but gives 1 Coin/1 Credit */
PORT_BIT( 0xc7, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("MONO.IP4") /* J4 1-7,9 */
+ PORT_START("MONO.IP4") /* J4 1-7,9 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
/* verified from wiring diagram, plus DIP switches from manual */
static INPUT_PORTS_START( maxrpm )
- PORT_START_TAG("MONO.IP0") /* J2 1-8 */
+ PORT_START("MONO.IP0") /* J2 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
@@ -630,13 +630,13 @@ static INPUT_PORTS_START( maxrpm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("MONO.IP1") /* J2 10-13,15-18 */
+ PORT_START("MONO.IP1") /* J2 10-13,15-18 */
PORT_BIT( 0xff, 0x30, IPT_PEDAL ) PORT_MINMAX(0x30,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("MONO.IP2") /* J3 1-8 */
+ PORT_START("MONO.IP2") /* J3 1-8 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_SPECIAL )
- PORT_START_TAG("MONO.IP3")
+ PORT_START("MONO.IP3")
PORT_DIPNAME( 0x08, 0x08, DEF_STR( Free_Play ) )
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -647,19 +647,19 @@ static INPUT_PORTS_START( maxrpm )
/* 0x00 says 2 Coins/2 Credits in service mode, but gives 1 Coin/1 Credit */
PORT_BIT( 0xc7, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("MONO.IP4") /* J4 1-7,9 */
+ PORT_START("MONO.IP4") /* J4 1-7,9 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("MONO.IP1.ALT1")
+ PORT_START("MONO.IP1.ALT1")
PORT_BIT( 0xff, 0x30, IPT_PEDAL ) PORT_MINMAX(0x30,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("MONO.IP1.ALT2")
+ PORT_START("MONO.IP1.ALT2")
PORT_BIT( 0xff, 0x74, IPT_PADDLE ) PORT_MINMAX(0x34,0xb4) PORT_SENSITIVITY(40) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("MONO.IP1.ALT3")
+ PORT_START("MONO.IP1.ALT3")
PORT_BIT( 0xff, 0x74, IPT_PADDLE ) PORT_MINMAX(0x34,0xb4) PORT_SENSITIVITY(40) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("SHIFT") /* fake for shifting */
+ PORT_START("SHIFT") /* fake for shifting */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("P1 Shift Up")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("P1 Shift Down")
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 Shift Up")
@@ -670,7 +670,7 @@ INPUT_PORTS_END
/* verified from wiring diagram, plus DIP switches from manual */
static INPUT_PORTS_START( rampage )
- PORT_START_TAG("MONO.IP0") /* J2 1-8 */
+ PORT_START("MONO.IP0") /* J2 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -679,7 +679,7 @@ static INPUT_PORTS_START( rampage )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MONO.IP1") /* J2 10-13,15-18 */
+ PORT_START("MONO.IP1") /* J2 10-13,15-18 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -688,7 +688,7 @@ static INPUT_PORTS_START( rampage )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MONO.IP2") /* J3 1-8 */
+ PORT_START("MONO.IP2") /* J3 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -697,7 +697,7 @@ static INPUT_PORTS_START( rampage )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MONO.IP3")
+ PORT_START("MONO.IP3")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -722,7 +722,7 @@ static INPUT_PORTS_START( rampage )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("MONO.IP4") /* J4 1-7,9 */
+ PORT_START("MONO.IP4") /* J4 1-7,9 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
@@ -736,7 +736,7 @@ INPUT_PORTS_END
/* verified from wiring diagram, plus DIP switches from manual */
static INPUT_PORTS_START( powerdrv )
- PORT_START_TAG("MONO.IP0") /* J2 1-8 */
+ PORT_START("MONO.IP0") /* J2 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -746,7 +746,7 @@ static INPUT_PORTS_START( powerdrv )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MONO.IP1") /* J2 10-13,15-18 */
+ PORT_START("MONO.IP1") /* J2 10-13,15-18 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_TOGGLE PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
@@ -756,7 +756,7 @@ static INPUT_PORTS_START( powerdrv )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_START_TAG("MONO.IP2") /* J3 1-8 */
+ PORT_START("MONO.IP2") /* J3 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_TOGGLE PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
@@ -764,7 +764,7 @@ static INPUT_PORTS_START( powerdrv )
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* status from Sounds Good board */
- PORT_START_TAG("MONO.IP3")
+ PORT_START("MONO.IP3")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
/* PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )*/
@@ -783,14 +783,14 @@ static INPUT_PORTS_START( powerdrv )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("MONO.IP4") /* J4 1-7,9 */
+ PORT_START("MONO.IP4") /* J4 1-7,9 */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
/* verified from wiring diagram, plus DIP switches from manual */
static INPUT_PORTS_START( stargrds )
- PORT_START_TAG("MONO.IP0") /* J2 1-8 */
+ PORT_START("MONO.IP0") /* J2 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -800,7 +800,7 @@ static INPUT_PORTS_START( stargrds )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("MONO.IP1") /* J2 10-13,15-18 */
+ PORT_START("MONO.IP1") /* J2 10-13,15-18 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT ) PORT_PLAYER(1)
@@ -810,7 +810,7 @@ static INPUT_PORTS_START( stargrds )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_PLAYER(1)
- PORT_START_TAG("MONO.IP2") /* J3 1-8 */
+ PORT_START("MONO.IP2") /* J3 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_UP ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT ) PORT_PLAYER(2)
@@ -820,7 +820,7 @@ static INPUT_PORTS_START( stargrds )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_PLAYER(2)
- PORT_START_TAG("MONO.IP3")
+ PORT_START("MONO.IP3")
PORT_BIT( 0x03, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0c, 0x0c, "Energy Units" )
PORT_DIPSETTING( 0x08, "8" )
@@ -837,7 +837,7 @@ static INPUT_PORTS_START( stargrds )
PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_START_TAG("MONO.IP4") /* J4 1-7,9 */
+ PORT_START("MONO.IP4") /* J4 1-7,9 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_UP ) PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT ) PORT_PLAYER(3)
@@ -847,7 +847,7 @@ static INPUT_PORTS_START( stargrds )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_PLAYER(3)
- PORT_START_TAG("MONO.IP0.ALT") /* IN0 (muxed) */
+ PORT_START("MONO.IP0.ALT") /* IN0 (muxed) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -861,7 +861,7 @@ INPUT_PORTS_END
/* verified from wiring diagram, plus DIP switches from manual */
static INPUT_PORTS_START( spyhunt )
- PORT_START_TAG("SSIO.IP0") /* J4 1-8 */
+ PORT_START("SSIO.IP0") /* J4 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -870,7 +870,7 @@ static INPUT_PORTS_START( spyhunt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("SSIO.IP1") /* J4 10-13,15-18 */
+ PORT_START("SSIO.IP1") /* J4 10-13,15-18 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Oil Slick")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Missiles")
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Weapon Truck")
@@ -879,10 +879,10 @@ static INPUT_PORTS_START( spyhunt )
PORT_BIT( 0x60, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* status from CS deluxe, never read */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.IP2") /* J5 1-8 */
+ PORT_START("SSIO.IP2") /* J5 1-8 */
PORT_BIT( 0xff, 0x30, IPT_PEDAL ) PORT_MINMAX(0x30,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START_TAG("SSIO.IP3") /* DIPSW @ B3 */
+ PORT_START("SSIO.IP3") /* DIPSW @ B3 */
PORT_DIPNAME( 0x01, 0x01, "Game Timer" )
PORT_DIPSETTING( 0x00, "1:00" )
PORT_DIPSETTING( 0x01, "1:30" )
@@ -893,20 +893,20 @@ static INPUT_PORTS_START( spyhunt )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.IP4") /* J6 1-8 */
+ PORT_START("SSIO.IP4") /* J6 1-8 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.DIP")
+ PORT_START("SSIO.DIP")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SSIO.IP2.ALT")
+ PORT_START("SSIO.IP2.ALT")
PORT_BIT( 0xff, 0x74, IPT_PADDLE ) PORT_MINMAX(0x34,0xb4) PORT_SENSITIVITY(40) PORT_KEYDELTA(10)
INPUT_PORTS_END
/* not verified, no manual found */
static INPUT_PORTS_START( crater )
- PORT_START_TAG("SSIO.IP0") /* J4 1-8 */
+ PORT_START("SSIO.IP0") /* J4 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -916,10 +916,10 @@ static INPUT_PORTS_START( crater )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("SSIO.IP1") /* J4 10-13,15-18 */
+ PORT_START("SSIO.IP1") /* J4 10-13,15-18 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X) PORT_REVERSE
- PORT_START_TAG("SSIO.IP2") /* J5 1-8 */
+ PORT_START("SSIO.IP2") /* J5 1-8 */
PORT_BIT( 0x03, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_2WAY
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_2WAY
@@ -928,20 +928,20 @@ static INPUT_PORTS_START( crater )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.IP3") /* DIPSW @ B3 */
+ PORT_START("SSIO.IP3") /* DIPSW @ B3 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SSIO.IP4") /* J6 1-8 */
+ PORT_START("SSIO.IP4") /* J6 1-8 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.DIP")
+ PORT_START("SSIO.DIP")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
/* not verified, no manual found */
static INPUT_PORTS_START( turbotag )
- PORT_START_TAG("SSIO.IP0") /* J4 1-8 */
+ PORT_START("SSIO.IP0") /* J4 1-8 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -950,7 +950,7 @@ static INPUT_PORTS_START( turbotag )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("SSIO.IP1") /* J4 10-13,15-18 */
+ PORT_START("SSIO.IP1") /* J4 10-13,15-18 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Left Button")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Left Trigger")
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Center Button")
@@ -959,10 +959,10 @@ static INPUT_PORTS_START( turbotag )
PORT_BIT( 0x60, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* status from CS deluxe, never read */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.IP2") /* J5 1-8 */
+ PORT_START("SSIO.IP2") /* J5 1-8 */
PORT_BIT( 0xff, 0x3c, IPT_PEDAL ) PORT_MINMAX(60,180) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START_TAG("SSIO.IP3") /* DIPSW @ B3 */
+ PORT_START("SSIO.IP3") /* DIPSW @ B3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -971,13 +971,13 @@ static INPUT_PORTS_START( turbotag )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.IP4") /* J6 1-8 */
+ PORT_START("SSIO.IP4") /* J6 1-8 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SSIO.DIP")
+ PORT_START("SSIO.DIP")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SSIO.IP2.ALT")
+ PORT_START("SSIO.IP2.ALT")
PORT_BIT( 0xff, 0x60, IPT_PADDLE ) PORT_SENSITIVITY(40) PORT_KEYDELTA(10)
INPUT_PORTS_END
diff --git a/src/mame/drivers/mcr68.c b/src/mame/drivers/mcr68.c
index e086995c3c8..2ce3f7fe652 100644
--- a/src/mame/drivers/mcr68.c
+++ b/src/mame/drivers/mcr68.c
@@ -399,7 +399,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( zwackery )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -409,23 +409,23 @@ static INPUT_PORTS_START( zwackery )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) /* sword */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_SPECIAL ) /* sound communications */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) /* spell up */
PORT_BIT( 0x3e, IP_ACTIVE_HIGH, IPT_UNUSED ) /* encoder wheel */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* shield */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) /* spell down */
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x05, DEF_STR( 6C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 5C_1C ) )
@@ -450,13 +450,13 @@ static INPUT_PORTS_START( zwackery )
PORT_DIPSETTING( 0x40, DEF_STR( Harder ) )
PORT_DIPSETTING( 0x80, DEF_STR( Hardest ) )
- PORT_START_TAG("IN5")
+ PORT_START("IN5")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X) PORT_REVERSE
INPUT_PORTS_END
static INPUT_PORTS_START( xenophob )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -473,7 +473,7 @@ static INPUT_PORTS_START( xenophob )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -491,7 +491,7 @@ static INPUT_PORTS_START( xenophob )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT( 0x0003, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Free_Play ) )
PORT_DIPSETTING( 0x0004, DEF_STR( Off ) )
@@ -515,7 +515,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( spyhunt2 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -526,7 +526,7 @@ static INPUT_PORTS_START( spyhunt2 )
PORT_SERVICE( 0x0080, IP_ACTIVE_LOW )
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Oddly enough, if you assign this control to a key, it makes both player wheels go left to fifteen */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2) PORT_NAME ("P2 1st Gear")/* 1st gear */
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(2) PORT_NAME ("P2 2nd Gear")/* 2nd gear */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_PLAYER(2) PORT_NAME ("P2 3rd Gear")/* 3rd gear */
@@ -544,7 +544,7 @@ static INPUT_PORTS_START( spyhunt2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME ("P1 R Trigger")/* Right Trigger */
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) PORT_NAME ("P1 R Button")/* Right Button */
- PORT_START_TAG("DSW") /* dipswitches */
+ PORT_START("DSW") /* dipswitches */
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x0003, DEF_STR( 1C_1C ) )
@@ -568,22 +568,22 @@ static INPUT_PORTS_START( spyhunt2 )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN1") /* analog ports for steering and pedals */
+ PORT_START("AN1") /* analog ports for steering and pedals */
PORT_BIT( 0xff, 0x30, IPT_PEDAL ) PORT_MINMAX(0x30,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 0xff, 0x30, IPT_PEDAL ) PORT_MINMAX(0x30,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("AN3")
+ PORT_START("AN3")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(80) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("AN4")
+ PORT_START("AN4")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(80) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
INPUT_PORTS_END
static INPUT_PORTS_START( blasted )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED/* credit w/bill */ )
@@ -598,7 +598,7 @@ static INPUT_PORTS_START( blasted )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_UNUSED/* credit 2 w/bill */ )
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -609,7 +609,7 @@ static INPUT_PORTS_START( blasted )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x0003, DEF_STR( 1C_1C ) )
@@ -634,7 +634,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( archrivl )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x000c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -650,10 +650,10 @@ static INPUT_PORTS_START( archrivl )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED ) /* player 1/2 joysticks go here */
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Game_Time ) )
PORT_DIPSETTING( 0x0003, "Preset Time" )
PORT_DIPSETTING( 0x0002, "Preset + 10sec" )
@@ -679,22 +679,22 @@ static INPUT_PORTS_START( archrivl )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("49WAYX1") /* converted to standard 49-way inputs */
+ PORT_START("49WAYX1") /* converted to standard 49-way inputs */
PORT_BIT( 0xff, 0x38, IPT_AD_STICK_X ) PORT_PLAYER(1) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START_TAG("49WAYY1") /* converted to standard 49-way inputs */
+ PORT_START("49WAYY1") /* converted to standard 49-way inputs */
PORT_BIT( 0xff, 0x38, IPT_AD_STICK_Y ) PORT_PLAYER(1) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START_TAG("49WAYX2") /* converted to standard 49-way inputs */
+ PORT_START("49WAYX2") /* converted to standard 49-way inputs */
PORT_BIT( 0xff, 0x38, IPT_AD_STICK_X ) PORT_PLAYER(2) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START_TAG("49WAYY2") /* converted to standard 49-way inputs */
+ PORT_START("49WAYY2") /* converted to standard 49-way inputs */
PORT_BIT( 0xff, 0x38, IPT_AD_STICK_Y ) PORT_PLAYER(2) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
INPUT_PORTS_END
static INPUT_PORTS_START( pigskin )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -712,7 +712,7 @@ static INPUT_PORTS_START( pigskin )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
@@ -720,7 +720,7 @@ static INPUT_PORTS_START( pigskin )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNUSED ) /* player 1 joystick goes here */
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Game_Time ) )
PORT_DIPSETTING( 0x0000, "Shortest" )
PORT_DIPSETTING( 0x0002, "Short" )
@@ -745,22 +745,22 @@ static INPUT_PORTS_START( pigskin )
PORT_DIPSETTING( 0x0000, "Rotated" )
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNUSED ) /* player 2 joystick goes here */
- PORT_START_TAG("49WAYX1") /* converted to standard 49-way inputs */
+ PORT_START("49WAYX1") /* converted to standard 49-way inputs */
PORT_BIT( 0xff, 0x38, IPT_AD_STICK_X ) PORT_PLAYER(1) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE
- PORT_START_TAG("49WAYY1") /* converted to standard 49-way inputs */
+ PORT_START("49WAYY1") /* converted to standard 49-way inputs */
PORT_BIT( 0xff, 0x38, IPT_AD_STICK_Y ) PORT_PLAYER(1) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START_TAG("49WAYX2") /* converted to standard 49-way inputs */
+ PORT_START("49WAYX2") /* converted to standard 49-way inputs */
PORT_BIT( 0xff, 0x38, IPT_AD_STICK_X ) PORT_PLAYER(2) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE
- PORT_START_TAG("49WAYY2") /* converted to standard 49-way inputs */
+ PORT_START("49WAYY2") /* converted to standard 49-way inputs */
PORT_BIT( 0xff, 0x38, IPT_AD_STICK_Y ) PORT_PLAYER(2) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
INPUT_PORTS_END
static INPUT_PORTS_START( trisport )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x000c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -773,11 +773,11 @@ static INPUT_PORTS_START( trisport )
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0xc000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNUSED ) /* analog controls go here */
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0003, DEF_STR( 3C_1C ) )
@@ -803,10 +803,10 @@ static INPUT_PORTS_START( trisport )
PORT_DIPSETTING( 0x0000, "4" )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0xff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_PLAYER(1)
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 0xff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_REVERSE PORT_PLAYER(1)
INPUT_PORTS_END
diff --git a/src/mame/drivers/meadows.c b/src/mame/drivers/meadows.c
index 7dae0c214d8..60e453563a7 100644
--- a/src/mame/drivers/meadows.c
+++ b/src/mame/drivers/meadows.c
@@ -398,7 +398,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( meadows )
- PORT_START /* IN0 buttons */
+ PORT_START("INPUTS") /* IN0 buttons */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -408,10 +408,10 @@ static INPUT_PORTS_START( meadows )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN1 control 1 */
+ PORT_START("STICK") /* IN1 control 1 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START /* IN2 dip switch */
+ PORT_START("DSW") /* IN2 dip switch */
PORT_DIPNAME( 0x07, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "3" )
@@ -435,32 +435,32 @@ static INPUT_PORTS_START( meadows )
PORT_DIPSETTING( 0xc0, "35000")
PORT_DIPSETTING( 0x00, DEF_STR( None ))
- PORT_START /* FAKE coinage */
+ PORT_START("FAKE") /* FAKE coinage */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x8e, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( minferno )
- PORT_START /* IN0 left joystick */
+ PORT_START("JOY1") /* IN0 left joystick */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
- PORT_START /* IN1 right joystick */
+ PORT_START("JOY2") /* IN1 right joystick */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
- PORT_START /* IN2 buttons */
+ PORT_START("BUTTONS") /* IN2 buttons */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN3 coinage */
+ PORT_START("DSW1") /* IN3 coinage */
PORT_DIPNAME( 0x01, 0x01, "Coin Option" )
PORT_DIPSETTING( 0x00, "1 Game/Coin" )
PORT_DIPSETTING( 0x01, "1 Player/Coin" )
@@ -470,7 +470,7 @@ static INPUT_PORTS_START( minferno )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START /* IN4 dip switch */
+ PORT_START("DSW2") /* IN4 dip switch */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Game_Time ) )
PORT_DIPSETTING( 0x00, "60s" )
PORT_DIPSETTING( 0x01, "90s" )
diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c
index 1b40cfd44e4..020d0797f8e 100644
--- a/src/mame/drivers/mediagx.c
+++ b/src/mame/drivers/mediagx.c
@@ -884,7 +884,7 @@ static GFXDECODE_START( CGA )
GFXDECODE_END
static INPUT_PORTS_START(mediagx)
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_SERVICE_NO_TOGGLE( 0x001, IP_ACTIVE_HIGH )
PORT_BIT( 0x002, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x004, IP_ACTIVE_HIGH, IPT_SERVICE2 )
@@ -898,42 +898,42 @@ static INPUT_PORTS_START(mediagx)
PORT_BIT( 0x400, IP_ACTIVE_HIGH, IPT_START3 )
PORT_BIT( 0x800, IP_ACTIVE_HIGH, IPT_START4 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x00f, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x0f0, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0xf00, IP_ACTIVE_HIGH, IPT_BUTTON3 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x00f, IP_ACTIVE_HIGH, IPT_BUTTON4 )
PORT_BIT( 0x0f0, IP_ACTIVE_HIGH, IPT_BUTTON5 )
PORT_BIT( 0xf00, IP_ACTIVE_HIGH, IPT_BUTTON6 )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x00f, IP_ACTIVE_HIGH, IPT_BUTTON7 )
PORT_BIT( 0x0f0, IP_ACTIVE_HIGH, IPT_BUTTON8 )
PORT_BIT( 0xf00, IP_ACTIVE_HIGH, IPT_BUTTON9 )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x00f, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x0f0, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0xf00, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_START_TAG("IN5")
+ PORT_START("IN5")
PORT_BIT( 0x00f, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x0f0, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0xf00, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(3)
- PORT_START_TAG("IN6")
+ PORT_START("IN6")
PORT_BIT( 0x00f, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
PORT_BIT( 0x0f0, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
PORT_BIT( 0xf00, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
- PORT_START_TAG("IN7")
+ PORT_START("IN7")
PORT_BIT( 0x00f, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x0f0, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0xf00, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
- PORT_START_TAG("IN8")
+ PORT_START("IN8")
PORT_BIT( 0x00f, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(3)
PORT_BIT( 0x0f0, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3)
PORT_BIT( 0xf00, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(3)
diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c
index 27c8f2a7d6e..94f8dd423ed 100644
--- a/src/mame/drivers/megadriv.c
+++ b/src/mame/drivers/megadriv.c
@@ -1439,7 +1439,7 @@ static UINT8 (*megadrive_io_read_data_port_ptr)(int offset);
static void (*megadrive_io_write_data_port_ptr)(int offset, UINT16 data);
INPUT_PORTS_START( megadri6 )
- PORT_START_TAG("PAD1") /* Joypad 1 (6 button + start + mode) NOT READ DIRECTLY */
+ PORT_START("PAD1") /* Joypad 1 (6 button + start + mode) NOT READ DIRECTLY */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1454,7 +1454,7 @@ INPUT_PORTS_START( megadri6 )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_PLAYER(1) PORT_NAME("P1 MODE") // mode
- PORT_START_TAG("PAD2") /* Joypad 2 (6 button + start + mode) NOT READ DIRECTLY */
+ PORT_START("PAD2") /* Joypad 2 (6 button + start + mode) NOT READ DIRECTLY */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1468,12 +1468,12 @@ INPUT_PORTS_START( megadri6 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_PLAYER(2) PORT_NAME("P2 Z") // z
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_PLAYER(2) PORT_NAME("P2 MODE") // mode
- PORT_START_TAG("IN0") /* 3rd I/O port */
+ PORT_START("IN0") /* 3rd I/O port */
- PORT_START_TAG("RESET") /* Buttons on Genesis Console */
+ PORT_START("RESET") /* Buttons on Genesis Console */
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_NAME("Reset Button") PORT_IMPULSE(1) // reset, resets 68k (and..?)
- PORT_START_TAG("REGION") /* Buttons on Genesis Console */
+ PORT_START("REGION") /* Buttons on Genesis Console */
/* Region setting for Console */
PORT_DIPNAME( 0x000f, 0x0000, DEF_STR( Region ) )
PORT_DIPSETTING( 0x0000, "Use HazeMD Default Choice" )
@@ -1486,7 +1486,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( ssf2ghw )
- PORT_START_TAG("PAD1") /* Joypad 1 (6 button + start + mode) NOT READ DIRECTLY */
+ PORT_START("PAD1") /* Joypad 1 (6 button + start + mode) NOT READ DIRECTLY */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1501,7 +1501,7 @@ INPUT_PORTS_START( ssf2ghw )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("PAD2") /* Joypad 1 (6 button + start + mode) NOT READ DIRECTLY */
+ PORT_START("PAD2") /* Joypad 1 (6 button + start + mode) NOT READ DIRECTLY */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1515,14 +1515,14 @@ INPUT_PORTS_START( ssf2ghw )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(2)
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0") /* 3rd I/O port */
+ PORT_START("IN0") /* 3rd I/O port */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
-// PORT_START_TAG("RESET") /* Buttons on Genesis Console */
+// PORT_START("RESET") /* Buttons on Genesis Console */
// PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_NAME("Reset Button") PORT_IMPULSE(1) // reset, resets 68k (and..?)
-// PORT_START_TAG("REGION") /* Buttons on Genesis Console */
+// PORT_START("REGION") /* Buttons on Genesis Console */
// /* Region setting for Console */
// PORT_DIPNAME( 0x000f, 0x0000, DEF_STR( Region ) )
// PORT_DIPSETTING( 0x0000, "Use HazeMD Default Choice" )
@@ -1530,7 +1530,7 @@ INPUT_PORTS_START( ssf2ghw )
// PORT_DIPSETTING( 0x0002, "JAPAN (NTSC, 60fps)" )
// PORT_DIPSETTING( 0x0003, "EUROPE (PAL, 50fps)" )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
@@ -1541,7 +1541,7 @@ INPUT_PORTS_START( ssf2ghw )
PORT_DIPSETTING( 0x04, DEF_STR( 1C_4C ) )
// PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x07, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "0 (Easiest)" )
PORT_DIPSETTING( 0x06, "1" )
@@ -1552,7 +1552,7 @@ INPUT_PORTS_START( ssf2ghw )
PORT_DIPSETTING( 0x01, "6" )
PORT_DIPSETTING( 0x00, "7 (Hardest)" )
- PORT_START_TAG("DSWC")
+ PORT_START("DSWC")
PORT_DIPNAME( 0x0f, 0x0b, "Speed" )
PORT_DIPSETTING( 0x0f, "0 (Slowest)" )
PORT_DIPSETTING( 0x0e, "1" )
@@ -1616,7 +1616,7 @@ INPUT_PORTS_END
*/
INPUT_PORTS_START( megadriv )
- PORT_START_TAG("PAD1") /* Joypad 1 (3 button + start) NOT READ DIRECTLY */
+ PORT_START("PAD1") /* Joypad 1 (3 button + start) NOT READ DIRECTLY */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1626,7 +1626,7 @@ INPUT_PORTS_START( megadriv )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_NAME("P1 C") // c
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) PORT_NAME("P1 START") // start
- PORT_START_TAG("PAD2") /* Joypad 2 (3 button + start) NOT READ DIRECTLY */
+ PORT_START("PAD2") /* Joypad 2 (3 button + start) NOT READ DIRECTLY */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1636,12 +1636,12 @@ INPUT_PORTS_START( megadriv )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("P2 C") // c
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) PORT_NAME("P2 START") // start
- PORT_START_TAG("IN0") /* 3rd I/O port */
+ PORT_START("IN0") /* 3rd I/O port */
- PORT_START_TAG("RESET") /* Buttons on Genesis Console */
+ PORT_START("RESET") /* Buttons on Genesis Console */
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_NAME("Reset Button") PORT_IMPULSE(1) // reset, resets 68k (and..?)
- PORT_START_TAG("REGION") /* Region setting for Console */
+ PORT_START("REGION") /* Region setting for Console */
/* Region setting for Console */
PORT_DIPNAME( 0x000f, 0x0000, DEF_STR( Region ) )
PORT_DIPSETTING( 0x0000, "Use HazeMD Default Choice" )
@@ -1652,7 +1652,7 @@ INPUT_PORTS_END
INPUT_PORTS_START( aladbl )
- PORT_START_TAG("PAD1") /* Joypad 1 (3 button + start) NOT READ DIRECTLY */
+ PORT_START("PAD1") /* Joypad 1 (3 button + start) NOT READ DIRECTLY */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1662,7 +1662,7 @@ INPUT_PORTS_START( aladbl )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_NAME("P1 Jump") // c
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) // start
- PORT_START_TAG("PAD2") /* Joypad 2 (3 button + start) NOT READ DIRECTLY - not used */
+ PORT_START("PAD2") /* Joypad 2 (3 button + start) NOT READ DIRECTLY - not used */
// PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
// PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
// PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1672,12 +1672,12 @@ INPUT_PORTS_START( aladbl )
// PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("P2 Jump") // c
// PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 ) // start
- PORT_START_TAG("IN0") /* 3rd I/O port */
+ PORT_START("IN0") /* 3rd I/O port */
-// PORT_START_TAG("RESET") /* Buttons on Genesis Console */
+// PORT_START("RESET") /* Buttons on Genesis Console */
// PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_NAME("Reset Button") PORT_IMPULSE(1) // reset, resets 68k (and..?)
-// PORT_START_TAG("REGION") /* Region setting for Console */
+// PORT_START("REGION") /* Region setting for Console */
// /* Region setting for Console */
// PORT_DIPNAME( 0x000f, 0x0000, DEF_STR( Region ) )
// PORT_DIPSETTING( 0x0000, "Use HazeMD Default Choice" )
@@ -1686,7 +1686,7 @@ INPUT_PORTS_START( aladbl )
// PORT_DIPSETTING( 0x0003, "EUROPE (PAL, 50fps)" )
/* As I don't know how it is on real hardware, this is more a guess than anything */
- PORT_START_TAG("MCU")
+ PORT_START("MCU")
PORT_DIPNAME( 0x07, 0x01, DEF_STR( Coinage ) ) /* code at 0x1b2a50 - unsure if there are so many settings */
// PORT_DIPSETTING( 0x00, "INVALID" ) /* adds 0 credit */
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -2945,7 +2945,7 @@ static void svp_init(running_machine *machine)
INPUT_PORTS_START( megdsvp )
PORT_INCLUDE( megadriv )
- PORT_START_TAG("MEMORY_TEST") /* special memtest mode */
+ PORT_START("MEMORY_TEST") /* special memtest mode */
/* Region setting for Console */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Test ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c
index 31aafb51fbb..51c1988c13d 100644
--- a/src/mame/drivers/megaplay.c
+++ b/src/mame/drivers/megaplay.c
@@ -118,7 +118,7 @@ static INTERRUPT_GEN (megaplay_bios_irq)
static UINT32 readpos = 1; // serial bank selection position (9-bit)
static INPUT_PORTS_START ( megaplay )
- PORT_START_TAG("P1_1") /* Player 1 Controls - part 1 */
+ PORT_START("P1_1") /* Player 1 Controls - part 1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
@@ -128,7 +128,7 @@ static INPUT_PORTS_START ( megaplay )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P1_2") /* Player 1 Controls - part 2 */
+ PORT_START("P1_2") /* Player 1 Controls - part 2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -138,7 +138,7 @@ static INPUT_PORTS_START ( megaplay )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2_1") /* Player 2 Controls - part 1 */
+ PORT_START("P2_1") /* Player 2 Controls - part 1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -148,7 +148,7 @@ static INPUT_PORTS_START ( megaplay )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2_2") /* Player 2 Controls - part 2 */
+ PORT_START("P2_2") /* Player 2 Controls - part 2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -158,7 +158,7 @@ static INPUT_PORTS_START ( megaplay )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("TEST")
+ PORT_START("TEST")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Select") PORT_CODE(KEYCODE_0)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_NAME("0x6400 bit 1") PORT_CODE(KEYCODE_W)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_NAME("0x6400 bit 2") PORT_CODE(KEYCODE_E)
@@ -168,7 +168,7 @@ static INPUT_PORTS_START ( megaplay )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_NAME("0x6400 bit 6") PORT_CODE(KEYCODE_U)
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT ( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -183,7 +183,7 @@ static INPUT_PORTS_START ( megaplay )
* PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_START2 )
*/
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x0f, 0x0f, "Coin slot 1" ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -224,7 +224,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START ( mp_sonic )
PORT_INCLUDE( megaplay )
- PORT_START_TAG("DSW1") /* DSW C (per game settings) */
+ PORT_START("DSW1") /* DSW C (per game settings) */
PORT_DIPNAME( 0x03, 0x01, "Initial Players" ) PORT_DIPLOCATION("SW3:1,2")
PORT_DIPSETTING( 0x00, "4" )
PORT_DIPSETTING( 0x01, "3" )
@@ -245,7 +245,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START ( mp_gaxe2 )
PORT_INCLUDE( megaplay )
- PORT_START_TAG("DSW1") /* DSW C (per game settings) */
+ PORT_START("DSW1") /* DSW C (per game settings) */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW3:1")
PORT_DIPSETTING( 0x01, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hard ) )
@@ -269,7 +269,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START ( mp_col3 )
PORT_INCLUDE( megaplay )
- PORT_START_TAG("DSW1") /* DSW C (per game settings) */
+ PORT_START("DSW1") /* DSW C (per game settings) */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Language ) ) PORT_DIPLOCATION("SW3:1")
PORT_DIPSETTING( 0x01, DEF_STR( English ) )
PORT_DIPSETTING( 0x00, DEF_STR( Japanese ) )
@@ -292,7 +292,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START ( mp_twc )
PORT_INCLUDE( megaplay )
- PORT_START_TAG("DSW1") /* DSW C (per game settings) */
+ PORT_START("DSW1") /* DSW C (per game settings) */
PORT_DIPNAME( 0x01, 0x01, "Time" ) PORT_DIPLOCATION("SW3:1")
PORT_DIPSETTING( 0x01, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x00, "Short" )
@@ -310,7 +310,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START ( mp_sor2 )
PORT_INCLUDE( megaplay )
- PORT_START_TAG("DSW1") /* DSW C (per game settings) */
+ PORT_START("DSW1") /* DSW C (per game settings) */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW3:1,2")
PORT_DIPSETTING( 0x00, "4" )
PORT_DIPSETTING( 0x01, "3" )
@@ -326,7 +326,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START ( mp_bio )
PORT_INCLUDE( megaplay )
- PORT_START_TAG("DSW1") /* DSW C (per game settings) */
+ PORT_START("DSW1") /* DSW C (per game settings) */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW3:1,2")
PORT_DIPSETTING( 0x00, "5" )
PORT_DIPSETTING( 0x01, "4" )
@@ -342,7 +342,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START ( mp_gslam )
PORT_INCLUDE( megaplay )
- PORT_START_TAG("DSW1") /* DSW C (per game settings) */
+ PORT_START("DSW1") /* DSW C (per game settings) */
PORT_DIPNAME( 0x07, 0x04, DEF_STR ( Game_Time ) ) PORT_DIPLOCATION("SW3:1,2,3")
PORT_DIPSETTING( 0x00, "5:00" )
PORT_DIPSETTING( 0x01, "4:30" )
@@ -360,7 +360,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START ( mp_mazin )
PORT_INCLUDE( megaplay )
- PORT_START_TAG("DSW1") /* DSW C (per game settings) */
+ PORT_START("DSW1") /* DSW C (per game settings) */
PORT_DIPNAME( 0x01, 0x01, "Initial Player" ) PORT_DIPLOCATION("SW3:1")
PORT_DIPSETTING( 0x01, "2" )
PORT_DIPSETTING( 0x00, "1" )
@@ -378,7 +378,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START ( mp_soni2 )
PORT_INCLUDE( megaplay )
- PORT_START_TAG("DSW1") /* DSW C (per game settings) */
+ PORT_START("DSW1") /* DSW C (per game settings) */
PORT_DIPNAME( 0x03, 0x01, "Initial Players (Normal mode)" ) PORT_DIPLOCATION("SW3:1,2")
PORT_DIPSETTING( 0x00, "4" )
PORT_DIPSETTING( 0x01, "3" )
@@ -394,7 +394,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START ( mp_shnb3 )
PORT_INCLUDE( megaplay )
- PORT_START_TAG("DSW1") /* DSW C (per game settings) */
+ PORT_START("DSW1") /* DSW C (per game settings) */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW3:1,2")
PORT_DIPSETTING( 0x00, "4" )
PORT_DIPSETTING( 0x01, "3" )
diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c
index 202622e54d3..2a787040f4b 100644
--- a/src/mame/drivers/megasys1.c
+++ b/src/mame/drivers/megasys1.c
@@ -943,17 +943,17 @@ ROM_END
static INPUT_PORTS_START( 64street )
COINS
// fire jump
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
JOY_2BUTTONS(1)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
RESERVE // Unused
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
JOY_2BUTTONS(2)
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
COINAGE_8BITS
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1079,14 +1079,14 @@ ROM_END
static INPUT_PORTS_START( astyanax )
COINS /* IN0 0x80001.b */
// fire jump magic
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
JOY_3BUTTONS(1) /* 0x80003.b */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
RESERVE /* 0x80004.b */
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
JOY_3BUTTONS(2) /* 0x80005.b */
- PORT_START_TAG("DSW1") /* 0x80006.b */
+ PORT_START("DSW1") /* 0x80006.b */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 3C_1C ) )
@@ -1112,7 +1112,7 @@ static INPUT_PORTS_START( astyanax )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* 0x80007.b */
+ PORT_START("DSW2") /* 0x80007.b */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) // according to manual
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1329,17 +1329,17 @@ ROM_END
static INPUT_PORTS_START( avspirit )
COINS
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
JOY_2BUTTONS(1)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
RESERVE
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
JOY_2BUTTONS(2)
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
COINAGE_8BITS
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1429,14 +1429,14 @@ ROM_END
static INPUT_PORTS_START( bigstrik )
COINS
// pass shoot feint
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
JOY_3BUTTONS(1)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
RESERVE
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
JOY_3BUTTONS(2)
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -1472,7 +1472,7 @@ static INPUT_PORTS_START( bigstrik )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1548,14 +1548,14 @@ static INPUT_PORTS_START( chimerab )
COINS
// fire jump unused?(shown in service mode, but not in instructions)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
JOY_2BUTTONS(1)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
RESERVE // Unused
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
JOY_2BUTTONS(2)
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1577,7 +1577,7 @@ static INPUT_PORTS_START( chimerab )
PORT_DIPSETTING( 0x00, "4" )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
COINAGE_8BITS
INPUT_PORTS_END
@@ -1674,14 +1674,14 @@ static INPUT_PORTS_START( cybattlr )
COINS
// fire sword
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
JOY_2BUTTONS(1)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
RESERVE // Unused
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
JOY_2BUTTONS(2)
- PORT_START_TAG("DSW1") /*1fd2d9.b, !1fd009.b */
+ PORT_START("DSW1") /*1fd2d9.b, !1fd009.b */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
@@ -1705,7 +1705,7 @@ static INPUT_PORTS_START( cybattlr )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW2") /* 1fd2d7.b, !1fd007.b */
+ PORT_START("DSW2") /* 1fd2d7.b, !1fd007.b */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -1832,21 +1832,21 @@ ROM_END
static INPUT_PORTS_START( edf )
COINS
// fire unfold_weapons
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
JOY_2BUTTONS(1)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
RESERVE
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
JOY_2BUTTONS(2)
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
COINAGE_6BITS
PORT_DIPNAME( 0x40, 0x40, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW2") /* 0x66007.b */
+ PORT_START("DSW2") /* 0x66007.b */
PORT_DIPNAME( 0x07, 0x07, "DSW-B bits 2-0" )
PORT_DIPSETTING( 0x00, "0" )
PORT_DIPSETTING( 0x01, "1" )
@@ -1932,14 +1932,14 @@ ROM_END
static INPUT_PORTS_START( hachoo )
COINS /* 0x80001.b */
// fire jump
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
JOY_2BUTTONS(1) /* 0x80003.b */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
RESERVE /* 0x80004.b */
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
JOY_2BUTTONS(2) /* 0x80005.b */
- PORT_START_TAG("DSW1") /* 0x80006.b */
+ PORT_START("DSW1") /* 0x80006.b */
COINAGE_6BITS
PORT_DIPNAME( 0x40, 0x40, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -1948,7 +1948,7 @@ static INPUT_PORTS_START( hachoo )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* 0x80007.b */
+ PORT_START("DSW2") /* 0x80007.b */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) /* Manual states dips 1-4 & 6 are "Unused" */
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2051,7 +2051,7 @@ ROM_START( hayaosi1 )
ROM_END
static INPUT_PORTS_START( hayaosi1 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2061,7 +2061,7 @@ static INPUT_PORTS_START( hayaosi1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -2071,10 +2071,10 @@ static INPUT_PORTS_START( hayaosi1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(3)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
RESERVE
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
@@ -2084,10 +2084,10 @@ static INPUT_PORTS_START( hayaosi1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
COINAGE_8BITS
- PORT_START_TAG("DSW2") /* 0x69353.b */
+ PORT_START("DSW2") /* 0x69353.b */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2211,14 +2211,14 @@ static INPUT_PORTS_START( kazan )
COINS /* IN0 0x80001.b */
// fire jump
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
JOY_2BUTTONS(1) /* 0x80003.b */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
RESERVE /* 0x80004.b */
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
JOY_2BUTTONS(2) /* 0x80005.b */
- PORT_START_TAG("DSW1") /* 0x80006.b */
+ PORT_START("DSW1") /* 0x80006.b */
COINAGE_6BITS
PORT_DIPNAME( 0x40, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
@@ -2227,7 +2227,7 @@ static INPUT_PORTS_START( kazan )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* 0x80007.b */
+ PORT_START("DSW2") /* 0x80007.b */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x01, "3" )
@@ -2316,14 +2316,14 @@ static INPUT_PORTS_START( jitsupro )
COINS /* 0x80001.b */
// shoot change view change bat
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
JOY_3BUTTONS(1) /* 0x80003.b */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
RESERVE /* 0x80004.b */
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
JOY_3BUTTONS(2) /* 0x80005.b */
- PORT_START_TAG("DSW1") /* 0x80006.b */
+ PORT_START("DSW1") /* 0x80006.b */
COINAGE_6BITS
PORT_DIPNAME( 0x40, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
@@ -2332,7 +2332,7 @@ static INPUT_PORTS_START( jitsupro )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* 0x80007.b */
+ PORT_START("DSW2") /* 0x80007.b */
PORT_DIPNAME( 0x01, 0x01, "2 Player Innings per Credit" )
PORT_DIPSETTING( 0x01, "2" )
PORT_DIPSETTING( 0x00, "3" )
@@ -2440,14 +2440,14 @@ ROM_END
static INPUT_PORTS_START( kickoff )
COINS /* 0x80001.b -> !f0008/a.w */
// shoot pass
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
JOY_2BUTTONS(1) /* 0x80003.b -> !f000c/e.w */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
RESERVE /* 0x80004.b --> !f0010/11.w */
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
JOY_2BUTTONS(2) /* 0x80005.b */
- PORT_START_TAG("DSW1") /* 0x80006.b */
+ PORT_START("DSW1") /* 0x80006.b */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
@@ -2473,7 +2473,7 @@ static INPUT_PORTS_START( kickoff )
PORT_DIPSETTING( 0x80, DEF_STR( Japanese ) )
PORT_DIPSETTING( 0x00, DEF_STR( English ) ) // show "Japan Only" warning
- PORT_START_TAG("DSW2") /* 0x80007.b */
+ PORT_START("DSW2") /* 0x80007.b */
PORT_DIPNAME( 0x03, 0x03, "Time" ) // -> !f0082.w
PORT_DIPSETTING( 0x03, "3'" )
PORT_DIPSETTING( 0x02, "4'" )
@@ -2559,14 +2559,14 @@ ROM_END
static INPUT_PORTS_START( lomakai )
COINS /* 0x80001.b */
// fire jump
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
JOY_2BUTTONS(1) /* 0x80003.b */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
RESERVE /* 0x80004.b */
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
JOY_2BUTTONS(2) /* 0x80005.b */
- PORT_START_TAG("DSW1") /* 0x80006.b */
+ PORT_START("DSW1") /* 0x80006.b */
COINAGE_6BITS_2
PORT_DIPNAME( 0x40, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
@@ -2575,7 +2575,7 @@ static INPUT_PORTS_START( lomakai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* 0x80007.b */
+ PORT_START("DSW2") /* 0x80007.b */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x03, "3" )
@@ -2742,14 +2742,14 @@ static INPUT_PORTS_START( p47 )
COINS /* 0x80001.b */
// fire bomb
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
JOY_2BUTTONS(1) /* 0x80003.b */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
RESERVE /* 0x80004.b */
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
JOY_2BUTTONS(2) /* 0x80005.b */
- PORT_START_TAG("DSW1") /* 0x80006.b */
+ PORT_START("DSW1") /* 0x80006.b */
COINAGE_6BITS_2
PORT_DIPNAME( 0x40, 0x40, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -2758,7 +2758,7 @@ static INPUT_PORTS_START( p47 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* 0x80007.b */
+ PORT_START("DSW2") /* 0x80007.b */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x02, "2" )
PORT_DIPSETTING( 0x03, "3" )
@@ -2908,7 +2908,7 @@ ROM_END
static INPUT_PORTS_START( peekaboo )
- PORT_START_TAG("IN0") /* COINS + P1&P2 Buttons - .b */
+ PORT_START("IN0") /* COINS + P1&P2 Buttons - .b */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN3 ) // called "service"
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN4 ) // called "test"
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -2929,15 +2929,15 @@ static INPUT_PORTS_START( peekaboo )
#define PEEKABOO_PADDLE(_FLAG_) \
PORT_BIT( 0x00ff, 0x0080, IPT_PADDLE ) PORT_PLAYER(_FLAG_) PORT_MINMAX(0x0018,0x00e0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_CENTERDELTA(0)
- PORT_START_TAG("IN1") /* paddle p1 */
+ PORT_START("IN1") /* paddle p1 */
PEEKABOO_PADDLE(1)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
RESERVE /* fake port */
- PORT_START_TAG("IN3") /* paddle p2 */
+ PORT_START("IN3") /* paddle p2 */
PEEKABOO_PADDLE(2) PORT_COCKTAIL
- PORT_START_TAG("DSW1") /* 1f003a.b<-e0000.b */
+ PORT_START("DSW1") /* 1f003a.b<-e0000.b */
COINAGE_6BITS_2
PORT_DIPNAME( 0x40, 0x40, DEF_STR( Demo_Sounds ) ) // 1f0354<-
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -2946,7 +2946,7 @@ static INPUT_PORTS_START( peekaboo )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* 1f003b.b<-e0001.b */
+ PORT_START("DSW2") /* 1f003b.b<-e0001.b */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) // 1f0358<-!
PORT_DIPSETTING( 0x00, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -3066,14 +3066,14 @@ ROM_END
static INPUT_PORTS_START( plusalph )
COINS /* IN0 0x80001.b */
// fire bomb
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
JOY_2BUTTONS(1) /* 0x80003.b */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
RESERVE /* 0x80004.b */
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
JOY_2BUTTONS(2) /* 0x80005.b */
- PORT_START_TAG("DSW1") /* 0x80006.b */
+ PORT_START("DSW1") /* 0x80006.b */
COINAGE_6BITS
PORT_DIPNAME( 0x40, 0x40, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -3082,7 +3082,7 @@ static INPUT_PORTS_START( plusalph )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* 0x80007.b */
+ PORT_START("DSW2") /* 0x80007.b */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -3259,21 +3259,21 @@ static INPUT_PORTS_START( rodland )
COINS /* 0x80001.b */
// fire ladder
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
JOY_2BUTTONS(1) /* 0x80003.b */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
RESERVE /* 0x80004.b */
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
JOY_2BUTTONS(2) /* 0x80005.b */
- PORT_START_TAG("DSW1") /* 0x80006.b */
+ PORT_START("DSW1") /* 0x80006.b */
COINAGE_6BITS
PORT_DIPNAME( 0x40, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW2") /* 0x80007.b */
+ PORT_START("DSW2") /* 0x80007.b */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) /* according to manual */
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3355,14 +3355,14 @@ ROM_END
static INPUT_PORTS_START( stdragon )
COINS /* 0x80001.b */
// fire fire
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
JOY_2BUTTONS(1) /* 0x80003.b */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
RESERVE /* 0x80004.b */
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
JOY_2BUTTONS(2) /* 0x80005.b */
- PORT_START_TAG("DSW1") /* 0x80006.b */
+ PORT_START("DSW1") /* 0x80006.b */
COINAGE_6BITS_2
PORT_DIPNAME( 0x40, 0x40, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -3371,7 +3371,7 @@ static INPUT_PORTS_START( stdragon )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* 0x80007.b */
+ PORT_START("DSW2") /* 0x80007.b */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x02, "2" )
PORT_DIPSETTING( 0x03, "3" )
@@ -3447,21 +3447,21 @@ ROM_END
static INPUT_PORTS_START( soldamj )
COINS /* 0x80001.b */
// turn turn (3rd button is shown in service mode, but seems unused)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
JOY_2BUTTONS(1) /* 0x80003.b */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
RESERVE /* 0x80004.b */
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
JOY_2BUTTONS(2) /* 0x80005.b */
- PORT_START_TAG("DSW1") /* 0x80006.b */
+ PORT_START("DSW1") /* 0x80006.b */
COINAGE_6BITS_2
PORT_DIPNAME( 0x40, 0x40, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW2") /* 0x80007.b */
+ PORT_START("DSW2") /* 0x80007.b */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x00, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -3585,14 +3585,14 @@ ROM_END
static INPUT_PORTS_START( tshingen )
COINS /* 0x80001.b */
// sword_left sword_right jump
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
JOY_3BUTTONS(1) /* 0x80003.b */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
RESERVE /* 0x80004.b */
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
JOY_3BUTTONS(2) /* 0x80005.b */
- PORT_START_TAG("DSW1") /* 0x80006.b */
+ PORT_START("DSW1") /* 0x80006.b */
COINAGE_6BITS
PORT_DIPNAME( 0x40, 0x40, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -3601,7 +3601,7 @@ static INPUT_PORTS_START( tshingen )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* 0x80007.b */
+ PORT_START("DSW2") /* 0x80007.b */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x01, "3" )
diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c
index 9245ca9606a..8ec7afdf5f5 100644
--- a/src/mame/drivers/megatech.c
+++ b/src/mame/drivers/megatech.c
@@ -95,7 +95,7 @@ UINT32 bios_ctrl_inputs;
static INPUT_PORTS_START( megatech ) /* Genesis Input Ports */
PORT_INCLUDE(megadriv)
- PORT_START_TAG("BIOS_IN0") // port 6
+ PORT_START("BIOS_IN0") // port 6
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Select") PORT_CODE(KEYCODE_0)
PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Off ) )
@@ -117,7 +117,7 @@ static INPUT_PORTS_START( megatech ) /* Genesis Input Ports */
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("BIOS_IN1") // port 6
+ PORT_START("BIOS_IN1") // port 6
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) // a few coin inputs here
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -127,7 +127,7 @@ static INPUT_PORTS_START( megatech ) /* Genesis Input Ports */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("BIOS_DSW0")
+ PORT_START("BIOS_DSW0")
PORT_DIPNAME( 0x02, 0x02, "Coin slot 3" )
PORT_DIPSETTING ( 0x00, "Inhibit" )
PORT_DIPSETTING ( 0x02, "Accept" )
@@ -153,7 +153,7 @@ static INPUT_PORTS_START( megatech ) /* Genesis Input Ports */
PORT_DIPSETTING( 0xe0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x00, "Inhibit" )
- PORT_START_TAG("BIOS_DSW1")
+ PORT_START("BIOS_DSW1")
PORT_DIPNAME( 0x0f, 0x01, "Coin Slot 1 value" )
PORT_DIPSETTING( 0x00, "Inhibit" )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -190,7 +190,7 @@ static INPUT_PORTS_START( megatech ) /* Genesis Input Ports */
PORT_DIPSETTING( 0xf0, "0:30" )
- PORT_START_TAG("BIOS_J1")
+ PORT_START("BIOS_J1")
PORT_DIPNAME( 0x0001, 0x0001, "5" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/megazone.c b/src/mame/drivers/megazone.c
index 8cbe006d496..0381a276848 100644
--- a/src/mame/drivers/megazone.c
+++ b/src/mame/drivers/megazone.c
@@ -162,7 +162,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( megazone )
/* 0x6000 -> 0xe320 (CPU1) = 0x3b20 (CPU0) */
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -173,7 +173,7 @@ static INPUT_PORTS_START( megazone )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
/* 0x6001 -> 0xe31e (CPU1) = 0x3b1e (CPU0) */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -184,7 +184,7 @@ static INPUT_PORTS_START( megazone )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
/* 0x6002 -> 0xe31e (CPU1) = 0x3b1e (CPU0) or 0xe31f (CPU1) = 0x3b1f (CPU0) in "test mode" */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -195,7 +195,7 @@ static INPUT_PORTS_START( megazone )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
/* 0x8000 -> 0xe020 (CPU1) = 0x3820 (CPU0) */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -219,7 +219,7 @@ static INPUT_PORTS_START( megazone )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
/* 0x8001 -> 0xe021 (CPU1) = 0x3821 (CPU0) */
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/meijinsn.c b/src/mame/drivers/meijinsn.c
index bed94dff9f6..88376a2f9e6 100644
--- a/src/mame/drivers/meijinsn.c
+++ b/src/mame/drivers/meijinsn.c
@@ -167,7 +167,7 @@ static ADDRESS_MAP_START( meijinsn_sound_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( meijinsn )
-PORT_START_TAG("IN0")
+PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
@@ -179,7 +179,7 @@ PORT_START_TAG("IN0")
PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_SERVICE )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
@@ -188,7 +188,7 @@ PORT_START_TAG("IN0")
PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0xc0ff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x07, 0x00, "Game time (actual game)" )
PORT_DIPSETTING( 0x07, "1:00" )
PORT_DIPSETTING( 0x06, "2:00" )
@@ -208,7 +208,7 @@ PORT_START_TAG("IN0")
PORT_DIPSETTING( 0x20, "1:00" )
PORT_DIPSETTING( 0x00, "2:00" )
- PORT_START_TAG("IN3") /* Coin input to microcontroller */
+ PORT_START("IN3") /* Coin input to microcontroller */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
INPUT_PORTS_END
diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c
index 75f20a06c3e..c934f401cad 100644
--- a/src/mame/drivers/merit.c
+++ b/src/mame/drivers/merit.c
@@ -280,7 +280,7 @@ ADDRESS_MAP_END
// keep it pressed for 10 seconds to clear all the memory.
// to enter hidden test mode enable "Enable Test Mode", enable "Reset High Scores"
static INPUT_PORTS_START( phrcraze )
- PORT_START /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 )
@@ -292,7 +292,7 @@ static INPUT_PORTS_START( phrcraze )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
@@ -312,7 +312,7 @@ static INPUT_PORTS_START( phrcraze )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
@@ -322,7 +322,7 @@ static INPUT_PORTS_START( phrcraze )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -353,7 +353,7 @@ INPUT_PORTS_END
// keep it pressed for 10 seconds to clear all the memory.
// to enter hidden test mode enable "Enable Test Mode", enable "Reset High Scores"
static INPUT_PORTS_START( phrcrazs )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 )
@@ -365,7 +365,7 @@ static INPUT_PORTS_START( phrcrazs )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
@@ -385,7 +385,7 @@ static INPUT_PORTS_START( phrcrazs )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
@@ -395,7 +395,7 @@ static INPUT_PORTS_START( phrcrazs )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -423,7 +423,7 @@ INPUT_PORTS_END
// To enter hidden test-mode in service mode:
// enable "Reset High Scores" then press "Service Mode"
static INPUT_PORTS_START( tictac )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 )
@@ -433,7 +433,7 @@ static INPUT_PORTS_START( tictac )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
@@ -453,7 +453,7 @@ static INPUT_PORTS_START( tictac )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
@@ -463,7 +463,7 @@ static INPUT_PORTS_START( tictac )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, "Lightning Round 1 Credit" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -490,7 +490,7 @@ static INPUT_PORTS_START( tictac )
INPUT_PORTS_END
static INPUT_PORTS_START( trivia )
- PORT_START /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 )
@@ -500,7 +500,7 @@ static INPUT_PORTS_START( trivia )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
@@ -520,7 +520,7 @@ static INPUT_PORTS_START( trivia )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
@@ -530,7 +530,7 @@ static INPUT_PORTS_START( trivia )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -564,14 +564,14 @@ INPUT_PORTS_END
static INPUT_PORTS_START( trvwhziv )
PORT_INCLUDE( trivia )
- PORT_MODIFY("DSWA")
+ PORT_MODIFY("DSW")
PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) /* no coinage DSW */
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
INPUT_PORTS_END
static INPUT_PORTS_START( pitboss )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_DIPNAME( 0x02, 0x02, "0-1" )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -595,7 +595,7 @@ static INPUT_PORTS_START( pitboss )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON5 ) //z
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON6 ) //x
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON7 ) //c
@@ -611,7 +611,7 @@ static INPUT_PORTS_START( pitboss )
INPUT_PORTS_END
static INPUT_PORTS_START( bigappg )
- PORT_START
+ PORT_START("IN0")
PORT_DIPNAME( 0x01, 0x01, "1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -637,7 +637,7 @@ static INPUT_PORTS_START( bigappg )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, "2" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -663,7 +663,7 @@ static INPUT_PORTS_START( bigappg )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN2")
PORT_DIPNAME( 0x01, 0x01, "3" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -689,7 +689,7 @@ static INPUT_PORTS_START( bigappg )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN3")
PORT_DIPNAME( 0x01, 0x01, "4" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c
index 7315fec629d..498e72ff16b 100644
--- a/src/mame/drivers/meritm.c
+++ b/src/mame/drivers/meritm.c
@@ -599,7 +599,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START(meritm_crt260)
PORT_INCLUDE(microtouch)
- PORT_START_TAG("PIO1_PORTA")
+ PORT_START("PIO1_PORTA")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -609,7 +609,7 @@ static INPUT_PORTS_START(meritm_crt260)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("PIO1_PORTB")
+ PORT_START("PIO1_PORTB")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE )
@@ -617,7 +617,7 @@ static INPUT_PORTS_START(meritm_crt260)
INPUT_PORTS_END
static INPUT_PORTS_START(meritm_crt250)
- PORT_START_TAG("PIO1_PORTA")
+ PORT_START("PIO1_PORTA")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 )
@@ -627,7 +627,7 @@ static INPUT_PORTS_START(meritm_crt250)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON7 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("PIO1_PORTB")
+ PORT_START("PIO1_PORTB")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE )
@@ -637,7 +637,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START(pitbossm)
PORT_INCLUDE(meritm_crt250)
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
diff --git a/src/mame/drivers/mermaid.c b/src/mame/drivers/mermaid.c
index ebe1437ee4b..1963efab706 100644
--- a/src/mame/drivers/mermaid.c
+++ b/src/mame/drivers/mermaid.c
@@ -157,7 +157,7 @@ ADDRESS_MAP_END
/* Input Ports */
static INPUT_PORTS_START( mermaid )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -181,7 +181,7 @@ static INPUT_PORTS_START( mermaid )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_2C ))
PORT_DIPSETTING( 0x80, DEF_STR( 1C_3C ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -191,7 +191,7 @@ static INPUT_PORTS_START( mermaid )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c
index 9bfab12508a..33578aa560d 100644
--- a/src/mame/drivers/metlclsh.c
+++ b/src/mame/drivers/metlclsh.c
@@ -168,7 +168,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( metlclsh )
- PORT_START_TAG("IN0") /* c000 */
+ PORT_START("IN0") /* c000 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -193,7 +193,7 @@ static INPUT_PORTS_START( metlclsh )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN1") /* c001 */
+ PORT_START("IN1") /* c001 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
@@ -203,7 +203,7 @@ static INPUT_PORTS_START( metlclsh )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN2") /* c002 */
+ PORT_START("IN2") /* c002 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_COCKTAIL
@@ -213,7 +213,7 @@ static INPUT_PORTS_START( metlclsh )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(1)
- PORT_START_TAG("DSW") /* c003 */
+ PORT_START("DSW") /* c003 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "3" )
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index 829c484d734..54828115cb0 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -2235,14 +2235,14 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( balcube )
- PORT_START_TAG("IN0") // $500000
+ PORT_START("IN0") // $500000
COINS
- PORT_START_TAG("IN1") // $500002
+ PORT_START("IN1") // $500002
JOY_LSB(1, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN)
JOY_MSB(2, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN)
- PORT_START_TAG("DSW0") // Strangely mapped in the 0x400000-0x41ffff range
+ PORT_START("DSW0") // Strangely mapped in the 0x400000-0x41ffff range
COINAGE_DSW
PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0200, DEF_STR( Easy ) )
@@ -2268,7 +2268,7 @@ static INPUT_PORTS_START( balcube )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x8000, DEF_STR( On ) )
- PORT_START_TAG("IN2") // Strangely mapped in the 0x400000-0x41ffff range
+ PORT_START("IN2") // Strangely mapped in the 0x400000-0x41ffff range
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused
INPUT_PORTS_END
@@ -2278,14 +2278,14 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( bangball )
- PORT_START_TAG("IN0") // $d00000
+ PORT_START("IN0") // $d00000
COINS
- PORT_START_TAG("IN1") // $d00002
+ PORT_START("IN1") // $d00002
JOY_LSB(1, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN)
JOY_MSB(2, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN)
- PORT_START_TAG("DSW0") // Strangely mapped in the 0xc00000-0xc1ffff range
+ PORT_START("DSW0") // Strangely mapped in the 0xc00000-0xc1ffff range
COINAGE_DSW
PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0200, DEF_STR( Easy ) )
@@ -2310,7 +2310,7 @@ static INPUT_PORTS_START( bangball )
PORT_DIPSETTING( 0x8000, DEF_STR( Japanese ) )
PORT_DIPSETTING( 0x0000, DEF_STR( English ) )
- PORT_START_TAG("IN2") // Strangely mapped in the 0xc00000-0xc1ffff range
+ PORT_START("IN2") // Strangely mapped in the 0xc00000-0xc1ffff range
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN ) // used for debug
INPUT_PORTS_END
@@ -2319,11 +2319,11 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( batlbubl )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
JOY_LSB(1, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN)
JOY_MSB(2, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN)
- PORT_START_TAG("DSW0") // Strangely mapped in the 0xc00000-0xc1ffff range
+ PORT_START("DSW0") // Strangely mapped in the 0xc00000-0xc1ffff range
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
@@ -2369,10 +2369,10 @@ static INPUT_PORTS_START( batlbubl )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_SERVICE( 0x8000, IP_ACTIVE_LOW )
- PORT_START_TAG("IN0") // $d00000
+ PORT_START("IN0") // $d00000
COINS
- PORT_START_TAG("IN2") // Strangely mapped in the 0xc00000-0xc1ffff range
+ PORT_START("IN2") // Strangely mapped in the 0xc00000-0xc1ffff range
PORT_DIPNAME( 0x0001, 0x0001, "0" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -2428,7 +2428,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( blzntrnd )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x0007, 0x0004, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0007, "Beginner" )
PORT_DIPSETTING( 0x0006, DEF_STR( Easiest ) )
@@ -2476,7 +2476,7 @@ static INPUT_PORTS_START( blzntrnd )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0004, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0005, DEF_STR( 3C_1C ) )
@@ -2520,15 +2520,15 @@ static INPUT_PORTS_START( blzntrnd )
PORT_DIPSETTING( 0x4000, "4:00" )
PORT_DIPSETTING( 0x0000, "5:00" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
JOY_LSB(1, BUTTON1, BUTTON2, BUTTON3, BUTTON4)
JOY_MSB(2, BUTTON1, BUTTON2, BUTTON3, BUTTON4)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
JOY_LSB(3, BUTTON1, BUTTON2, BUTTON3, BUTTON4)
JOY_MSB(4, BUTTON1, BUTTON2, BUTTON3, BUTTON4)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE_NO_TOGGLE(0x0002, IP_ACTIVE_LOW)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
@@ -2545,7 +2545,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( gstrik2 )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x0003, 0x0003, "Player Vs Com" )
PORT_DIPSETTING( 0x0003, "1:00" )
PORT_DIPSETTING( 0x0002, "1:30" )
@@ -2592,7 +2592,7 @@ static INPUT_PORTS_START( gstrik2 )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x001f, 0x001f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x001c, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x001d, DEF_STR( 3C_1C ) )
@@ -2658,14 +2658,14 @@ static INPUT_PORTS_START( gstrik2 )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
JOY_LSB(1, BUTTON1, BUTTON2, BUTTON3, UNUSED)
JOY_MSB(2, BUTTON1, BUTTON2, BUTTON3, UNUSED)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
/* Not Used */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE_NO_TOGGLE(0x0002, IP_ACTIVE_LOW )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
@@ -2692,14 +2692,14 @@ INPUT_PORTS_END
*/
static INPUT_PORTS_START( daitorid )
- PORT_START_TAG("IN0") // $c00000
+ PORT_START("IN0") // $c00000
COINS
- PORT_START_TAG("IN1") // $c00002
+ PORT_START("IN1") // $c00002
JOY_LSB(1, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN) // BUTTON2 and BUTTON3 in "test mode" only
JOY_MSB(2, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN) // BUTTON2 and BUTTON3 in "test mode" only
- PORT_START_TAG("DSW0") // $c00004
+ PORT_START("DSW0") // $c00004
COINAGE_DSW
PORT_DIPNAME( 0x0300, 0x0300, "Timer Speed" )
@@ -2726,7 +2726,7 @@ static INPUT_PORTS_START( daitorid )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN2") // $c00006
+ PORT_START("IN2") // $c00006
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -2743,14 +2743,14 @@ INPUT_PORTS_END
Even if there are 4 "tables" the 2 first ones and the 2 last ones
contains the same values for the timer. */
static INPUT_PORTS_START( dharma )
- PORT_START_TAG("IN0") //$c00000
+ PORT_START("IN0") //$c00000
COINS
- PORT_START_TAG("IN1") //$c00002
+ PORT_START("IN1") //$c00002
JOY_LSB(1, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN) // BUTTON2 and BUTTON3 in "test mode" only
JOY_MSB(2, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN) // BUTTON2 and BUTTON3 in "test mode" only
- PORT_START_TAG("DSW0") //$c00004
+ PORT_START("DSW0") //$c00004
COINAGE_DSW
PORT_DIPNAME( 0x0300, 0x0300, "Time" ) // Check code at 0x00da0a and see notes
@@ -2776,7 +2776,7 @@ static INPUT_PORTS_START( dharma )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN2") // $c00006
+ PORT_START("IN2") // $c00006
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -2785,14 +2785,14 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( gunmast )
- PORT_START_TAG("IN0") //$400000
+ PORT_START("IN0") //$400000
COINS
- PORT_START_TAG("IN1") //$400002
+ PORT_START("IN1") //$400002
JOY_LSB(1, BUTTON1, BUTTON2, BUTTON3, UNKNOWN)
JOY_MSB(2, BUTTON1, BUTTON2, BUTTON3, UNKNOWN)
- PORT_START_TAG("DSW0") //$400004
+ PORT_START("DSW0") //$400004
COINAGE_DSW
PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Difficulty ) )
@@ -2819,7 +2819,7 @@ static INPUT_PORTS_START( gunmast )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN2") // IN3 - $400006
+ PORT_START("IN2") // IN3 - $400006
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -2830,13 +2830,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( karatour )
- PORT_START_TAG("IN0") // $400002
+ PORT_START("IN0") // $400002
JOY_LSB(2, BUTTON1, BUTTON2, UNKNOWN, UNKNOWN)
- PORT_START_TAG("IN1") //$400004
+ PORT_START("IN1") //$400004
COINS
- PORT_START_TAG("DSW0") // $400006
+ PORT_START("DSW0") // $400006
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0001, "1" )
PORT_DIPSETTING( 0x0000, "2" )
@@ -2860,7 +2860,7 @@ static INPUT_PORTS_START( karatour )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("DSW1") // $40000a
+ PORT_START("DSW1") // $40000a
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) )
@@ -2884,7 +2884,7 @@ static INPUT_PORTS_START( karatour )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_SERVICE( 0x0080, IP_ACTIVE_LOW )
- PORT_START_TAG("IN2") // $40000c
+ PORT_START("IN2") // $40000c
JOY_LSB(1, BUTTON1, BUTTON2, UNKNOWN, UNKNOWN)
INPUT_PORTS_END
@@ -2894,13 +2894,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( ladykill )
- PORT_START_TAG("IN0") /*$400002*/
+ PORT_START("IN0") /*$400002*/
JOY_LSB(2, BUTTON1, BUTTON2, UNKNOWN, UNKNOWN)
- PORT_START_TAG("IN1") /*$400004*/
+ PORT_START("IN1") /*$400004*/
COINS
- PORT_START_TAG("DSW0") // $400006
+ PORT_START("DSW0") // $400006
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0001, "1" )
PORT_DIPSETTING( 0x0000, "2" )
@@ -2922,7 +2922,7 @@ static INPUT_PORTS_START( ladykill )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /*$40000a*/
+ PORT_START("DSW1") /*$40000a*/
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) )
@@ -2948,7 +2948,7 @@ static INPUT_PORTS_START( ladykill )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN2") /*$40000c*/
+ PORT_START("IN2") /*$40000c*/
JOY_LSB(1, BUTTON1, BUTTON2, UNKNOWN, UNKNOWN)
INPUT_PORTS_END
@@ -2973,19 +2973,19 @@ INPUT_PORTS_END
*/
static INPUT_PORTS_START( lastfort )
- PORT_START_TAG("IN0") /*$c00004*/
+ PORT_START("IN0") /*$c00004*/
COINS
- PORT_START_TAG("IN1") /*$c00006*/
+ PORT_START("IN1") /*$c00006*/
JOY_LSB(1, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN) /* BUTTON2 and BUTTON3 in "test mode" only*/
- PORT_START_TAG("IN2") /*$c00008*/
+ PORT_START("IN2") /*$c00008*/
JOY_LSB(2, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN) /*BUTTON2 and BUTTON3 in "test mode" only*/
- PORT_START_TAG("DSW0") /*$c0000a*/
+ PORT_START("DSW0") /*$c0000a*/
COINAGE_DSW
- PORT_START_TAG("DSW1") // $c0000c
+ PORT_START("DSW1") // $c0000c
PORT_DIPNAME( 0x0003, 0x0003, "Timer Speed" )
PORT_DIPSETTING( 0x0002, "Slower" )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
@@ -3010,7 +3010,7 @@ static INPUT_PORTS_START( lastfort )
PORT_DIPSETTING( 0x0080, "Mahjong" )
// PORT_DIPSETTING( 0x0000, "Cards" ) // Not working - See notes
- PORT_START_TAG("IN3") // $c0000e
+ PORT_START("IN3") // $c0000e
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -3040,7 +3040,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( mj_panel )
- PORT_START_TAG("KEY0")
+ PORT_START("KEY0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_E )
@@ -3051,7 +3051,7 @@ static INPUT_PORTS_START( mj_panel )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_F )
@@ -3062,7 +3062,7 @@ static INPUT_PORTS_START( mj_panel )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_C )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_G )
@@ -3073,7 +3073,7 @@ static INPUT_PORTS_START( mj_panel )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_D )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_H )
@@ -3084,10 +3084,10 @@ static INPUT_PORTS_START( mj_panel )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY4")
+ PORT_START("KEY4")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -3102,7 +3102,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( dokyusei )
PORT_INCLUDE( mj_panel )
- PORT_START_TAG("DSW0") // $478884.w
+ PORT_START("DSW0") // $478884.w
PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0300, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0200, DEF_STR( Normal ) )
@@ -3127,7 +3127,7 @@ static INPUT_PORTS_START( dokyusei )
PORT_DIPSETTING( 0x8000, DEF_STR( No ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Yes ) )
- PORT_START_TAG("DSW1") // $478886.w
+ PORT_START("DSW1") // $478886.w
PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0100, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -3171,7 +3171,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( mouja )
- PORT_START_TAG("IN0") //$478880
+ PORT_START("IN0") //$478880
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -3189,7 +3189,7 @@ static INPUT_PORTS_START( mouja )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_START_TAG("IN1") //$478882
+ PORT_START("IN1") //$478882
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -3199,7 +3199,7 @@ static INPUT_PORTS_START( mouja )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE_NO_TOGGLE(0x0080, IP_ACTIVE_LOW)
- PORT_START_TAG("DSW0") //$478884
+ PORT_START("DSW0") //$478884
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Free_Play ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -3246,7 +3246,7 @@ static INPUT_PORTS_START( mouja )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN2") //$478886
+ PORT_START("IN2") //$478886
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -3256,19 +3256,19 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( pangpoms )
- PORT_START_TAG("IN0") //$800004
+ PORT_START("IN0") //$800004
COINS
- PORT_START_TAG("IN1") //$800006
+ PORT_START("IN1") //$800006
JOY_LSB(1, BUTTON1, BUTTON2, UNKNOWN, UNKNOWN)
- PORT_START_TAG("IN2") //$800008
+ PORT_START("IN2") //$800008
JOY_LSB(2, BUTTON1, BUTTON2, UNKNOWN, UNKNOWN)
- PORT_START_TAG("DSW0") //$80000a
+ PORT_START("DSW0") //$80000a
COINAGE_DSW
- PORT_START_TAG("DSW1") //$80000c
+ PORT_START("DSW1") //$80000c
PORT_DIPNAME( 0x0003, 0x0003, "Time Speed" )
PORT_DIPSETTING( 0x0000, "Slowest" ) // 60 (1 game sec. lasts x/60 real sec.)
PORT_DIPSETTING( 0x0001, "Slow" ) // 90
@@ -3291,7 +3291,7 @@ static INPUT_PORTS_START( pangpoms )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0080, DEF_STR( On ) )
- PORT_START_TAG("IN3") //$80000e
+ PORT_START("IN3") //$80000e
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -3301,14 +3301,14 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( poitto )
- PORT_START_TAG("IN0") //$800000
+ PORT_START("IN0") //$800000
COINS
- PORT_START_TAG("IN1") //$800002
+ PORT_START("IN1") //$800002
JOY_LSB(1, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN) // BUTTON2 and BUTTON3 in "test mode" only
JOY_MSB(2, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN) // BUTTON2 and BUTTON3 in "test mode" only
- PORT_START_TAG("DSW0") //$800004
+ PORT_START("DSW0") //$800004
COINAGE_DSW
PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Difficulty ) )
@@ -3335,7 +3335,7 @@ static INPUT_PORTS_START( poitto )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN2") //$800006
+ PORT_START("IN2") //$800006
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -3345,7 +3345,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( puzzlet )
- PORT_START_TAG("IN0") // IN0 - ser B
+ PORT_START("IN0") // IN0 - ser B
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -3355,7 +3355,7 @@ static INPUT_PORTS_START( puzzlet )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") // IN1 - 7f8880.w
+ PORT_START("IN1") // IN1 - 7f8880.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -3374,7 +3374,7 @@ static INPUT_PORTS_START( puzzlet )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") // IN2 - port 7
+ PORT_START("IN2") // IN2 - port 7
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -3384,7 +3384,7 @@ static INPUT_PORTS_START( puzzlet )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0") // IN3 - dsw?
+ PORT_START("DSW0") // IN3 - dsw?
PORT_DIPUNKNOWN( 0x0001, 0x0001 )
PORT_DIPUNKNOWN( 0x0002, 0x0002 )
PORT_DIPUNKNOWN( 0x0004, 0x0004 )
@@ -3410,14 +3410,14 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( puzzli )
- PORT_START_TAG("IN0") //$c00000
+ PORT_START("IN0") //$c00000
COINS
- PORT_START_TAG("IN1") //$c00002
+ PORT_START("IN1") //$c00002
JOY_LSB(1, BUTTON1, BUTTON2, UNKNOWN, UNKNOWN) // BUTTON3 in "test mode" only
JOY_MSB(2, BUTTON1, BUTTON2, UNKNOWN, UNKNOWN) // BUTTON3 in "test mode" only
- PORT_START_TAG("DSW0") //$c00004
+ PORT_START("DSW0") //$c00004
COINAGE_DSW
PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Difficulty ) )
@@ -3444,7 +3444,7 @@ static INPUT_PORTS_START( puzzli )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN2") //$c00006
+ PORT_START("IN2") //$c00006
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -3454,14 +3454,14 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( 3kokushi )
- PORT_START_TAG("IN0") //$c00000
+ PORT_START("IN0") //$c00000
COINS
- PORT_START_TAG("IN1") //$c00002
+ PORT_START("IN1") //$c00002
JOY_LSB(1, BUTTON1, BUTTON2, UNKNOWN, UNKNOWN)
JOY_MSB(2, BUTTON1, BUTTON2, UNKNOWN, UNKNOWN)
- PORT_START_TAG("DSW0") //$c00004
+ PORT_START("DSW0") //$c00004
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) )
@@ -3516,14 +3516,14 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( pururun )
- PORT_START_TAG("IN0") //$400000
+ PORT_START("IN0") //$400000
COINS
- PORT_START_TAG("IN1") //$400002
+ PORT_START("IN1") //$400002
JOY_LSB(1, BUTTON1, BUTTON2, UNKNOWN, UNKNOWN) // BUTTON3 in "test mode" only
JOY_MSB(2, BUTTON1, BUTTON2, UNKNOWN, UNKNOWN) // BUTTON3 in "test mode" only
- PORT_START_TAG("DSW0") //$400004
+ PORT_START("DSW0") //$400004
COINAGE_DSW
PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Difficulty ) ) // Distance to goal
@@ -3550,7 +3550,7 @@ static INPUT_PORTS_START( pururun )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN2") // IN3 - $400006
+ PORT_START("IN2") // IN3 - $400006
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -3575,19 +3575,19 @@ INPUT_PORTS_END
*/
static INPUT_PORTS_START( skyalert )
- PORT_START_TAG("IN0") //$400004
+ PORT_START("IN0") //$400004
COINS
- PORT_START_TAG("IN1") //$400006
+ PORT_START("IN1") //$400006
JOY_LSB(1, BUTTON1, BUTTON2, UNKNOWN, UNKNOWN) // BUTTON3 in "test mode" only
- PORT_START_TAG("IN2") //$400008
+ PORT_START("IN2") //$400008
JOY_LSB(2, BUTTON1, BUTTON2, UNKNOWN, UNKNOWN) // BUTTON3 in "test mode" only
- PORT_START_TAG("DSW0") //$40000a
+ PORT_START("DSW0") //$40000a
COINAGE_DSW
- PORT_START_TAG("DSW1") //$40000c
+ PORT_START("DSW1") //$40000c
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
@@ -3610,7 +3610,7 @@ static INPUT_PORTS_START( skyalert )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0080, DEF_STR( On ) )
- PORT_START_TAG("IN3") //$40000e
+ PORT_START("IN3") //$40000e
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -3624,14 +3624,14 @@ INPUT_PORTS_END
proposed, but there is no evidence that one "table" is harder
than another. */
static INPUT_PORTS_START( toride2g )
- PORT_START_TAG("IN0") //$800000
+ PORT_START("IN0") //$800000
COINS
- PORT_START_TAG("IN1") //$800002
+ PORT_START("IN1") //$800002
JOY_LSB(1, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN) // BUTTON2 and BUTTON3 in "test mode" only
JOY_MSB(2, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN) // BUTTON2 and BUTTON3 in "test mode" only
- PORT_START_TAG("DSW0") //$800004
+ PORT_START("DSW0") //$800004
COINAGE_DSW
PORT_DIPNAME( 0x0300, 0x0300, "Timer Speed" )
@@ -3658,7 +3658,7 @@ static INPUT_PORTS_START( toride2g )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN2") //$800006
+ PORT_START("IN2") //$800006
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) // BIT 6 !?
INPUT_PORTS_END
diff --git a/src/mame/drivers/mexico86.c b/src/mame/drivers/mexico86.c
index 68dbdc1dbaa..f69d5cfa5f4 100644
--- a/src/mame/drivers/mexico86.c
+++ b/src/mame/drivers/mexico86.c
@@ -137,7 +137,7 @@ static ADDRESS_MAP_START( sub_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( mexico86 )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -147,7 +147,7 @@ static INPUT_PORTS_START( mexico86 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -157,7 +157,7 @@ static INPUT_PORTS_START( mexico86 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) /* service 2 */
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -167,7 +167,7 @@ static INPUT_PORTS_START( mexico86 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
/* When Bit 1 is On, the machine waits a signal from another one */
/* Seems like if you can join two cabinets, one as master */
/* and the other as slave, probably to play four players */
@@ -192,7 +192,7 @@ static INPUT_PORTS_START( mexico86 )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -217,7 +217,7 @@ static INPUT_PORTS_START( mexico86 )
PORT_DIPSETTING( 0x80, "2" )
PORT_DIPSETTING( 0x00, "4" )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
/* the following is actually service coin 1 */
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Advance") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -230,7 +230,7 @@ static INPUT_PORTS_START( mexico86 )
INPUT_PORTS_END
static INPUT_PORTS_START( kikikai )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -240,7 +240,7 @@ static INPUT_PORTS_START( kikikai )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -250,7 +250,7 @@ static INPUT_PORTS_START( kikikai )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -261,7 +261,7 @@ static INPUT_PORTS_START( kikikai )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
//AT
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -298,7 +298,7 @@ static INPUT_PORTS_START( kikikai )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -322,7 +322,7 @@ static INPUT_PORTS_START( kikikai )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
//ZT
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT )
diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c
index 7142f17965c..2e046630c56 100644
--- a/src/mame/drivers/mgolf.c
+++ b/src/mame/drivers/mgolf.c
@@ -210,7 +210,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mgolf )
- PORT_START_TAG("40") /* 40 */
+ PORT_START("40") /* 40 */
PORT_DIPNAME( 0x30, 0x00, DEF_STR( Language ) )
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
PORT_DIPSETTING( 0x10, DEF_STR( French ) )
@@ -222,28 +222,28 @@ static INPUT_PORTS_START( mgolf )
PORT_DIPSETTING( 0x80, "35" )
PORT_DIPSETTING( 0xc0, "40" )
- PORT_START_TAG("41") /* 41 */
+ PORT_START("41") /* 41 */
PORT_BIT ( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* DIAL A */
PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* DIAL B */
PORT_BIT ( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT ( 0x08, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("60") /* 60 */
+ PORT_START("60") /* 60 */
PORT_SERVICE( 0x10, IP_ACTIVE_LOW )
PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(1)
- PORT_START_TAG("61") /* 61 */
+ PORT_START("61") /* 61 */
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Course Select") PORT_CODE(KEYCODE_SPACE)
PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_SPECIAL ) /* PLUNGER 1 */
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_SPECIAL ) /* PLUNGER 2 */
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("DIAL")
+ PORT_START("DIAL")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(25)
- PORT_START_TAG("BUTTON")
+ PORT_START("BUTTON")
PORT_BIT ( 0xff, IP_ACTIVE_HIGH, IPT_BUTTON1 )
INPUT_PORTS_END
diff --git a/src/mame/drivers/mhavoc.c b/src/mame/drivers/mhavoc.c
index fc53fb5db44..b09fdf74e54 100644
--- a/src/mame/drivers/mhavoc.c
+++ b/src/mame/drivers/mhavoc.c
@@ -335,7 +335,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( mhavoc )
- PORT_START_TAG("IN0") /* IN0 - alpha (player_1 = 0) */
+ PORT_START("IN0") /* IN0 - alpha (player_1 = 0) */
PORT_BIT ( 0x03, IP_ACTIVE_HIGH, IPT_SPECIAL )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
@@ -344,17 +344,17 @@ static INPUT_PORTS_START( mhavoc )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) /* Left Coin Switch */
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) /* Right Coin */
- PORT_START_TAG("IN1") /* IN1 - gamma */
+ PORT_START("IN1") /* IN1 - gamma */
PORT_BIT ( 0x0f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("DIAL") /* IN2 - gamma */
+ PORT_START("DIAL") /* IN2 - gamma */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(40) PORT_REVERSE
- PORT_START_TAG("DSW1") /* DIP Switch at position 13/14S */
+ PORT_START("DSW1") /* DIP Switch at position 13/14S */
PORT_DIPNAME( 0x01, 0x00, "Adaptive Difficulty" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x01, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ))
@@ -377,7 +377,7 @@ static INPUT_PORTS_START( mhavoc )
PORT_DIPSETTING( 0x80, "5 (4 in Free Play)")
PORT_DIPSETTING( 0x40, "6 (5 in Free Play)")
- PORT_START_TAG("DSW2") /* DIP Switch at position 8S */
+ PORT_START("DSW2") /* DIP Switch at position 8S */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW2:7,8")
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -398,7 +398,7 @@ static INPUT_PORTS_START( mhavoc )
PORT_DIPSETTING( 0x60, "1 each 5" )
PORT_DIPSETTING( 0xe0, DEF_STR( None ) )
- PORT_START_TAG("IN2") /* IN5 - dummy for player_1 = 1 on alpha */
+ PORT_START("IN2") /* IN5 - dummy for player_1 = 1 on alpha */
PORT_BIT ( 0x3f, IP_ACTIVE_HIGH, IPT_SPECIAL )
PORT_DIPNAME( 0x40, 0x40, "Credit to start" )
PORT_DIPSETTING( 0x40, "1" )
@@ -408,24 +408,24 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mhavocp )
- PORT_START_TAG("IN0") /* IN0 - alpha (player_1 = 0) */
+ PORT_START("IN0") /* IN0 - alpha (player_1 = 0) */
PORT_BIT ( 0x0f, IP_ACTIVE_HIGH, IPT_SPECIAL )
PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Diag Step/Coin C") PORT_CODE(KEYCODE_F1)
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) /* Left Coin Switch */
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) /* Right Coin */
- PORT_START_TAG("IN1") /* IN1 - gamma */
+ PORT_START("IN1") /* IN1 - gamma */
PORT_BIT ( 0x0f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("DIAL") /* IN2 - gamma */
+ PORT_START("DIAL") /* IN2 - gamma */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(40) PORT_REVERSE
- PORT_START_TAG("DSW1") /* DIP Switch at position 13/14S */
+ PORT_START("DSW1") /* DIP Switch at position 13/14S */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:7,8")
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x01, "2" )
@@ -447,7 +447,7 @@ static INPUT_PORTS_START( mhavocp )
PORT_DIPSETTING( 0x80, "5 (4 in Free Play)")
PORT_DIPSETTING( 0x40, "6 (5 in Free Play)")
- PORT_START_TAG("DSW2") /* DIP Switch at position 8S */
+ PORT_START("DSW2") /* DIP Switch at position 8S */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW2:7,8")
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -468,7 +468,7 @@ static INPUT_PORTS_START( mhavocp )
PORT_DIPSETTING( 0x60, "1 each 5" )
PORT_DIPSETTING( 0xe0, DEF_STR( None ) )
- PORT_START_TAG("IN2") /* IN5 - dummy for player_1 = 1 on alpha */
+ PORT_START("IN2") /* IN5 - dummy for player_1 = 1 on alpha */
PORT_BIT ( 0x3f, IP_ACTIVE_HIGH, IPT_SPECIAL )
PORT_DIPNAME( 0x40, 0x40, "Credit to start" )
PORT_DIPSETTING( 0x40, "1" )
@@ -478,19 +478,19 @@ INPUT_PORTS_END
static INPUT_PORTS_START( alphaone )
- PORT_START_TAG("IN0") /* IN0 - alpha (player_1 = 0) */
+ PORT_START("IN0") /* IN0 - alpha (player_1 = 0) */
PORT_BIT ( 0x03, IP_ACTIVE_HIGH, IPT_SPECIAL )
PORT_BIT ( 0x7c, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN1") /* IN1 - gamma */
+ PORT_START("IN1") /* IN1 - gamma */
PORT_BIT ( 0x0f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE( 0x10, IP_ACTIVE_LOW )
PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("DIAL") /* IN2 - gamma */
+ PORT_START("DIAL") /* IN2 - gamma */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(40) PORT_REVERSE
INPUT_PORTS_END
diff --git a/src/mame/drivers/micro3d.c b/src/mame/drivers/micro3d.c
index 2574e53256d..6877c97ef7f 100644
--- a/src/mame/drivers/micro3d.c
+++ b/src/mame/drivers/micro3d.c
@@ -217,7 +217,7 @@ static DRIVER_INIT( f15se21 )
static INPUT_PORTS_START( stankatk )
/* Ports A and B */
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x0001, DEF_STR(Off) )
PORT_DIPSETTING( 0x0000, DEF_STR(On) )
@@ -257,7 +257,7 @@ static INPUT_PORTS_START( stankatk )
/* C and D ports */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -279,7 +279,7 @@ static INPUT_PORTS_START( stankatk )
// PORT_BITX( 0x8000, IP_ACTIVE_LOW, 0, "Yellow Trigger", KEYCODE_G, IP_JOY_NONE )
- PORT_START_TAG("VGB")
+ PORT_START("VGB")
PORT_DIPNAME( 0x0008, 0x0008, "VGB Monitor Mode")
PORT_DIPSETTING( 0x0008, DEF_STR(Off) )
PORT_DIPSETTING( 0x0000, DEF_STR(On) )
@@ -287,7 +287,7 @@ static INPUT_PORTS_START( stankatk )
INPUT_PORTS_END
static INPUT_PORTS_START( botss )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x0001, DEF_STR(Off) )
PORT_DIPSETTING( 0x0000, DEF_STR(On) )
@@ -321,7 +321,7 @@ static INPUT_PORTS_START( botss )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
/* C and D ports */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -330,7 +330,7 @@ static INPUT_PORTS_START( botss )
// PORT_BITX(0x0002, IP_ACTIVE_LOW, 0, "Throttle Up", KEYCODE_D, IP_JOY_NONE )
// PORT_BITX(0x0008, IP_ACTIVE_LOW, 0, "Throttle Down", KEYCODE_F, IP_JOY_NONE )
- PORT_START_TAG("VGB")
+ PORT_START("VGB")
PORT_DIPNAME( 0x0008, 0x0008, "VGB Monitor Mode")
PORT_DIPSETTING( 0x0008, DEF_STR(Off) )
PORT_DIPSETTING( 0x0000, DEF_STR(On) )
@@ -339,7 +339,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( f15se )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x0001, DEF_STR(Off) )
PORT_DIPSETTING( 0x0000, DEF_STR(On) )
@@ -369,7 +369,7 @@ static INPUT_PORTS_START( f15se )
PORT_SERVICE(0x0400, IP_ACTIVE_LOW)
/* C and D ports */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -379,13 +379,13 @@ static INPUT_PORTS_START( f15se )
/* Analogue Inputs? */
- PORT_START_TAG("VGB")
+ PORT_START("VGB")
PORT_DIPNAME( 0x0008, 0x0008, "VGB Monitor Mode")
PORT_DIPSETTING( 0x0008, DEF_STR(Off) )
PORT_DIPSETTING( 0x0000, DEF_STR(On) )
/* Sound PCB test button */
- PORT_START_TAG("SOUND")
+ PORT_START("SOUND")
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Sound PCB Test") PORT_CODE(KEYCODE_F1)
INPUT_PORTS_END
diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c
index b3d58947161..52d7ff07f4f 100644
--- a/src/mame/drivers/midas.c
+++ b/src/mame/drivers/midas.c
@@ -293,7 +293,7 @@ GFXDECODE_END
static INPUT_PORTS_START( livequiz )
- PORT_START_TAG("IN0") // IN0
+ PORT_START("IN0") // IN0
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -312,7 +312,7 @@ static INPUT_PORTS_START( livequiz )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") // IN1
+ PORT_START("IN1") // IN1
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -331,7 +331,7 @@ static INPUT_PORTS_START( livequiz )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") // IN2
+ PORT_START("IN2") // IN2
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -350,7 +350,7 @@ static INPUT_PORTS_START( livequiz )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3") // IN3
+ PORT_START("IN3") // IN3
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
@@ -369,7 +369,7 @@ static INPUT_PORTS_START( livequiz )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN4") // IN4
+ PORT_START("IN4") // IN4
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -388,7 +388,7 @@ static INPUT_PORTS_START( livequiz )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN5") // IN5 - 900000
+ PORT_START("IN5") // IN5 - 900000
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/midtunit.c b/src/mame/drivers/midtunit.c
index 1ea629dac88..861fd08782e 100644
--- a/src/mame/drivers/midtunit.c
+++ b/src/mame/drivers/midtunit.c
@@ -68,7 +68,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( mk )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -86,7 +86,7 @@ static INPUT_PORTS_START( mk )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -105,10 +105,10 @@ static INPUT_PORTS_START( mk )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1)
//There should be an additional block button for player 2, but I coudn't find it.
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0001, 0x0001, "Test Switch" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
@@ -166,7 +166,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mk2 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -184,7 +184,7 @@ static INPUT_PORTS_START( mk2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -201,7 +201,7 @@ static INPUT_PORTS_START( mk2 )
//PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED ) //Renamed to unused because without it the game seemed to hold P1 Block down-someone with more experience should check
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1)
@@ -215,7 +215,7 @@ static INPUT_PORTS_START( mk2 )
but does not have an indicator light show up. During gameplay, the second block only functions temporarily.
You can hold the button, but the character will only take a block position for 1 second. This is correct behavior.*/
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0001, 0x0001, "Test Switch" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
@@ -273,7 +273,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( jdreddp )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -291,7 +291,7 @@ static INPUT_PORTS_START( jdreddp )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -307,7 +307,7 @@ static INPUT_PORTS_START( jdreddp )
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_VOLUME_UP )
PORT_BIT( 0xe000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -318,7 +318,7 @@ static INPUT_PORTS_START( jdreddp )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(3)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW") /* DS1 */
+ PORT_START("DSW") /* DS1 */
PORT_DIPNAME( 0x0001, 0x0001, "Test Switch" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
@@ -369,7 +369,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( nbajam )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -387,7 +387,7 @@ static INPUT_PORTS_START( nbajam )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -403,7 +403,7 @@ static INPUT_PORTS_START( nbajam )
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_VOLUME_UP )
PORT_BIT( 0xe000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -421,7 +421,7 @@ static INPUT_PORTS_START( nbajam )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW") /* DS1 */
+ PORT_START("DSW") /* DS1 */
PORT_DIPNAME( 0x0001, 0x0001, "Test Switch" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
@@ -472,7 +472,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( nbajamte )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -490,7 +490,7 @@ static INPUT_PORTS_START( nbajamte )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -506,7 +506,7 @@ static INPUT_PORTS_START( nbajamte )
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_VOLUME_UP )
PORT_BIT( 0xe000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -524,7 +524,7 @@ static INPUT_PORTS_START( nbajamte )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")/* DS1 */
+ PORT_START("DSW")/* DS1 */
PORT_DIPNAME( 0x0001, 0x0001, "Test Switch" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
diff --git a/src/mame/drivers/midvunit.c b/src/mame/drivers/midvunit.c
index 329fc5f18e5..af348a625f7 100644
--- a/src/mame/drivers/midvunit.c
+++ b/src/mame/drivers/midvunit.c
@@ -554,7 +554,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( crusnusa )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -572,7 +572,7 @@ static INPUT_PORTS_START( crusnusa )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON6 ) /* radio */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -583,7 +583,7 @@ static INPUT_PORTS_START( crusnusa )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2) /* view 4 */
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0001, 0x0000, "Link Status" )
PORT_DIPSETTING( 0x0000, "Master" )
PORT_DIPSETTING( 0x0001, "Slave" )
@@ -666,19 +666,19 @@ static INPUT_PORTS_START( crusnusa )
PORT_DIPSETTING( 0x1800, "Spain-4" )
PORT_DIPSETTING( 0x0e00, "Netherland-1" )
- PORT_START_TAG("WHEEL") /* wheel */
+ PORT_START("WHEEL") /* wheel */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START_TAG("ACCEL") /* gas pedal */
+ PORT_START("ACCEL") /* gas pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START_TAG("BRAKE") /* brake pedal */
+ PORT_START("BRAKE") /* brake pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
INPUT_PORTS_END
static INPUT_PORTS_START( crusnwld )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -696,7 +696,7 @@ static INPUT_PORTS_START( crusnwld )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON6 ) /* radio */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -707,7 +707,7 @@ static INPUT_PORTS_START( crusnwld )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2) /* view 4 */
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0003, 0x0000, "Link Number" )
PORT_DIPSETTING( 0x0000, "1" )
PORT_DIPSETTING( 0x0001, "2" )
@@ -787,19 +787,19 @@ static INPUT_PORTS_START( crusnwld )
PORT_DIPSETTING( 0x1800, "Spain-4" )
PORT_DIPSETTING( 0x0e00, "Netherland-1" )
- PORT_START_TAG("WHEEL") /* wheel */
+ PORT_START("WHEEL") /* wheel */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START_TAG("ACCEL") /* gas pedal */
+ PORT_START("ACCEL") /* gas pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START_TAG("BRAKE") /* brake pedal */
+ PORT_START("BRAKE") /* brake pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
INPUT_PORTS_END
static INPUT_PORTS_START( offroadc )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -817,7 +817,7 @@ static INPUT_PORTS_START( offroadc )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON6 ) /* radio */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -828,7 +828,7 @@ static INPUT_PORTS_START( offroadc )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2) /* view 4 */
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ))
PORT_DIPSETTING( 0x0001, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
@@ -882,19 +882,19 @@ static INPUT_PORTS_START( offroadc )
PORT_DIPSETTING( 0x7000, "Denmark 1" )
PORT_DIPSETTING( 0x6800, "Hungary 1" )
- PORT_START_TAG("WHEEL") /* wheel */
+ PORT_START("WHEEL") /* wheel */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START_TAG("ACCEL") /* gas pedal */
+ PORT_START("ACCEL") /* gas pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START_TAG("BRAKE") /* brake pedal */
+ PORT_START("BRAKE") /* brake pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
INPUT_PORTS_END
static INPUT_PORTS_START( wargods )
- PORT_START_TAG("DIPS") /* DS1 */
+ PORT_START("DIPS") /* DS1 */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ))
PORT_DIPSETTING( 0x0001, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
@@ -951,7 +951,7 @@ static INPUT_PORTS_START( wargods )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -968,7 +968,7 @@ static INPUT_PORTS_START( wargods )
PORT_BIT( 0x6000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BILL1 ) /* Bill */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -986,7 +986,7 @@ static INPUT_PORTS_START( wargods )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1)
diff --git a/src/mame/drivers/midwunit.c b/src/mame/drivers/midwunit.c
index 5a7eb07d24e..3dba9d8bb75 100644
--- a/src/mame/drivers/midwunit.c
+++ b/src/mame/drivers/midwunit.c
@@ -125,7 +125,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( mk3 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -143,7 +143,7 @@ static INPUT_PORTS_START( mk3 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1)
@@ -154,7 +154,7 @@ static INPUT_PORTS_START( mk3 )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0001, 0x0001, "Test Switch" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
@@ -203,7 +203,7 @@ static INPUT_PORTS_START( mk3 )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ))
PORT_DIPSETTING( 0x8000, DEF_STR( On ))
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -224,7 +224,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( openice )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -242,7 +242,7 @@ static INPUT_PORTS_START( openice )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -260,7 +260,7 @@ static INPUT_PORTS_START( openice )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0001, 0x0000, "Coinage Source" )
PORT_DIPSETTING( 0x0001, "Dipswitch" )
PORT_DIPSETTING( 0x0000, "CMOS" )
@@ -312,7 +312,7 @@ static INPUT_PORTS_START( openice )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -333,7 +333,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( nbahangt )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -351,7 +351,7 @@ static INPUT_PORTS_START( nbahangt )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -369,7 +369,7 @@ static INPUT_PORTS_START( nbahangt )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0001, 0x0001, "Test Switch" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
@@ -405,7 +405,7 @@ static INPUT_PORTS_START( nbahangt )
PORT_DIPSETTING( 0x8000, "Dipswitch" )
PORT_DIPSETTING( 0x0000, "CMOS" )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -426,7 +426,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( rmpgwt )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -444,7 +444,7 @@ static INPUT_PORTS_START( rmpgwt )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -454,7 +454,7 @@ static INPUT_PORTS_START( rmpgwt )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0xff80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0001, 0x0000, "Coinage Source" )
PORT_DIPSETTING( 0x0001, "Dipswitch" )
PORT_DIPSETTING( 0x0000, "CMOS" )
@@ -498,7 +498,7 @@ static INPUT_PORTS_START( rmpgwt )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -519,7 +519,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( wwfmania )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -537,7 +537,7 @@ static INPUT_PORTS_START( wwfmania )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
PORT_BIT( 0x000c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -546,7 +546,7 @@ static INPUT_PORTS_START( wwfmania )
PORT_BIT( 0x00c0, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0001, 0x0001, "Test Switch" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
@@ -584,7 +584,7 @@ static INPUT_PORTS_START( wwfmania )
PORT_DIPSETTING( 0x8000, "Dipswitch" )
PORT_DIPSETTING( 0x0000, "CMOS" )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
diff --git a/src/mame/drivers/midxunit.c b/src/mame/drivers/midxunit.c
index 6b9e9d98003..bc4c3b003a5 100644
--- a/src/mame/drivers/midxunit.c
+++ b/src/mame/drivers/midxunit.c
@@ -58,7 +58,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( revx )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -68,13 +68,13 @@ static INPUT_PORTS_START( revx )
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0xc000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -92,7 +92,7 @@ static INPUT_PORTS_START( revx )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BILL1 ) /* bill validator */
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Flip_Screen ))
PORT_DIPSETTING( 0x0000, DEF_STR( Off ))
PORT_DIPSETTING( 0x0001, DEF_STR( On ))
@@ -136,27 +136,27 @@ static INPUT_PORTS_START( revx )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
- PORT_START_TAG("AN0")
+ PORT_START("AN0")
PORT_BIT( 0x00ff, 0x0080, IPT_AD_STICK_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0x00ff, 0x0080, IPT_AD_STICK_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_PLAYER(1)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 0x00ff, 0x0080, IPT_AD_STICK_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN3")
+ PORT_START("AN3")
PORT_BIT( 0x00ff, 0x0080, IPT_AD_STICK_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_PLAYER(2)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN4")
+ PORT_START("AN4")
PORT_BIT( 0x00ff, 0x0080, IPT_AD_STICK_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(3)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN5")
+ PORT_START("AN5")
PORT_BIT( 0x00ff, 0x0080, IPT_AD_STICK_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_PLAYER(3)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/midyunit.c b/src/mame/drivers/midyunit.c
index dbd26b05873..1c961c12ca7 100644
--- a/src/mame/drivers/midyunit.c
+++ b/src/mame/drivers/midyunit.c
@@ -225,7 +225,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( narc )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -243,7 +243,7 @@ static INPUT_PORTS_START( narc )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -269,23 +269,23 @@ static INPUT_PORTS_START( narc )
PORT_DIPSETTING( 0x4000, DEF_STR( German ) )
*/
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x00ff, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(narc_talkback_data_r, NULL)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("UNK0")
+ PORT_START("UNK0")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("UNK1")
+ PORT_START("UNK1")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( trog )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -299,7 +299,7 @@ static INPUT_PORTS_START( trog )
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0xe000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -317,7 +317,7 @@ static INPUT_PORTS_START( trog )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
@@ -326,7 +326,7 @@ static INPUT_PORTS_START( trog )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unused ))
PORT_DIPSETTING( 0x0001, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
@@ -372,16 +372,16 @@ static INPUT_PORTS_START( trog )
PORT_DIPSETTING( 0x4000, DEF_STR( German ) )
// PORT_DIPSETTING( 0x0000, DEF_STR( Unused ))
- PORT_START_TAG("UNK0")
+ PORT_START("UNK0")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("UNK1")
+ PORT_START("UNK1")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( smashtv )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_PLAYER(1)
@@ -399,7 +399,7 @@ static INPUT_PORTS_START( smashtv )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_PLAYER(2)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -413,10 +413,10 @@ static INPUT_PORTS_START( smashtv )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xf800, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0001, 0x0001, "1-8" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
@@ -468,16 +468,16 @@ static INPUT_PORTS_START( smashtv )
/* I cannot figure out how to enable dip coinage
Does the Rotary Joystick Dip do anything? */
- PORT_START_TAG("UNK0")
+ PORT_START("UNK0")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("UNK1")
+ PORT_START("UNK1")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( strkforc )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -495,7 +495,7 @@ static INPUT_PORTS_START( strkforc )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -508,10 +508,10 @@ static INPUT_PORTS_START( strkforc )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0xfc00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0001, 0x0001, "Coin Meter" )
PORT_DIPSETTING( 0x0001, "Shared" )
PORT_DIPSETTING( 0x0000, "Independent" )
@@ -565,16 +565,16 @@ static INPUT_PORTS_START( strkforc )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
- PORT_START_TAG("UNK0")
+ PORT_START("UNK0")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("UNK1")
+ PORT_START("UNK1")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( mkla2 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -592,7 +592,7 @@ static INPUT_PORTS_START( mkla2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -611,10 +611,10 @@ static INPUT_PORTS_START( mkla2 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1)
//There should be an additional block button for player 2, but I coudn't find it.
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0010, 0x0010, "Attract Sound" )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ))
@@ -658,16 +658,16 @@ static INPUT_PORTS_START( mkla2 )
PORT_DIPSETTING( 0x8000, "Dipswitch" )
PORT_DIPSETTING( 0x0000, "CMOS" )
- PORT_START_TAG("UNK0")
+ PORT_START("UNK0")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("UNK1")
+ PORT_START("UNK1")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( mkla4 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -685,7 +685,7 @@ static INPUT_PORTS_START( mkla4 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -704,10 +704,10 @@ static INPUT_PORTS_START( mkla4 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1)
//There should be an additional block button for player 2, but I coudn't find it.
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT( 0x0007, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0008, 0x0008, "Comic Book Offer" )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ))
@@ -754,16 +754,16 @@ static INPUT_PORTS_START( mkla4 )
PORT_DIPSETTING( 0x8000, "Dipswitch" )
PORT_DIPSETTING( 0x0000, "CMOS" )
- PORT_START_TAG("UNK0")
+ PORT_START("UNK0")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("UNK1")
+ PORT_START("UNK1")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( term2 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -773,7 +773,7 @@ static INPUT_PORTS_START( term2 )
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0xc000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -790,7 +790,7 @@ static INPUT_PORTS_START( term2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(adpcm_irq_state_r, NULL)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0007, 0x0003, "Credits" )
PORT_DIPSETTING( 0x0007, "2 Start/1 Continue" )
PORT_DIPSETTING( 0x0006, "4 Start/1 Continue" )
@@ -837,32 +837,32 @@ static INPUT_PORTS_START( term2 )
PORT_DIPSETTING( 0x4000, DEF_STR( German ) )
// PORT_DIPSETTING( 0x0000, DEF_STR( Unused ))
- PORT_START_TAG("UNK0")
+ PORT_START("UNK0")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("UNK1")
+ PORT_START("UNK1")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("STICK0_X")
+ PORT_START("STICK0_X")
PORT_BIT( 0x00ff, 0x0080, IPT_AD_STICK_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_REVERSE PORT_PLAYER(1)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("STICK0_Y")
+ PORT_START("STICK0_Y")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_PLAYER(1)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("STICK1_X")
+ PORT_START("STICK1_X")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_REVERSE PORT_PLAYER(2)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("STICK1_Y")
+ PORT_START("STICK1_Y")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_PLAYER(2)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( totcarn )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_PLAYER(1)
@@ -880,7 +880,7 @@ static INPUT_PORTS_START( totcarn )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_PLAYER(2)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -895,10 +895,10 @@ static INPUT_PORTS_START( totcarn )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(adpcm_irq_state_r, NULL)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x001f, 0x001f, DEF_STR( Coinage ))
PORT_DIPSETTING( 0x001f, "USA 1" )
PORT_DIPSETTING( 0x001e, "USA 2" )
@@ -966,10 +966,10 @@ static INPUT_PORTS_START( totcarn )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
- PORT_START_TAG("UNK0")
+ PORT_START("UNK0")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("UNK1")
+ PORT_START("UNK1")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
diff --git a/src/mame/drivers/midzeus.c b/src/mame/drivers/midzeus.c
index 71a21f2b8a1..d0a49d8a7b9 100644
--- a/src/mame/drivers/midzeus.c
+++ b/src/mame/drivers/midzeus.c
@@ -664,7 +664,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( mk4 )
- PORT_START_TAG("DIPS") /* DS1 */
+ PORT_START("DIPS") /* DS1 */
PORT_DIPNAME( 0x0001, 0x0001, "Coinage Source" )
PORT_DIPSETTING( 0x0001, "Dipswitch" )
PORT_DIPSETTING( 0x0000, "CMOS" )
@@ -718,7 +718,7 @@ static INPUT_PORTS_START( mk4 )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -735,7 +735,7 @@ static INPUT_PORTS_START( mk4 )
PORT_BIT( 0x6000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BILL1 ) /* Bill */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_8WAY
@@ -753,7 +753,7 @@ static INPUT_PORTS_START( mk4 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1)
@@ -766,7 +766,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( invasn )
- PORT_START_TAG("DIPS") /* DS1 */
+ PORT_START("DIPS") /* DS1 */
PORT_DIPNAME( 0x0001, 0x0001, "Coinage Source" )
PORT_DIPSETTING( 0x0001, "Dipswitch" )
PORT_DIPSETTING( 0x0000, "CMOS" )
@@ -823,7 +823,7 @@ static INPUT_PORTS_START( invasn )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -840,7 +840,7 @@ static INPUT_PORTS_START( invasn )
PORT_BIT( 0x6000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BILL1 ) /* Bill */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x00e0, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -848,25 +848,25 @@ static INPUT_PORTS_START( invasn )
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0xe000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("GUNX1") /* fake analog X */
+ PORT_START("GUNX1") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("GUNY1") /* fake analog Y */
+ PORT_START("GUNY1") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10)
- PORT_START_TAG("GUNX2") /* fake analog X */
+ PORT_START("GUNX2") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("GUNY2") /* fake analog Y */
+ PORT_START("GUNY2") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( crusnexo )
- PORT_START_TAG("DIPS") /* DS1 */
+ PORT_START("DIPS") /* DS1 */
PORT_DIPNAME( 0x001f, 0x001f, "Country Code" )
PORT_DIPSETTING( 0x001f, DEF_STR( USA ) )
PORT_DIPSETTING( 0x001e, "Germany" )
@@ -920,7 +920,7 @@ static INPUT_PORTS_START( crusnexo )
PORT_DIPSETTING( 0x4000, "Slave #3" )
PORT_DIPSETTING( 0x0000, "Slave #4" )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -937,7 +937,7 @@ static INPUT_PORTS_START( crusnexo )
PORT_BIT( 0x6000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BILL1 )
- PORT_START_TAG("IN1") /* Listed "names" are via the manual's "JAMMA" pinout sheet" */
+ PORT_START("IN1") /* Listed "names" are via the manual's "JAMMA" pinout sheet" */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Not Used */
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON6 ) /* Radio Switch */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Not Used */
@@ -955,11 +955,11 @@ static INPUT_PORTS_START( crusnexo )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Not Used */
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0007, IP_ACTIVE_HIGH, IPT_SPECIAL) PORT_CUSTOM( keypad_r, "KEYPAD" )
PORT_BIT( 0xfff8, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEYPAD")
+ PORT_START("KEYPAD")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3) /* keypad 3 */
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) /* keypad 1 */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3) /* keypad 2 */
@@ -973,22 +973,22 @@ static INPUT_PORTS_START( crusnexo )
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON11 ) PORT_PLAYER(3) /* keypad * */
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON10 ) PORT_PLAYER(3) /* keypad 0 */
- PORT_START_TAG("ANALOG3")
+ PORT_START("ANALOG3")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START_TAG("ANALOG2")
+ PORT_START("ANALOG2")
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START_TAG("ANALOG1")
+ PORT_START("ANALOG1")
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START_TAG("ANALOG0")
+ PORT_START("ANALOG0")
PORT_BIT( 0xff, 0x00, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( thegrid )
- PORT_START_TAG("DIPS") /* DS1 */
+ PORT_START("DIPS") /* DS1 */
PORT_DIPNAME( 0x0001, 0x0001, "Show Blood" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
@@ -1056,7 +1056,7 @@ static INPUT_PORTS_START( thegrid )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -1073,7 +1073,7 @@ static INPUT_PORTS_START( thegrid )
PORT_BIT( 0x6000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BILL1 ) /* Bill */
- PORT_START_TAG("IN1") /* Listed "names" are via the manual's "JAMMA" pinout sheet" */
+ PORT_START("IN1") /* Listed "names" are via the manual's "JAMMA" pinout sheet" */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_8WAY /* Not Used */
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_8WAY /* Not Used */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_8WAY /* Not Used */
@@ -1091,14 +1091,14 @@ static INPUT_PORTS_START( thegrid )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) /* No Connection */
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(custom_49way_r, "49WAYX\0" "49WAYY")
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("49WAYX")
+ PORT_START("49WAYX")
PORT_BIT( 0xff, 0x38, IPT_AD_STICK_X ) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START_TAG("49WAYY")
+ PORT_START("49WAYY")
PORT_BIT( 0xff, 0x38, IPT_AD_STICK_Y ) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
INPUT_PORTS_END
diff --git a/src/mame/drivers/mikie.c b/src/mame/drivers/mikie.c
index 0c674599189..db791924d47 100644
--- a/src/mame/drivers/mikie.c
+++ b/src/mame/drivers/mikie.c
@@ -101,7 +101,7 @@ ADDRESS_MAP_END
/* Input Ports */
static INPUT_PORTS_START( mikie )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -111,7 +111,7 @@ static INPUT_PORTS_START( mikie )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -121,7 +121,7 @@ static INPUT_PORTS_START( mikie )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
@@ -131,7 +131,7 @@ static INPUT_PORTS_START( mikie )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -140,7 +140,7 @@ static INPUT_PORTS_START( mikie )
PORT_DIPSETTING( 0x02, DEF_STR( Dual ) )
PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -176,7 +176,7 @@ static INPUT_PORTS_START( mikie )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
diff --git a/src/mame/drivers/minivadr.c b/src/mame/drivers/minivadr.c
index d2599c41609..c49f3749212 100644
--- a/src/mame/drivers/minivadr.c
+++ b/src/mame/drivers/minivadr.c
@@ -55,7 +55,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( minivadr )
- PORT_START
+ PORT_START("INPUTS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c
index b0973e33eab..9696b31671c 100644
--- a/src/mame/drivers/mirage.c
+++ b/src/mame/drivers/mirage.c
@@ -206,7 +206,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mirage )
- PORT_START_TAG("SYSTEM_IN")
+ PORT_START("SYSTEM_IN")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) )
@@ -248,7 +248,7 @@ static INPUT_PORTS_START( mirage )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("MIRAGE0")
+ PORT_START("MIRAGE0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE1 ) /* Inputs start here???? */
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c
index 566045c9145..cbf39f3db45 100644
--- a/src/mame/drivers/missb2.c
+++ b/src/mame/drivers/missb2.c
@@ -193,7 +193,7 @@ ADDRESS_MAP_END
/* Input Ports */
static INPUT_PORTS_START( missb2 )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Language ) )
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
PORT_DIPSETTING( 0x01, DEF_STR( Japanese ) )
@@ -215,7 +215,7 @@ static INPUT_PORTS_START( missb2 )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Medium ) )
@@ -237,7 +237,7 @@ static INPUT_PORTS_START( missb2 )
PORT_DIPSETTING( 0x80, DEF_STR( High ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Very_High ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -247,7 +247,7 @@ static INPUT_PORTS_START( missb2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT ) // ???
diff --git a/src/mame/drivers/missile.c b/src/mame/drivers/missile.c
index 2224a6615c6..74ab7d2173c 100644
--- a/src/mame/drivers/missile.c
+++ b/src/mame/drivers/missile.c
@@ -789,7 +789,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( missile )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -799,7 +799,7 @@ static INPUT_PORTS_START( missile )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN3 )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -808,7 +808,7 @@ static INPUT_PORTS_START( missile )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(get_vblank, 0)
- PORT_START_TAG("R10") /* IN2 */
+ PORT_START("R10") /* IN2 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("R10:1,2")
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -831,7 +831,7 @@ static INPUT_PORTS_START( missile )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("R8") /* IN3 */
+ PORT_START("R8") /* IN3 */
PORT_DIPNAME( 0x03, 0x00, "Cities" ) PORT_DIPLOCATION("R8:1,2")
PORT_DIPSETTING( 0x02, "4" )
PORT_DIPSETTING( 0x01, "5" )
@@ -856,22 +856,22 @@ static INPUT_PORTS_START( missile )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("TRACK0_X") /* FAKE */
+ PORT_START("TRACK0_X") /* FAKE */
PORT_BIT( 0x0f, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10)
- PORT_START_TAG("TRACK0_Y") /* FAKE */
+ PORT_START("TRACK0_Y") /* FAKE */
PORT_BIT( 0x0f, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_REVERSE
- PORT_START_TAG("TRACK1_X") /* FAKE */
+ PORT_START("TRACK1_X") /* FAKE */
PORT_BIT( 0x0f, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_REVERSE PORT_COCKTAIL
- PORT_START_TAG("TRACK1_Y") /* FAKE */
+ PORT_START("TRACK1_Y") /* FAKE */
PORT_BIT( 0x0f, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_REVERSE PORT_COCKTAIL
INPUT_PORTS_END
static INPUT_PORTS_START( suprmatk )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -881,7 +881,7 @@ static INPUT_PORTS_START( suprmatk )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN3 )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -890,7 +890,7 @@ static INPUT_PORTS_START( suprmatk )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(get_vblank, 0)
- PORT_START_TAG("R10") /* IN2 */
+ PORT_START("R10") /* IN2 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("R10:1,2")
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -913,7 +913,7 @@ static INPUT_PORTS_START( suprmatk )
PORT_DIPSETTING( 0x80, "Reg. Super Missile Attack" )
PORT_DIPSETTING( 0xc0, "Hard Super Missile Attack" )
- PORT_START_TAG("R8") /* IN3 */
+ PORT_START("R8") /* IN3 */
PORT_DIPNAME( 0x03, 0x00, "Cities" ) PORT_DIPLOCATION("R8:1,2")
PORT_DIPSETTING( 0x02, "4" )
PORT_DIPSETTING( 0x01, "5" )
@@ -938,16 +938,16 @@ static INPUT_PORTS_START( suprmatk )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("TRACK0_X") /* FAKE */
+ PORT_START("TRACK0_X") /* FAKE */
PORT_BIT( 0x0f, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10)
- PORT_START_TAG("TRACK0_Y") /* FAKE */
+ PORT_START("TRACK0_Y") /* FAKE */
PORT_BIT( 0x0f, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_REVERSE
- PORT_START_TAG("TRACK1_X") /* FAKE */
+ PORT_START("TRACK1_X") /* FAKE */
PORT_BIT( 0x0f, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_REVERSE PORT_COCKTAIL
- PORT_START_TAG("TRACK1_Y") /* FAKE */
+ PORT_START("TRACK1_Y") /* FAKE */
PORT_BIT( 0x0f, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_REVERSE PORT_COCKTAIL
INPUT_PORTS_END
diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c
index d062ef800ea..ace8d36bfd2 100644
--- a/src/mame/drivers/mitchell.c
+++ b/src/mame/drivers/mitchell.c
@@ -511,7 +511,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mj_common )
- PORT_START_TAG("DSW0") /* DSW */
+ PORT_START("DSW0") /* DSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* USED - handled in port5_r */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */
@@ -519,7 +519,7 @@ static INPUT_PORTS_START( mj_common )
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* data from EEPROM */
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -529,7 +529,7 @@ static INPUT_PORTS_START( mj_common )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("KEY0") /* IN1 */
+ PORT_START("KEY0") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -539,7 +539,7 @@ static INPUT_PORTS_START( mj_common )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_A )
- PORT_START_TAG("KEY1") /* IN1 */
+ PORT_START("KEY1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -549,7 +549,7 @@ static INPUT_PORTS_START( mj_common )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_B )
- PORT_START_TAG("KEY2") /* IN1 */
+ PORT_START("KEY2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -559,7 +559,7 @@ static INPUT_PORTS_START( mj_common )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_C )
- PORT_START_TAG("KEY3") /* IN1 */
+ PORT_START("KEY3") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -569,7 +569,7 @@ static INPUT_PORTS_START( mj_common )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_D )
- PORT_START_TAG("KEY4") /* IN1 */
+ PORT_START("KEY4") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -579,7 +579,7 @@ static INPUT_PORTS_START( mj_common )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY5") /* IN2 */
+ PORT_START("KEY5") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
@@ -589,7 +589,7 @@ static INPUT_PORTS_START( mj_common )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_PLAYER(2)
- PORT_START_TAG("KEY6") /* IN2 */
+ PORT_START("KEY6") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -599,7 +599,7 @@ static INPUT_PORTS_START( mj_common )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_PLAYER(2)
- PORT_START_TAG("KEY7") /* IN2 */
+ PORT_START("KEY7") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -609,7 +609,7 @@ static INPUT_PORTS_START( mj_common )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_PLAYER(2)
- PORT_START_TAG("KEY8") /* IN2 */
+ PORT_START("KEY8") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -619,7 +619,7 @@ static INPUT_PORTS_START( mj_common )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_PLAYER(2)
- PORT_START_TAG("KEY9") /* IN2 */
+ PORT_START("KEY9") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -633,7 +633,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mgakuen )
PORT_INCLUDE( mj_common )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
@@ -657,7 +657,7 @@ static INPUT_PORTS_START( mgakuen )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW2") /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x03, 0x03, "Player 1 Skill" )
PORT_DIPSETTING( 0x03, "Weak" )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -760,7 +760,7 @@ static INPUT_PORTS_START( pkladies )
INPUT_PORTS_END
static INPUT_PORTS_START( pang )
- PORT_START_TAG("DSW0") /* DSW */
+ PORT_START("DSW0") /* DSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* USED - handled in port5_r */
PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */
@@ -768,7 +768,7 @@ static INPUT_PORTS_START( pang )
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* data from EEPROM */
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
@@ -778,7 +778,7 @@ static INPUT_PORTS_START( pang )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -788,7 +788,7 @@ static INPUT_PORTS_START( pang )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
@@ -808,7 +808,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mstworld )
/* this port may not have the same role */
- PORT_START_TAG("DSW0") /* DSW */
+ PORT_START("DSW0") /* DSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* USED - handled in port5_r */
PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */
@@ -816,7 +816,7 @@ static INPUT_PORTS_START( mstworld )
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* data from EEPROM (spang) */
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
@@ -826,7 +826,7 @@ static INPUT_PORTS_START( mstworld )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) // don't think this one matters..
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -836,7 +836,7 @@ static INPUT_PORTS_START( mstworld )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // if not active high gfx aren't copied for game screen?! .. is this instead of a bit in port 5?
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
@@ -846,7 +846,7 @@ static INPUT_PORTS_START( mstworld )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("DSW1") /* coinage seems to be in here.. */
+ PORT_START("DSW1") /* coinage seems to be in here.. */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, "A 1Coin 4Credits / B 1Coin 4Credits" )
PORT_DIPSETTING( 0x02, "A 1Coin 3Credits / B 1Coin 3Credits" )
@@ -870,7 +870,7 @@ static INPUT_PORTS_START( mstworld )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, "ds2" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -896,7 +896,7 @@ static INPUT_PORTS_START( mstworld )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x00, "ds3" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -924,7 +924,7 @@ static INPUT_PORTS_START( mstworld )
INPUT_PORTS_END
static INPUT_PORTS_START( qtono1 )
- PORT_START_TAG("DSW0") /* DSW */
+ PORT_START("DSW0") /* DSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* USED - handled in port5_r */
PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */
@@ -932,7 +932,7 @@ static INPUT_PORTS_START( qtono1 )
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* data from EEPROM */
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) /* same as the service mode farther down */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -942,7 +942,7 @@ static INPUT_PORTS_START( qtono1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -952,7 +952,7 @@ static INPUT_PORTS_START( qtono1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
@@ -964,7 +964,7 @@ static INPUT_PORTS_START( qtono1 )
INPUT_PORTS_END
static INPUT_PORTS_START( block )
- PORT_START_TAG("DSW0") /* DSW */
+ PORT_START("DSW0") /* DSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* USED - handled in port5_r */
PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */
@@ -972,7 +972,7 @@ static INPUT_PORTS_START( block )
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* data from EEPROM */
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
@@ -982,7 +982,7 @@ static INPUT_PORTS_START( block )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -990,7 +990,7 @@ static INPUT_PORTS_START( block )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -998,15 +998,15 @@ static INPUT_PORTS_START( block )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START_TAG("DIAL1") /* DIAL1 */
+ PORT_START("DIAL1") /* DIAL1 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(20)
- PORT_START_TAG("DIAL2") /* DIAL2 */
+ PORT_START("DIAL2") /* DIAL2 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(20) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( blockjoy )
- PORT_START_TAG("DSW0") /* DSW */
+ PORT_START("DSW0") /* DSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* USED - handled in port5_r */
PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */
@@ -1014,7 +1014,7 @@ static INPUT_PORTS_START( blockjoy )
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* data from EEPROM */
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
@@ -1024,7 +1024,7 @@ static INPUT_PORTS_START( blockjoy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1034,7 +1034,7 @@ static INPUT_PORTS_START( blockjoy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c
index 78581f591d2..ec4314a0cd3 100644
--- a/src/mame/drivers/mjkjidai.c
+++ b/src/mame/drivers/mjkjidai.c
@@ -194,7 +194,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mjkjidai )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -218,7 +218,7 @@ static INPUT_PORTS_START( mjkjidai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -244,7 +244,7 @@ static INPUT_PORTS_START( mjkjidai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
@@ -256,56 +256,56 @@ static INPUT_PORTS_START( mjkjidai )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4 )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_TILT ) // reinitialize NVRAM and reset the game
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
/* player 2 inputs (same as player 1) */
- PORT_START_TAG("KEY0")
+ PORT_START("KEY0")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY4")
+ PORT_START("KEY4")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY5")
+ PORT_START("KEY5")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY6")
+ PORT_START("KEY6")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x3e, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY7")
+ PORT_START("KEY7")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
PORT_BIT( 0x38, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY8")
+ PORT_START("KEY8")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_M )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_N )
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY9")
+ PORT_START("KEY9")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_I )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_J )
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_L )
PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY10")
+ PORT_START("KEY10")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY11")
+ PORT_START("KEY11")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_C )
diff --git a/src/mame/drivers/mjsister.c b/src/mame/drivers/mjsister.c
index 3b09c400e01..13251908dea 100644
--- a/src/mame/drivers/mjsister.c
+++ b/src/mame/drivers/mjsister.c
@@ -186,7 +186,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mjsister )
- PORT_START_TAG("DSW1") /* DSW1 (0) */
+ PORT_START("DSW1") /* DSW1 (0) */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
@@ -210,7 +210,7 @@ static INPUT_PORTS_START( mjsister )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* DSW2 (1) */
+ PORT_START("DSW2") /* DSW2 (1) */
PORT_DIPNAME( 0x01, 0x01, "Unknown 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -236,7 +236,7 @@ static INPUT_PORTS_START( mjsister )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0") /* (2) */
+ PORT_START("IN0") /* (2) */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* memory reset 1 */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* analyzer */
@@ -246,7 +246,7 @@ static INPUT_PORTS_START( mjsister )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* hopper */
- PORT_START_TAG("KEY0") /* (3) PORT 1-0 */
+ PORT_START("KEY0") /* (3) PORT 1-0 */
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_A )
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_B )
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_C )
@@ -254,7 +254,7 @@ static INPUT_PORTS_START( mjsister )
PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_MAHJONG_LAST_CHANCE )
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("KEY1") /* (4) PORT 1-1 */
+ PORT_START("KEY1") /* (4) PORT 1-1 */
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_E )
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_F )
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_G )
@@ -262,7 +262,7 @@ static INPUT_PORTS_START( mjsister )
PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_MAHJONG_SCORE )
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("KEY2") /* (5) PORT 1-2 */
+ PORT_START("KEY2") /* (5) PORT 1-2 */
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_I )
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_J )
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_K )
@@ -270,7 +270,7 @@ static INPUT_PORTS_START( mjsister )
PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_MAHJONG_DOUBLE_UP )
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("KEY3") /* (6) PORT 1-3 */
+ PORT_START("KEY3") /* (6) PORT 1-3 */
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_M )
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_N )
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_CHI )
@@ -278,7 +278,7 @@ static INPUT_PORTS_START( mjsister )
PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_MAHJONG_FLIP_FLOP )
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("KEY4") /* (7) PORT 1-4 */
+ PORT_START("KEY4") /* (7) PORT 1-4 */
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_KAN )
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_REACH )
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_RON )
@@ -286,7 +286,7 @@ static INPUT_PORTS_START( mjsister )
PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_MAHJONG_BIG )
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("KEY5") /* (8) PORT 1-5 */
+ PORT_START("KEY5") /* (8) PORT 1-5 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_BET )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c
index 064a83422ee..bd01231b205 100644
--- a/src/mame/drivers/mlanding.c
+++ b/src/mame/drivers/mlanding.c
@@ -287,18 +287,15 @@ static VIDEO_UPDATE(mlanding)
static INPUT_PORTS_START( mlanding )
-
-PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE ) //service coin?
-PORT_START_TAG("IN1")
-
-
+ PORT_START("IN1")
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_COIN2 )
-PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -308,7 +305,7 @@ PORT_START_TAG("IN2")
PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_PLAYER(1)
-PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_START2 )
@@ -325,15 +322,14 @@ PORT_START_TAG("IN3")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* Stick 1 (3) */
+ PORT_START("STICX") /* Stick 1 (3) */
PORT_BIT( 0xffff, 0x0000, IPT_AD_STICK_X ) PORT_MINMAX(0xffd8,0x28) PORT_SENSITIVITY(30) PORT_KEYDELTA(1) PORT_PLAYER(1)
- PORT_START /* Stick 2 (4) */
+ PORT_START("STICKY") /* Stick 2 (4) */
PORT_BIT( 0xffff, 0x0000, IPT_AD_STICK_Y ) PORT_MINMAX(0xffd8,0x28) PORT_SENSITIVITY(30) PORT_KEYDELTA(1) PORT_PLAYER(1)
- PORT_START /* Stick 3 (5) */
+ PORT_START("STICKZ") /* Stick 3 (5) */
PORT_BIT( 0xffff, 0x0000, IPT_AD_STICK_Z ) PORT_MINMAX(0xffc4,0x3c) PORT_SENSITIVITY(30) PORT_KEYDELTA(1) PORT_PLAYER(1)
-
INPUT_PORTS_END
static void irq_handler(running_machine *machine, int irq)
diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c
index 57a202b8cfa..d520f40f196 100644
--- a/src/mame/drivers/model1.c
+++ b/src/mame/drivers/model1.c
@@ -1054,16 +1054,16 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( vf )
- PORT_START_TAG("AN0") /* Unused analog port 0 */
- PORT_START_TAG("AN1") /* Unused analog port 1 */
- PORT_START_TAG("AN2") /* Unused analog port 2 */
- PORT_START_TAG("AN3") /* Unused analog port 3 */
- PORT_START_TAG("AN4") /* Unused analog port 4 */
- PORT_START_TAG("AN5") /* Unused analog port 5 */
- PORT_START_TAG("AN6") /* Unused analog port 6 */
- PORT_START_TAG("AN7") /* Unused analog port 7 */
-
- PORT_START_TAG("IN0")
+ PORT_START("AN0") /* Unused analog port 0 */
+ PORT_START("AN1") /* Unused analog port 1 */
+ PORT_START("AN2") /* Unused analog port 2 */
+ PORT_START("AN3") /* Unused analog port 3 */
+ PORT_START("AN4") /* Unused analog port 4 */
+ PORT_START("AN5") /* Unused analog port 5 */
+ PORT_START("AN6") /* Unused analog port 6 */
+ PORT_START("AN7") /* Unused analog port 7 */
+
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW)
@@ -1073,7 +1073,7 @@ static INPUT_PORTS_START( vf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -1083,7 +1083,7 @@ static INPUT_PORTS_START( vf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
@@ -1095,22 +1095,22 @@ static INPUT_PORTS_START( vf )
INPUT_PORTS_END
static INPUT_PORTS_START( vr )
- PORT_START_TAG("AN0") /* Steering */
+ PORT_START("AN0") /* Steering */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(100) PORT_KEYDELTA(3)
- PORT_START_TAG("AN1") /* Accel / Decel */
+ PORT_START("AN1") /* Accel / Decel */
PORT_BIT( 0xff, 0x30, IPT_PEDAL ) PORT_MINMAX(1,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
- PORT_START_TAG("AN2") /* Brake */
+ PORT_START("AN2") /* Brake */
PORT_BIT( 0xff, 0x30, IPT_PEDAL ) PORT_MINMAX(1,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(16) PORT_PLAYER(2)
- PORT_START_TAG("AN3") /* Unused analog port 3 */
- PORT_START_TAG("AN4") /* Unused analog port 4 */
- PORT_START_TAG("AN5") /* Unused analog port 5 */
- PORT_START_TAG("AN6") /* Unused analog port 6 */
- PORT_START_TAG("AN7") /* Unused analog port 7 */
+ PORT_START("AN3") /* Unused analog port 3 */
+ PORT_START("AN4") /* Unused analog port 4 */
+ PORT_START("AN5") /* Unused analog port 5 */
+ PORT_START("AN6") /* Unused analog port 6 */
+ PORT_START("AN7") /* Unused analog port 7 */
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW)
@@ -1120,7 +1120,7 @@ static INPUT_PORTS_START( vr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1130,27 +1130,27 @@ static INPUT_PORTS_START( vr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( wingwar )
- PORT_START_TAG("AN0") /* X */
+ PORT_START("AN0") /* X */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(4)
- PORT_START_TAG("AN1") /* Y */
+ PORT_START("AN1") /* Y */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(4) PORT_REVERSE
- PORT_START_TAG("AN2") /* Throttle */
+ PORT_START("AN2") /* Throttle */
PORT_BIT( 0xff, 0x01, IPT_PEDAL ) PORT_MINMAX(1,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
- PORT_START_TAG("AN3") /* Unused analog port 3 */
- PORT_START_TAG("AN4") /* Unused analog port 4 */
- PORT_START_TAG("AN5") /* Unused analog port 5 */
- PORT_START_TAG("AN6") /* Unused analog port 6 */
- PORT_START_TAG("AN7") /* Unused analog port 7 */
+ PORT_START("AN3") /* Unused analog port 3 */
+ PORT_START("AN4") /* Unused analog port 4 */
+ PORT_START("AN5") /* Unused analog port 5 */
+ PORT_START("AN6") /* Unused analog port 6 */
+ PORT_START("AN7") /* Unused analog port 7 */
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW)
@@ -1160,7 +1160,7 @@ static INPUT_PORTS_START( wingwar )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1170,32 +1170,32 @@ static INPUT_PORTS_START( wingwar )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( swa )
- PORT_START_TAG("AN0") /* X */
+ PORT_START("AN0") /* X */
PORT_BIT( 0xff, 127, IPT_AD_STICK_X ) PORT_MINMAX(27,227) PORT_SENSITIVITY(100) PORT_KEYDELTA(4) PORT_REVERSE
- PORT_START_TAG("AN1") /* Y */
+ PORT_START("AN1") /* Y */
PORT_BIT( 0xff, 127, IPT_AD_STICK_Y ) PORT_MINMAX(27,227) PORT_SENSITIVITY(100) PORT_KEYDELTA(4) PORT_REVERSE
- PORT_START_TAG("AN2") /* Throttle */
+ PORT_START("AN2") /* Throttle */
PORT_BIT( 0xff, 228, IPT_PEDAL ) PORT_MINMAX(28,228) PORT_SENSITIVITY(100) PORT_KEYDELTA(16) PORT_REVERSE
- PORT_START_TAG("AN3") /* Unused analog port 3 */
+ PORT_START("AN3") /* Unused analog port 3 */
- PORT_START_TAG("AN4") /* X */
+ PORT_START("AN4") /* X */
PORT_BIT( 0xff, 127, IPT_AD_STICK_X ) PORT_MINMAX(27,227) PORT_SENSITIVITY(100) PORT_KEYDELTA(4) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("AN5") /* Y */
+ PORT_START("AN5") /* Y */
PORT_BIT( 0xff, 127, IPT_AD_STICK_Y ) PORT_MINMAX(27,227) PORT_SENSITIVITY(100) PORT_KEYDELTA(4) PORT_PLAYER(2)
- PORT_START_TAG("AN6") /* Unused analog port 6 */
- PORT_START_TAG("AN7") /* Unused analog port 7 */
+ PORT_START("AN6") /* Unused analog port 6 */
+ PORT_START("AN7") /* Unused analog port 7 */
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW)
@@ -1204,7 +1204,7 @@ static INPUT_PORTS_START( swa )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
@@ -1212,7 +1212,7 @@ static INPUT_PORTS_START( swa )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c
index 2823f676f13..28fd24508dd 100644
--- a/src/mame/drivers/model2.c
+++ b/src/mame/drivers/model2.c
@@ -1434,7 +1434,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(_n_)
static INPUT_PORTS_START( model2 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
@@ -1444,15 +1444,15 @@ static INPUT_PORTS_START( model2 )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("1P Push Switch") PORT_CODE(KEYCODE_7)
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("2P Push Switch") PORT_CODE(KEYCODE_8)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
MODEL2_PLAYER_INPUTS(1, BUTTON1, BUTTON2, BUTTON3, BUTTON4)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
MODEL2_PLAYER_INPUTS(2, BUTTON1, BUTTON2, BUTTON3, BUTTON4)
INPUT_PORTS_END
static INPUT_PORTS_START( desert )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
@@ -1462,28 +1462,28 @@ static INPUT_PORTS_START( desert )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) // VR 2 (Green)
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) // VR 3 (Red)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) // shift
PORT_BIT( 0x0e, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) // machine gun
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) // cannon
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
MODEL2_PLAYER_INPUTS(2, BUTTON1, BUTTON2, BUTTON3, BUTTON4)
- PORT_START_TAG("STEER") // steer
+ PORT_START("STEER") // steer
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("ACCEL") // accel
+ PORT_START("ACCEL") // accel
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("BRAKE") // brake
+ PORT_START("BRAKE") // brake
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
INPUT_PORTS_END
static INPUT_PORTS_START( daytona )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
@@ -1493,7 +1493,7 @@ static INPUT_PORTS_START( daytona )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) // VR 2 (Blue)
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) // VR 3 (Yellow)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_PLAYER(1) // VR 4 (Green)
PORT_BIT(0x0e, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) // shift 3
@@ -1501,21 +1501,21 @@ static INPUT_PORTS_START( daytona )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
MODEL2_PLAYER_INPUTS(2, BUTTON1, BUTTON2, BUTTON3, BUTTON4)
- PORT_START_TAG("STEER") // steer
+ PORT_START("STEER") // steer
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("ACCEL") // accel
+ PORT_START("ACCEL") // accel
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("BREAK") // brake
+ PORT_START("BREAK") // brake
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
INPUT_PORTS_END
static INPUT_PORTS_START( srallyc)
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
@@ -1524,25 +1524,25 @@ static INPUT_PORTS_START( srallyc)
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT(0x90, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT(0xFF, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT(0xFF, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("ANA0") // steer
+ PORT_START("ANA0") // steer
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("ANA1") // accel
+ PORT_START("ANA1") // accel
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("ANA2") // brake
+ PORT_START("ANA2") // brake
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
INPUT_PORTS_END
static INPUT_PORTS_START( bel )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1552,10 +1552,10 @@ static INPUT_PORTS_START( bel )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("1P Push Switch") PORT_CODE(KEYCODE_7)
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("2P Push Switch") PORT_CODE(KEYCODE_8)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
MODEL2_PLAYER_INPUTS(1, BUTTON1, BUTTON2, BUTTON3, BUTTON4)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
MODEL2_PLAYER_INPUTS(2, BUTTON1, BUTTON2, BUTTON3, BUTTON4)
INPUT_PORTS_END
diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c
index 4b7444945ad..0d92c54e813 100644
--- a/src/mame/drivers/model3.c
+++ b/src/mame/drivers/model3.c
@@ -1533,7 +1533,7 @@ static ADDRESS_MAP_START( model3_mem, ADDRESS_SPACE_PROGRAM, 64)
ADDRESS_MAP_END
#define MODEL3_SYSTEM_CONTROLS_1 \
-PORT_START_TAG("IN0") \
+PORT_START("IN0") \
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) \
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) \
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW ) /* Test Button A */ \
@@ -1543,7 +1543,7 @@ PORT_START_TAG("IN0") \
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN )
#define MODEL3_SYSTEM_CONTROLS_2 \
-PORT_START_TAG("IN1") \
+PORT_START("IN1") \
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service Button B") PORT_CODE(KEYCODE_8) \
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Test Button B") PORT_CODE(KEYCODE_7) \
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1553,7 +1553,7 @@ static INPUT_PORTS_START( model3 )
MODEL3_SYSTEM_CONTROLS_1
MODEL3_SYSTEM_CONTROLS_2
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -1563,10 +1563,10 @@ static INPUT_PORTS_START( model3 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) /* Dip switches */
INPUT_PORTS_END
@@ -1574,29 +1574,29 @@ static INPUT_PORTS_START( lostwsga )
MODEL3_SYSTEM_CONTROLS_1
MODEL3_SYSTEM_CONTROLS_2
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) /* Dip switches */
- PORT_START_TAG("LIGHT0_X") // lightgun X-axis
+ PORT_START("LIGHT0_X") // lightgun X-axis
PORT_BIT( 0x3ff, 0x200, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX(0x00,0x3ff) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("LIGHT0_Y") // lightgun Y-axis
+ PORT_START("LIGHT0_Y") // lightgun Y-axis
PORT_BIT( 0x3ff, 0x200, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_MINMAX(0x00,0x3ff) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("LIGHT1_X") // lightgun X-axis
+ PORT_START("LIGHT1_X") // lightgun X-axis
PORT_BIT( 0x3ff, 0x200, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX(0x00,0x3ff) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("LIGHT1_Y") // lightgun Y-axis
+ PORT_START("LIGHT1_Y") // lightgun Y-axis
PORT_BIT( 0x3ff, 0x200, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_MINMAX(0x00,0x3ff) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("OFFSCREEN") // fake button to shoot offscreen
+ PORT_START("OFFSCREEN") // fake button to shoot offscreen
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1)
INPUT_PORTS_END
@@ -1604,7 +1604,7 @@ static INPUT_PORTS_START( scud )
MODEL3_SYSTEM_CONTROLS_1
MODEL3_SYSTEM_CONTROLS_2
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) /* View Button 1 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* View Button 2 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) /* View Button 3 */
@@ -1614,19 +1614,19 @@ static INPUT_PORTS_START( scud )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON7 ) /* Shift 3 */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON8 ) /* Shift 4 */
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) /* Dip switches */
- PORT_START_TAG("AN0") // steering
+ PORT_START("AN0") // steering
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN1") // accelerator
+ PORT_START("AN1") // accelerator
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN2") // brake
+ PORT_START("AN2") // brake
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
INPUT_PORTS_END
@@ -1634,33 +1634,33 @@ static INPUT_PORTS_START( bass )
MODEL3_SYSTEM_CONTROLS_1
MODEL3_SYSTEM_CONTROLS_2
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) /* Cast */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) /* Select */
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) /* Dip switches */
- PORT_START_TAG("AN0") /* Rod Y */
+ PORT_START("AN0") /* Rod Y */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN1") /* Rod X */
+ PORT_START("AN1") /* Rod X */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN3") /* Reel */
+ PORT_START("AN3") /* Reel */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN4") /* Stick Y */
+ PORT_START("AN4") /* Stick Y */
PORT_BIT( 0xff, 0x80, IPT_PADDLE_V ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN5") /* Stick X */
+ PORT_START("AN5") /* Stick X */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
INPUT_PORTS_END
@@ -1668,29 +1668,29 @@ static INPUT_PORTS_START( harley )
MODEL3_SYSTEM_CONTROLS_1
MODEL3_SYSTEM_CONTROLS_2
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) /* View Button 1 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* View Button 2 */
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON3 ) /* Shift down */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON4 ) /* Shift up */
PORT_BIT( 0xcc, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) /* Dip switches */
- PORT_START_TAG("AN0") // steering
+ PORT_START("AN0") // steering
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN1") // accelerator
+ PORT_START("AN1") // accelerator
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN2") // front brake
+ PORT_START("AN2") // front brake
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN3") // back brake
+ PORT_START("AN3") // back brake
PORT_BIT( 0xff, 0x00, IPT_PEDAL3 ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
INPUT_PORTS_END
@@ -1698,7 +1698,7 @@ static INPUT_PORTS_START( daytona2 )
MODEL3_SYSTEM_CONTROLS_1
MODEL3_SYSTEM_CONTROLS_2
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) /* View Button 1 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* View Button 2 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) /* View Button 3 */
@@ -1708,19 +1708,19 @@ static INPUT_PORTS_START( daytona2 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON7 ) /* Shift 3 */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON8 ) /* Shift 4 */
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) /* Dip switches */
- PORT_START // steering
+ PORT_START("AN0") // steering
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START // accelerator
+ PORT_START("AN1") // accelerator
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START // brake
+ PORT_START("AN2") // brake
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
INPUT_PORTS_END
@@ -1728,21 +1728,21 @@ static INPUT_PORTS_START( swtrilgy )
MODEL3_SYSTEM_CONTROLS_1
MODEL3_SYSTEM_CONTROLS_2
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0xde, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) /* Dip switches */
- PORT_START_TAG("AN0") /* Analog Stick Y */
+ PORT_START("AN0") /* Analog Stick Y */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_PLAYER(1)
- PORT_START_TAG("AN1") /* Analog Stick X */
+ PORT_START("AN1") /* Analog Stick X */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_PLAYER(1)
INPUT_PORTS_END
@@ -1751,30 +1751,30 @@ static INPUT_PORTS_START( eca )
MODEL3_SYSTEM_CONTROLS_1
MODEL3_SYSTEM_CONTROLS_2
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) /* View Change */
PORT_BIT( 0x0e, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* Shift Up */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) /* Shift Down */
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) /* Dip switches */
- PORT_START_TAG("AN0") // steering
+ PORT_START("AN0") // steering
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN1") // accelerator
+ PORT_START("AN1") // accelerator
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN2") // brake
+ PORT_START("AN2") // brake
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
INPUT_PORTS_END
static INPUT_PORTS_START( skichamp )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW ) /* Test Button A */
@@ -1784,25 +1784,25 @@ static INPUT_PORTS_START( skichamp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 ) /* Select 1 */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) /* Select 2 */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service Button B") PORT_CODE(KEYCODE_8)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Test Button B") PORT_CODE(KEYCODE_7)
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) /* Pole Right */
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Foot sensor */
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) /* Dip switches */
- PORT_START_TAG("AN0") // inclining
+ PORT_START("AN0") // inclining
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN1") // swing
+ PORT_START("AN1") // swing
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
INPUT_PORTS_END
diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c
index 54a0bde270f..8dcff2032cf 100644
--- a/src/mame/drivers/mogura.c
+++ b/src/mame/drivers/mogura.c
@@ -138,7 +138,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mogura )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -148,7 +148,7 @@ static INPUT_PORTS_START( mogura )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE4 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -158,7 +158,7 @@ static INPUT_PORTS_START( mogura )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -168,7 +168,7 @@ static INPUT_PORTS_START( mogura )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
@@ -178,7 +178,7 @@ static INPUT_PORTS_START( mogura )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
@@ -188,7 +188,7 @@ static INPUT_PORTS_START( mogura )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3) PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4 )
- PORT_START_TAG("IN5")
+ PORT_START("IN5")
PORT_SERVICE_NO_TOGGLE( 0x01, IP_ACTIVE_LOW)
PORT_BIT ( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/mole.c b/src/mame/drivers/mole.c
index a1ba6abd578..d3ff93c4fad 100644
--- a/src/mame/drivers/mole.c
+++ b/src/mame/drivers/mole.c
@@ -123,7 +123,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mole )
- PORT_START // 0x8d00
+ PORT_START("DSW") // 0x8d00
PORT_DIPNAME( 0x01, 0x00, "Round Points" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -142,7 +142,7 @@ static INPUT_PORTS_START( mole )
PORT_DIPSETTING( 0x30, "D" )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START // 0x8d40
+ PORT_START("IN0") // 0x8d40
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 )
@@ -152,7 +152,7 @@ static INPUT_PORTS_START( mole )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON7 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON8 )
- PORT_START // 0x8d80
+ PORT_START("IN1") // 0x8d80
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON9 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -164,7 +164,7 @@ static INPUT_PORTS_START( mole )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START // 0x8dc0
+ PORT_START("IN2") // 0x8dc0
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON8 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON7 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_COCKTAIL
diff --git a/src/mame/drivers/momoko.c b/src/mame/drivers/momoko.c
index ba283385537..a6dfa41a98b 100644
--- a/src/mame/drivers/momoko.c
+++ b/src/mame/drivers/momoko.c
@@ -113,7 +113,7 @@ ADDRESS_MAP_END
/****************************************************************************/
static INPUT_PORTS_START( momoko )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -123,7 +123,7 @@ static INPUT_PORTS_START( momoko )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -133,7 +133,7 @@ static INPUT_PORTS_START( momoko )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -155,7 +155,7 @@ static INPUT_PORTS_START( momoko )
PORT_DIPSETTING( 0x00, "Very difficult" )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Bonus_Life) )
PORT_DIPSETTING( 0x01, "20000" )
PORT_DIPSETTING( 0x03, "30000" )
@@ -180,7 +180,7 @@ static INPUT_PORTS_START( momoko )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("FAKE")
+ PORT_START("FAKE")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c
index 43ef6f76276..3211945ea47 100644
--- a/src/mame/drivers/moo.c
+++ b/src/mame/drivers/moo.c
@@ -469,7 +469,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( moo )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -479,7 +479,7 @@ static INPUT_PORTS_START( moo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE4 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM ready (always 1) */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -495,7 +495,7 @@ static INPUT_PORTS_START( moo )
PORT_DIPSETTING( 0x40, "3")
PORT_DIPSETTING( 0x80, "4")
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -505,7 +505,7 @@ static INPUT_PORTS_START( moo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -515,7 +515,7 @@ static INPUT_PORTS_START( moo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
@@ -525,7 +525,7 @@ static INPUT_PORTS_START( moo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START_TAG("P4")
+ PORT_START("P4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
diff --git a/src/mame/drivers/mosaic.c b/src/mame/drivers/mosaic.c
index 51da00b66cd..0ac2655ad06 100644
--- a/src/mame/drivers/mosaic.c
+++ b/src/mame/drivers/mosaic.c
@@ -165,7 +165,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mosaic )
- PORT_START /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -175,7 +175,7 @@ static INPUT_PORTS_START( mosaic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -185,7 +185,7 @@ static INPUT_PORTS_START( mosaic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START /* DSW1 */
+ PORT_START("DSW") /* DSW1 */
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x40, 0x00, "Bombs" )
PORT_DIPSETTING( 0x00, "3" )
@@ -210,7 +210,7 @@ static INPUT_PORTS_START( mosaic )
INPUT_PORTS_END
static INPUT_PORTS_START( gfire2 )
- PORT_START /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -220,7 +220,7 @@ static INPUT_PORTS_START( gfire2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -230,7 +230,7 @@ static INPUT_PORTS_START( gfire2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* DSW1 */
+ PORT_START("DSW") /* DSW1 */
PORT_DIPNAME( 0x80, 0x00, DEF_STR( Language ) )
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
PORT_DIPSETTING( 0x80, "Korean" )
diff --git a/src/mame/drivers/mouser.c b/src/mame/drivers/mouser.c
index 215d8aeee85..0f70f70e33d 100644
--- a/src/mame/drivers/mouser.c
+++ b/src/mame/drivers/mouser.c
@@ -105,7 +105,7 @@ static ADDRESS_MAP_START( writeport2, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( mouser )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -115,7 +115,7 @@ static INPUT_PORTS_START( mouser )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -127,7 +127,7 @@ static INPUT_PORTS_START( mouser )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -151,7 +151,7 @@ static INPUT_PORTS_START( mouser )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c
index a9029a7bde0..30059456867 100644
--- a/src/mame/drivers/mpu4.c
+++ b/src/mame/drivers/mpu4.c
@@ -1001,7 +1001,7 @@ static const pia6821_interface pia_ic8_intf =
/* input ports for MPU4 board */
static INPUT_PORTS_START( mpu4 )
- PORT_START_TAG("ORANGE1")
+ PORT_START("ORANGE1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("00")
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("01")
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("02")
@@ -1011,7 +1011,7 @@ static INPUT_PORTS_START( mpu4 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("06")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("07")
- PORT_START_TAG("ORANGE2")
+ PORT_START("ORANGE2")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("08")
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("09")
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("10")
@@ -1021,7 +1021,7 @@ static INPUT_PORTS_START( mpu4 )
PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("14")
PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("15")
- PORT_START_TAG("BLACK1")
+ PORT_START("BLACK1")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Hi")
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("Lo")
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("18")
@@ -1031,7 +1031,7 @@ static INPUT_PORTS_START( mpu4 )
PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Refill Key") PORT_CODE(KEYCODE_R) PORT_TOGGLE
PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_INTERLOCK) PORT_NAME("Cashbox Door") PORT_CODE(KEYCODE_Q) PORT_TOGGLE
- PORT_START_TAG("BLACK2")
+ PORT_START("BLACK2")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("24")
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("25")
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON3) PORT_NAME("Cancel")
@@ -1041,7 +1041,7 @@ static INPUT_PORTS_START( mpu4 )
PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_BUTTON7) PORT_NAME("Hold 4")
PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_START1)
- PORT_START_TAG("DIL1")
+ PORT_START("DIL1")
PORT_DIPNAME( 0x01, 0x00, "DIL101" ) PORT_DIPLOCATION("DIL1:01")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1067,7 +1067,7 @@ static INPUT_PORTS_START( mpu4 )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DIL2")
+ PORT_START("DIL2")
PORT_DIPNAME( 0x01, 0x00, "DIL201" ) PORT_DIPLOCATION("DIL2:01")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1093,7 +1093,7 @@ static INPUT_PORTS_START( mpu4 )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("AUX1")
+ PORT_START("AUX1")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("0")
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("1")
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("2")
@@ -1103,7 +1103,7 @@ static INPUT_PORTS_START( mpu4 )
PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("6")
PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("7")
- PORT_START_TAG("AUX2")
+ PORT_START("AUX2")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_SPECIAL)
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SPECIAL)
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_SPECIAL)
@@ -1116,7 +1116,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( connect4 )
- PORT_START_TAG("ORANGE1")
+ PORT_START("ORANGE1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("00")
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("01")
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("02")
@@ -1126,7 +1126,7 @@ static INPUT_PORTS_START( connect4 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("06")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("07")
- PORT_START_TAG("ORANGE2")
+ PORT_START("ORANGE2")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("08")
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("09")
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("10")
@@ -1136,7 +1136,7 @@ static INPUT_PORTS_START( connect4 )
PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("14")
PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("15")
- PORT_START_TAG("BLACK1")
+ PORT_START("BLACK1")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("16")
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("17")
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("18")
@@ -1146,7 +1146,7 @@ static INPUT_PORTS_START( connect4 )
PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Refill Key") PORT_CODE(KEYCODE_R) PORT_TOGGLE
PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Door Switch?") PORT_TOGGLE
- PORT_START_TAG("BLACK2")
+ PORT_START("BLACK2")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Select")
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("25")
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Pass")
@@ -1156,7 +1156,7 @@ static INPUT_PORTS_START( connect4 )
PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("30")
PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("Drop")
- PORT_START_TAG("DIL1")
+ PORT_START("DIL1")
PORT_DIPNAME( 0x01, 0x00, "DIL101" ) PORT_DIPLOCATION("DIL1:01")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1182,7 +1182,7 @@ static INPUT_PORTS_START( connect4 )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START_TAG("DIL2")
+ PORT_START("DIL2")
PORT_DIPNAME( 0x01, 0x00, "DIL201" ) PORT_DIPLOCATION("DIL2:01")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1208,7 +1208,7 @@ static INPUT_PORTS_START( connect4 )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("AUX1")
+ PORT_START("AUX1")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("0")
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("1")
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("2")
@@ -1218,7 +1218,7 @@ static INPUT_PORTS_START( connect4 )
PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("6")
PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("7")
- PORT_START_TAG("AUX2")
+ PORT_START("AUX2")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_SPECIAL)
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SPECIAL)
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_SPECIAL)
diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c
index e3ec180441a..8e5aa25cd39 100644
--- a/src/mame/drivers/mpu4drvr.c
+++ b/src/mame/drivers/mpu4drvr.c
@@ -1100,7 +1100,7 @@ static READ16_HANDLER( ef9369_r )
}
static INPUT_PORTS_START( crmaze )
- PORT_START_TAG("ORANGE1")
+ PORT_START("ORANGE1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("00")
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("01")
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("02")
@@ -1110,7 +1110,7 @@ static INPUT_PORTS_START( crmaze )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("06")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("07")
- PORT_START_TAG("ORANGE2")
+ PORT_START("ORANGE2")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("08")
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("09")
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("10")
@@ -1120,7 +1120,7 @@ static INPUT_PORTS_START( crmaze )
PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("14")
PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("200p?")
- PORT_START_TAG("BLACK1")
+ PORT_START("BLACK1")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("16")
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("17")
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("18")
@@ -1130,7 +1130,7 @@ static INPUT_PORTS_START( crmaze )
PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Refill Key") PORT_CODE(KEYCODE_R) PORT_TOGGLE
PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Door Switch?") PORT_TOGGLE
- PORT_START_TAG("BLACK2")
+ PORT_START("BLACK2")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right Yellow")
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Right Red")
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("26")
@@ -1140,7 +1140,7 @@ static INPUT_PORTS_START( crmaze )
PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Getout Red")/* Labelled Escape on cabinet */
PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("100p Service?")PORT_IMPULSE(100)
- PORT_START_TAG("DIL1")
+ PORT_START("DIL1")
PORT_DIPNAME( 0x01, 0x00, "DIL101" ) PORT_DIPLOCATION("DIL1:01")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1166,7 +1166,7 @@ static INPUT_PORTS_START( crmaze )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DIL2")
+ PORT_START("DIL2")
PORT_DIPNAME( 0x01, 0x00, "DIL201" ) PORT_DIPLOCATION("DIL2:01")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1192,7 +1192,7 @@ static INPUT_PORTS_START( crmaze )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("AUX1")/* Presumed to be trackball, but only one phase available? */
+ PORT_START("AUX1")/* Presumed to be trackball, but only one phase available? */
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("0")
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("1")
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("2")
@@ -1202,7 +1202,7 @@ static INPUT_PORTS_START( crmaze )
PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("6")
PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("7")
- PORT_START_TAG("AUX2")
+ PORT_START("AUX2")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_SPECIAL)
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SPECIAL)
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_SPECIAL)
@@ -1214,7 +1214,7 @@ static INPUT_PORTS_START( crmaze )
INPUT_PORTS_END
static INPUT_PORTS_START( dealem )
- PORT_START_TAG("ORANGE1")
+ PORT_START("ORANGE1")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
@@ -1224,7 +1224,7 @@ static INPUT_PORTS_START( dealem )
PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_START_TAG("ORANGE2")
+ PORT_START("ORANGE2")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN5) PORT_NAME("20p Token")PORT_IMPULSE(5)
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("10p") PORT_CONDITION("DIL1",0x0f,PORTCOND_EQUALS,0x04)
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("10p") PORT_CONDITION("DIL1",0x0f,PORTCOND_EQUALS,0x05)
@@ -1239,7 +1239,7 @@ static INPUT_PORTS_START( dealem )
PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_START_TAG("BLACK1")
+ PORT_START("BLACK1")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON5) PORT_NAME("Gamble")
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_START2) PORT_NAME("Pontoon")
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Hi-Lo") PORT_CONDITION("DIL1",0x0f,PORTCOND_EQUALS,0x01)
@@ -1255,7 +1255,7 @@ static INPUT_PORTS_START( dealem )
PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Refill Key") PORT_CODE(KEYCODE_R) PORT_TOGGLE
PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_INTERLOCK) PORT_NAME("Rear Door") PORT_CODE(KEYCODE_Q) PORT_TOGGLE
- PORT_START_TAG("BLACK2")
+ PORT_START("BLACK2")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Hi-Lo") PORT_CONDITION("DIL1",0x0f,PORTCOND_EQUALS,0x00)
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Hi-Lo") PORT_CONDITION("DIL1",0x0f,PORTCOND_EQUALS,0x02)
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
@@ -1266,7 +1266,7 @@ static INPUT_PORTS_START( dealem )
PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Collect")
PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_BUTTON4) PORT_NAME("Deal")
- PORT_START_TAG("DIL1")
+ PORT_START("DIL1")
PORT_DIPNAME( 0x0f, 0x00, "Cabinet Set Up Mode" ) PORT_DIPLOCATION("DIL1:01,02,03,04")
PORT_DIPSETTING( 0x00, "Stop The Clock" )
PORT_DIPSETTING( 0x01, "Hit the Top" )
@@ -1291,7 +1291,7 @@ static INPUT_PORTS_START( dealem )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DIL2")
+ PORT_START("DIL2")
PORT_DIPNAME( 0x01, 0x00, "Payout Limit" ) PORT_DIPLOCATION("DIL2:01")
PORT_DIPSETTING( 0x00, "200p (All Cash)")
PORT_DIPSETTING( 0x01, "200p (Cash)+400p (Token)")
@@ -1317,7 +1317,7 @@ static INPUT_PORTS_START( dealem )
PORT_DIPSETTING( 0x00, "Multi" )
PORT_DIPSETTING( 0x80, DEF_STR(Single))
- PORT_START_TAG("AUX1")
+ PORT_START("AUX1")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
@@ -1327,7 +1327,7 @@ static INPUT_PORTS_START( dealem )
PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
- PORT_START_TAG("AUX2")
+ PORT_START("AUX2")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_SPECIAL)
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SPECIAL)
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_SPECIAL)
diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c
index 765f908ffed..1d7b4d120da 100644
--- a/src/mame/drivers/mquake.c
+++ b/src/mame/drivers/mquake.c
@@ -176,32 +176,32 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( mquake )
- PORT_START_TAG("CIA0PORTA")
+ PORT_START("CIA0PORTA")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) /* JS0SW */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) /* JS1SW */
- PORT_START_TAG("JOY0DAT")
+ PORT_START("JOY0DAT")
PORT_BIT( 0x0303, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(amiga_joystick_convert, "P1JOY")
PORT_BIT( 0xfcfc, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("JOY1DAT")
+ PORT_START("JOY1DAT")
PORT_BIT( 0x0303, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(amiga_joystick_convert, "P2JOY")
PORT_BIT( 0xfcfc, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("P1JOY")
+ PORT_START("P1JOY")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
- PORT_START_TAG("P2JOY")
+ PORT_START("P2JOY")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_START_TAG("COINCHIP")
+ PORT_START("COINCHIP")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START3 )
@@ -211,7 +211,7 @@ static INPUT_PORTS_START( mquake )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN3 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("SW.LO")
+ PORT_START("SW.LO")
PORT_DIPNAME( 0x0001, 0x0001, "SW3.1" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -261,7 +261,7 @@ static INPUT_PORTS_START( mquake )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("SW.HI")
+ PORT_START("SW.HI")
PORT_DIPNAME( 0x0001, 0x0001, "SW3.5" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/mrdo.c b/src/mame/drivers/mrdo.c
index 14fb9586006..776d64d7f8f 100644
--- a/src/mame/drivers/mrdo.c
+++ b/src/mame/drivers/mrdo.c
@@ -65,7 +65,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mrdo )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -75,7 +75,7 @@ static INPUT_PORTS_START( mrdo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_TILT )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -85,7 +85,7 @@ static INPUT_PORTS_START( mrdo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:8,7")
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Medium ) )
@@ -109,7 +109,7 @@ static INPUT_PORTS_START( mrdo )
PORT_DIPSETTING( 0x80, "4" )
PORT_DIPSETTING( 0x40, "5" )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW2:8,7,6,5")
PORT_DIPSETTING( 0x06, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/mrflea.c b/src/mame/drivers/mrflea.c
index ec0c8b204f9..7ffd3379774 100644
--- a/src/mame/drivers/mrflea.c
+++ b/src/mame/drivers/mrflea.c
@@ -354,7 +354,7 @@ ROM_START( mrflea )
ROM_END
static INPUT_PORTS_START( mrflea )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
@@ -364,12 +364,12 @@ static INPUT_PORTS_START( mrflea )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x03, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
/*
------xx
-----x--
@@ -399,7 +399,7 @@ static INPUT_PORTS_START( mrflea )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
diff --git a/src/mame/drivers/mrjong.c b/src/mame/drivers/mrjong.c
index db0447f0bfe..1636d2706a8 100644
--- a/src/mame/drivers/mrjong.c
+++ b/src/mame/drivers/mrjong.c
@@ -100,7 +100,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mrjong )
- PORT_START /* IN0 */
+ PORT_START("P2") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2)
@@ -110,7 +110,7 @@ static INPUT_PORTS_START( mrjong )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ????
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1)
@@ -120,7 +120,7 @@ static INPUT_PORTS_START( mrjong )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* DSW1 */
+ PORT_START("DSW") /* DSW1 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c
index 7adf426cd3e..b2d831e56b6 100644
--- a/src/mame/drivers/ms32.c
+++ b/src/mame/drivers/ms32.c
@@ -389,7 +389,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( ms32 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -399,7 +399,7 @@ static INPUT_PORTS_START( ms32 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -409,7 +409,7 @@ static INPUT_PORTS_START( ms32 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -419,7 +419,7 @@ static INPUT_PORTS_START( ms32 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -429,7 +429,7 @@ static INPUT_PORTS_START( ms32 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0xe0, 0xe0, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:3,2,1")\
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 4C_1C ) )
@@ -453,7 +453,7 @@ static INPUT_PORTS_START( ms32 )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW1:8" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unused ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -479,7 +479,7 @@ static INPUT_PORTS_START( ms32 )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unused ) ) PORT_DIPLOCATION("SW3:1")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -505,7 +505,7 @@ static INPUT_PORTS_START( ms32 )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("UNUSED")
+ PORT_START("UNUSED")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -980,7 +980,7 @@ static INPUT_PORTS_START( kirarast ) // player 1 inputs done? others?
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("MJ0") // Mahjong Inputs 0x01
+ PORT_START("MJ0") // Mahjong Inputs 0x01
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_E )
@@ -990,7 +990,7 @@ static INPUT_PORTS_START( kirarast ) // player 1 inputs done? others?
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("MJ1") // Mahjong Inputs 0x02
+ PORT_START("MJ1") // Mahjong Inputs 0x02
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_F )
@@ -1000,7 +1000,7 @@ static INPUT_PORTS_START( kirarast ) // player 1 inputs done? others?
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("MJ2") // Mahjong Inputs 0x04
+ PORT_START("MJ2") // Mahjong Inputs 0x04
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_C )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_G )
@@ -1010,7 +1010,7 @@ static INPUT_PORTS_START( kirarast ) // player 1 inputs done? others?
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("MJ3") // Mahjong Inputs 0x08
+ PORT_START("MJ3") // Mahjong Inputs 0x08
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_D )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_H )
@@ -1020,7 +1020,7 @@ static INPUT_PORTS_START( kirarast ) // player 1 inputs done? others?
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("MJ4") // Mahjong Inputs 0x10 unused ?
+ PORT_START("MJ4") // Mahjong Inputs 0x10 unused ?
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1217,14 +1217,14 @@ static INPUT_PORTS_START( f1superb ) // Mostly wrong !
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("AN0") // Acceleration (wrong?)
+ PORT_START("AN0") // Acceleration (wrong?)
PORT_BIT( 0xff, 0x00, IPT_AD_STICK_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(15) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("AN1") // Steering
+ PORT_START("AN1") // Steering
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("AN2?") // Shift + Brake
+ PORT_START("AN2?") // Shift + Brake
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c
index ae7292ebefb..05a5eb9e7b4 100644
--- a/src/mame/drivers/msisaac.c
+++ b/src/mame/drivers/msisaac.c
@@ -359,7 +359,7 @@ ADDRESS_MAP_END
#endif
static INPUT_PORTS_START( msisaac )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, "DSW1 Unknown 0" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -384,7 +384,7 @@ static INPUT_PORTS_START( msisaac )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0f, DEF_STR( 9C_1C ) )
PORT_DIPSETTING( 0x0e, DEF_STR( 8C_1C ) )
@@ -420,7 +420,7 @@ static INPUT_PORTS_START( msisaac )
PORT_DIPSETTING( 0x60, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x70, DEF_STR( 1C_8C ) )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -445,7 +445,7 @@ static INPUT_PORTS_START( msisaac )
PORT_DIPSETTING( 0x80, "A and B" )
PORT_DIPSETTING( 0x00, "A only" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) //??
@@ -455,7 +455,7 @@ static INPUT_PORTS_START( msisaac )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) //??
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) //??
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -465,7 +465,7 @@ static INPUT_PORTS_START( msisaac )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c
index 7074cb32eab..2c68d01e9d0 100644
--- a/src/mame/drivers/mugsmash.c
+++ b/src/mame/drivers/mugsmash.c
@@ -239,18 +239,18 @@ ADDRESS_MAP_END
#if USE_FAKE_INPUT_PORTS
static INPUT_PORTS_START( mugsmash )
- PORT_START_TAG("P1") /* Fake IN0 (player 1 inputs) */
+ PORT_START("P1") /* Fake IN0 (player 1 inputs) */
MUGSMASH_PLAYER_INPUT( 1, IPT_START1 )
- PORT_START_TAG("P2") /* Fake IN1 (player 2 inputs) */
+ PORT_START("P2") /* Fake IN1 (player 2 inputs) */
MUGSMASH_PLAYER_INPUT( 2, IPT_START2 )
- PORT_START_TAG("IN0") /* Fake IN2 (system inputs) */
+ PORT_START("IN0") /* Fake IN2 (system inputs) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1") /* Fake IN3 (SW1) */
+ PORT_START("DSW1") /* Fake IN3 (SW1) */
PORT_SERVICE( 0x01, IP_ACTIVE_LOW ) // SW1-1
PORT_DIPNAME( 0x0e, 0x00, DEF_STR( Coinage ) ) // SW1-2 to SW1-4
PORT_DIPSETTING( 0x0c, DEF_STR( 4C_1C ) )
@@ -274,7 +274,7 @@ static INPUT_PORTS_START( mugsmash )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* Fake IN4 (SW2) */
+ PORT_START("DSW2") /* Fake IN4 (SW2) */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) // SW2-1
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -300,7 +300,7 @@ static INPUT_PORTS_START( mugsmash )
INPUT_PORTS_END
#else
static INPUT_PORTS_START( mugsmash )
- PORT_START_TAG("IN0") /* IN0 - $180000.w */
+ PORT_START("IN0") /* IN0 - $180000.w */
MUGSMASH_PLAYER_INPUT( 1, IPT_START1 )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -315,7 +315,7 @@ static INPUT_PORTS_START( mugsmash )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* IN1 - $180002.w */
+ PORT_START("IN1") /* IN1 - $180002.w */
MUGSMASH_PLAYER_INPUT( 2, IPT_START2 )
PORT_SERVICE( 0x0100, IP_ACTIVE_LOW ) // SW1-1
PORT_DIPNAME( 0x0e00, 0x0000, DEF_STR( Coinage ) ) // SW1-2 to SW1-4
@@ -336,7 +336,7 @@ static INPUT_PORTS_START( mugsmash )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* IN2 - $180004.w */
+ PORT_START("IN2") /* IN2 - $180004.w */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -364,7 +364,7 @@ static INPUT_PORTS_START( mugsmash )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* IN3 - $180006.w */
+ PORT_START("IN3") /* IN3 - $180006.w */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/multigam.c b/src/mame/drivers/multigam.c
index 2393c7668a5..dedb95f4cee 100644
--- a/src/mame/drivers/multigam.c
+++ b/src/mame/drivers/multigam.c
@@ -450,7 +450,7 @@ ADDRESS_MAP_END
*******************************************************/
static INPUT_PORTS_START( multigam_common )
- PORT_START_TAG("P1") /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) /* Select */
@@ -460,7 +460,7 @@ static INPUT_PORTS_START( multigam_common )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
- PORT_START_TAG("P2") /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) /* Select */
@@ -470,14 +470,14 @@ static INPUT_PORTS_START( multigam_common )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_START_TAG("IN0") /* IN2 */
+ PORT_START("IN0") /* IN2 */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 )
INPUT_PORTS_END
static INPUT_PORTS_START( multigam )
PORT_INCLUDE( multigam_common )
- PORT_START_TAG("DSW") /* IN3 */
+ PORT_START("DSW") /* IN3 */
PORT_DIPNAME( 0x06, 0x00, "Coin/Time" )
PORT_DIPSETTING( 0x00, "3 min" )
PORT_DIPSETTING( 0x04, "5 min" )
@@ -488,7 +488,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( multigm3 )
PORT_INCLUDE( multigam_common )
- PORT_START_TAG("DSW") /* IN3 */
+ PORT_START("DSW") /* IN3 */
PORT_DIPNAME( 0x06, 0x00, "Coin/Time" )
PORT_DIPSETTING( 0x00, "15 min" )
PORT_DIPSETTING( 0x04, "8 min" )
diff --git a/src/mame/drivers/munchmo.c b/src/mame/drivers/munchmo.c
index 8ece87859f0..068fd4c0e8d 100644
--- a/src/mame/drivers/munchmo.c
+++ b/src/mame/drivers/munchmo.c
@@ -125,7 +125,7 @@ static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( mnchmobl )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 ) /* service */
@@ -135,7 +135,7 @@ static INPUT_PORTS_START( mnchmobl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* P1 controls */
+ PORT_START("P1") /* P1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_8WAY
@@ -144,7 +144,7 @@ static INPUT_PORTS_START( mnchmobl )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_2WAY
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* P2 controls */
+ PORT_START("P2") /* P2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -153,7 +153,7 @@ static INPUT_PORTS_START( mnchmobl )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* DSW1 0xbe02 */
+ PORT_START("DSW1") /* DSW1 0xbe02 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -184,7 +184,7 @@ static INPUT_PORTS_START( mnchmobl )
PORT_DIPSETTING( 0xc0, "20000" )
PORT_DIPSETTING( 0xe0, "10000" )
- PORT_START /* DSW2 0xbe03 */
+ PORT_START("DSW2") /* DSW2 0xbe03 */
PORT_DIPNAME( 0x03, 0x00, "Second Bonus Life" )
PORT_DIPSETTING( 0x00, "No Bonus?" )
PORT_DIPSETTING( 0x01, "100000?" )
diff --git a/src/mame/drivers/murogem.c b/src/mame/drivers/murogem.c
index 16d3e97bef8..bc4d68823d4 100644
--- a/src/mame/drivers/murogem.c
+++ b/src/mame/drivers/murogem.c
@@ -113,7 +113,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( murogem )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_CODE(KEYCODE_1) PORT_NAME("Bet (Replay)")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_CODE(KEYCODE_2) PORT_NAME("Deal")
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_CODE(KEYCODE_SPACE) PORT_NAME("Clear Selection")
@@ -123,7 +123,7 @@ static INPUT_PORTS_START( murogem )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_CODE(KEYCODE_X) PORT_NAME("Select Card 2")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_CODE(KEYCODE_Z) PORT_NAME("Select Card 1")
- PORT_START
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, "Reset" ) // reduces credits to 0 and resets game??
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/mustache.c b/src/mame/drivers/mustache.c
index 9f798bd4e02..94f8e138a05 100644
--- a/src/mame/drivers/mustache.c
+++ b/src/mame/drivers/mustache.c
@@ -82,17 +82,15 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( mustache )
- PORT_START /* IN 1 */
-
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
+ PORT_START("P1") /* IN 1 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_START /* IN 2 */
-
+ PORT_START("P2") /* IN 2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -100,12 +98,12 @@ static INPUT_PORTS_START( mustache )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_START /* IN 3 */
+ PORT_START("START") /* IN 3 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xf9, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* DSW A */
+ PORT_START("DSW1") /* DSW A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -126,7 +124,7 @@ static INPUT_PORTS_START( mustache )
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW B */
+ PORT_START("DSW2") /* DSW B */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
@@ -148,7 +146,7 @@ static INPUT_PORTS_START( mustache )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG(T5182COINPORT)
+ PORT_START(T5182COINPORT)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(2)
diff --git a/src/mame/drivers/mw8080bw.c b/src/mame/drivers/mw8080bw.c
index 8a28808d5d6..97b4c991765 100644
--- a/src/mame/drivers/mw8080bw.c
+++ b/src/mame/drivers/mw8080bw.c
@@ -349,7 +349,7 @@ static const UINT32 seawolf_controller_table[30] =
static INPUT_PORTS_START( seawolf )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
/* the grey code is inverted by buffers */
/* The wiring diagram shows the encoder has 32 positions. */
/* But there is a hand written table on the game logic sheet showing only 30 positions. */
@@ -366,7 +366,7 @@ static INPUT_PORTS_START( seawolf )
PORT_DIPSETTING( 0x80, "80 seconds" ) PORT_CONDITION("IN1",0xe0,PORTCOND_EQUALS,0x00)
PORT_DIPSETTING( 0xc0, "90 seconds" ) PORT_CONDITION("IN1",0xe0,PORTCOND_EQUALS,0x00)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 )
PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Coinage ) ) PORT_CONDITION("IN1",0xe0,PORTCOND_NOTEQUALS,0xe0) PORT_DIPLOCATION("G4:3,4")
@@ -386,11 +386,11 @@ static INPUT_PORTS_START( seawolf )
PORT_DIPSETTING( 0xe0, "Test Mode" )
/* 2 fake ports for the 'Reset High Score' input, which has a DIP to enable it */
- PORT_START_TAG(SEAWOLF_ERASE_SW_PORT_TAG)
+ PORT_START(SEAWOLF_ERASE_SW_PORT_TAG)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Reset High Score") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG(SEAWOLF_ERASE_DIP_PORT_TAG)
+ PORT_START(SEAWOLF_ERASE_DIP_PORT_TAG)
PORT_DIPNAME( 0x01, 0x01, "Enable Reset High Score Button" ) PORT_DIPLOCATION("G4:5")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -448,7 +448,7 @@ static const UINT32 gunfight_controller_table[7] =
static INPUT_PORTS_START( gunfight )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -456,7 +456,7 @@ static INPUT_PORTS_START( gunfight )
PORT_BIT( 0x70, 0x30, IPT_POSITIONAL_V ) PORT_POSITIONS(7) PORT_REMAP_TABLE(gunfight_controller_table) PORT_INVERT PORT_SENSITIVITY(5) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_H) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -464,7 +464,7 @@ static INPUT_PORTS_START( gunfight )
PORT_BIT( 0x70, 0x30, IPT_POSITIONAL_V ) PORT_POSITIONS(7) PORT_REMAP_TABLE(gunfight_controller_table) PORT_INVERT PORT_SENSITIVITY(5) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_M) PORT_CODE_INC(KEYCODE_J) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("C1:1,2,3,4")
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
@@ -631,19 +631,19 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( tornbase )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(tornbase_hit_left_input_r, 0)
PORT_BIT( 0x7e, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(tornbase_pitch_left_input_r, 0)
PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unused ) ) PORT_CONDITION("IN2",0x80,PORTCOND_EQUALS,0x00) PORT_DIPLOCATION("B1:7")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(tornbase_hit_right_input_r, 0)
PORT_BIT( 0x7e, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(tornbase_pitch_right_input_r, 0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED) /* not connected */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* schematics shows it as "START", but not used by the software */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(tornbase_score_input_r, 0)
@@ -667,15 +667,15 @@ static INPUT_PORTS_START( tornbase )
PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_HIGH, "B1:6" )
/* fake ports to handle the various input configurations based on cabinet type */
- PORT_START_TAG(TORNBASE_L_HIT_PORT_TAG)
+ PORT_START(TORNBASE_L_HIT_PORT_TAG)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("P1 Hit") PORT_PLAYER(1)
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG(TORNBASE_R_HIT_PORT_TAG)
+ PORT_START(TORNBASE_R_HIT_PORT_TAG)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("P2 Hit") PORT_PLAYER(2)
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG(TORNBASE_L_PITCH_PORT_TAG)
+ PORT_START(TORNBASE_L_PITCH_PORT_TAG)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("P1 Move Outfield Left") PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("P1 Move Outfield Right") PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_NAME("P1 Pitch Left") PORT_PLAYER(1)
@@ -684,7 +684,7 @@ static INPUT_PORTS_START( tornbase )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_NAME("P1 Pitch Fast") PORT_PLAYER(1)
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG(TORNBASE_R_PITCH_PORT_TAG)
+ PORT_START(TORNBASE_R_PITCH_PORT_TAG)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("P2 Move Outfield Left") PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("P2 Move Outfield Right") PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_NAME("P2 Pitch Left") PORT_PLAYER(2)
@@ -695,18 +695,18 @@ static INPUT_PORTS_START( tornbase )
/* 2 fakes port for the 'ERASE' input, which has a DIP to enable it.
This switch is not actually used by the software */
- PORT_START_TAG(TORNBASE_SCORE_SW_PORT_TAG)
+ PORT_START(TORNBASE_SCORE_SW_PORT_TAG)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("SCORE Input (Not Used)") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG(TORNBASE_SCORE_DIP_PORT_TAG)
+ PORT_START(TORNBASE_SCORE_DIP_PORT_TAG)
PORT_DIPNAME( 0x01, 0x01, "Enable SCORE Input" ) PORT_DIPLOCATION("B1:1")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
/* fake port for cabinet type */
- PORT_START_TAG(TORNBASE_CAB_TYPE_PORT_TAG)
+ PORT_START(TORNBASE_CAB_TYPE_PORT_TAG)
PORT_CONFNAME( 0x03, TORNBASE_CAB_TYPE_UPRIGHT_NEW, DEF_STR( Cabinet ) )
PORT_CONFSETTING( TORNBASE_CAB_TYPE_UPRIGHT_OLD, "Upright/w One Hit Button" )
PORT_CONFSETTING( TORNBASE_CAB_TYPE_UPRIGHT_NEW, "Upright/w P1/P2 Hit Buttons" )
@@ -752,17 +752,17 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( zzzap )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0f, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(64) PORT_PLAYER(1) /* accelerator */
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_TOGGLE PORT_NAME("P1 Shift") PORT_PLAYER(1)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED ) /* not connected */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1") /* steering wheel */
+ PORT_START("IN1") /* steering wheel */
PORT_BIT( 0xff, 0x7f, IPT_PADDLE ) PORT_MINMAX(0x01,0xfe) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) ) PORT_CONDITION("IN2",0x0c,PORTCOND_NOTEQUALS,0x04) PORT_DIPLOCATION("E3:1,2")
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -790,17 +790,17 @@ INPUT_PORTS_END
static INPUT_PORTS_START( lagunar )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0f, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(64) PORT_PLAYER(1) /* accelerator */
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_TOGGLE PORT_NAME("P1 Shift") PORT_PLAYER(1)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED ) /* not connected */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* start button, but never used */
- PORT_START_TAG("IN1") /* steering wheel */
+ PORT_START("IN1") /* steering wheel */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x01,0xfe) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("E3:1,2")
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -912,7 +912,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( maze )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -922,7 +922,7 @@ static INPUT_PORTS_START( maze )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED ) /* labeled 'Not Used' */
@@ -993,7 +993,7 @@ static const UINT32 boothill_controller_table[7] =
static INPUT_PORTS_START( boothill )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1001,7 +1001,7 @@ static INPUT_PORTS_START( boothill )
PORT_BIT( 0x70, 0x30, IPT_POSITIONAL_V ) PORT_POSITIONS(7) PORT_REMAP_TABLE(boothill_controller_table) PORT_SENSITIVITY(5) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_M) PORT_CODE_INC(KEYCODE_J) PORT_CENTERDELTA(0) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1009,7 +1009,7 @@ static INPUT_PORTS_START( boothill )
PORT_BIT( 0x70, 0x30, IPT_POSITIONAL_V ) PORT_POSITIONS(7) PORT_REMAP_TABLE(boothill_controller_table) PORT_SENSITIVITY(5) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_H) PORT_CENTERDELTA(0) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME ( 0x03, 0x00, DEF_STR( Coinage ) ) PORT_CONDITION("IN2",0x10,PORTCOND_EQUALS,0x00) PORT_DIPLOCATION("SW:1,2")
PORT_DIPSETTING ( 0x02, "2 Coins per Player" )
PORT_DIPSETTING ( 0x03, "2 Coins/1 or 2 Players" )
@@ -1025,7 +1025,7 @@ static INPUT_PORTS_START( boothill )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("MUSIC_ADJ") /* 3 */
+ PORT_START("MUSIC_ADJ") /* 3 */
PORT_ADJUSTER( 35, "Music Volume" )
INPUT_PORTS_END
@@ -1073,7 +1073,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( checkmat )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -1083,7 +1083,7 @@ static INPUT_PORTS_START( checkmat )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(3)
@@ -1093,7 +1093,7 @@ static INPUT_PORTS_START( checkmat )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(4)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME ( 0x01, 0x00, DEF_STR( Coinage ) ) PORT_CONDITION("IN2",0x80,PORTCOND_EQUALS,0x00) PORT_DIPLOCATION("A4:1")
PORT_DIPSETTING ( 0x00, "1 Coin/1 or 2 Players" )
PORT_DIPSETTING ( 0x01, "1 Coin/1 or 2 Players, 2 Coins/3 or 4 Players" )
@@ -1115,7 +1115,7 @@ static INPUT_PORTS_START( checkmat )
PORT_DIPSETTING ( 0x60, "Language 4" )
PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_HIGH, "A4:8" )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START3 )
@@ -1125,10 +1125,10 @@ static INPUT_PORTS_START( checkmat )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("R309") /* 4 */
+ PORT_START("R309") /* 4 */
PORT_ADJUSTER( 50, "Boom Volume" )
- PORT_START_TAG("R411") /* 5 */
+ PORT_START("R411") /* 5 */
PORT_ADJUSTER( 50, "Tone Volume" )
INPUT_PORTS_END
@@ -1220,10 +1220,10 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( desertgu )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(desertgu_gun_input_r, 0)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(desertgu_dip_sw_0_1_r, 0)
PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Language ) ) PORT_CONDITION("IN1",0x30,PORTCOND_NOTEQUALS,0x30) PORT_DIPLOCATION("C2:5,6")
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
@@ -1239,15 +1239,15 @@ static INPUT_PORTS_START( desertgu )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
/* fake ports for reading the gun's X and Y axis */
- PORT_START_TAG(DESERTGU_GUN_X_PORT_TAG)
+ PORT_START(DESERTGU_GUN_X_PORT_TAG)
PORT_BIT( 0xff, 0x4d, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX(0x10,0x8e) PORT_SENSITIVITY(70) PORT_KEYDELTA(10)
- PORT_START_TAG(DESERTGU_GUN_Y_PORT_TAG)
+ PORT_START(DESERTGU_GUN_Y_PORT_TAG)
PORT_BIT( 0xff, 0x48, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_MINMAX(0x10,0x7f) PORT_SENSITIVITY(70) PORT_KEYDELTA(10)
/* D0 and D1 in the DIP SW input port can reflect two sets of switches depending on the controller
select bit. These two ports are fakes to handle this case */
- PORT_START_TAG(DESERTGU_DIP_SW_0_1_SET_1_TAG)
+ PORT_START(DESERTGU_DIP_SW_0_1_SET_1_TAG)
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) ) PORT_CONDITION("IN1",0x30,PORTCOND_NOTEQUALS,0x30) PORT_DIPLOCATION("C2:1,2")
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -1255,7 +1255,7 @@ static INPUT_PORTS_START( desertgu )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) )
PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG(DESERTGU_DIP_SW_0_1_SET_2_TAG)
+ PORT_START(DESERTGU_DIP_SW_0_1_SET_2_TAG)
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Game_Time ) ) PORT_CONDITION("IN1",0x30,PORTCOND_NOTEQUALS,0x30) PORT_DIPLOCATION("C2:3,4")
PORT_DIPSETTING( 0x00, "40 seconds + 30 extended" )
PORT_DIPSETTING( 0x01, "50 seconds + 30 extended" )
@@ -1263,7 +1263,7 @@ static INPUT_PORTS_START( desertgu )
PORT_DIPSETTING( 0x03, "70 seconds + 30 extended" )
PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("MUSIC_ADJ") /* 3 */
+ PORT_START("MUSIC_ADJ") /* 3 */
PORT_ADJUSTER( 60, "Music Volume" )
INPUT_PORTS_END
@@ -1339,17 +1339,17 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( dplay )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Hit") PORT_PLAYER(1)
PORT_BIT( 0x7e, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(dplay_pitch_left_input_r, 0)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P2 Hit") PORT_PLAYER(2)
PORT_BIT( 0x7e, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(dplay_pitch_right_input_r, 0)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME ( 0x07, 0x00, DEF_STR( Coinage )) PORT_CONDITION("IN2",0x40,PORTCOND_EQUALS,0x40) PORT_DIPLOCATION("C1:1,2,3")
PORT_DIPSETTING ( 0x05, "2 Coins/1 Inning/1 Player, 4 Coins/1 Inning/2 Players, 8 Coins/3 Innings/2 Players" )
PORT_DIPSETTING ( 0x04, "1 Coin/1 Inning/1 Player, 2 Coins/1 Inning/2 Players, 4 Coins/3 Innings/2 Players" )
@@ -1372,7 +1372,7 @@ static INPUT_PORTS_START( dplay )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
/* fake ports to handle the various input configurations based on cabinet type */
- PORT_START_TAG(DPLAY_L_PITCH_PORT_TAG)
+ PORT_START(DPLAY_L_PITCH_PORT_TAG)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Move Outfield Left") PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("P1 Move Outfield Right") PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_NAME("P1 Pitch Left") PORT_PLAYER(1)
@@ -1381,7 +1381,7 @@ static INPUT_PORTS_START( dplay )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_NAME("P1 Pitch Fast") PORT_PLAYER(1)
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG(DPLAY_R_PITCH_PORT_TAG)
+ PORT_START(DPLAY_R_PITCH_PORT_TAG)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P2 Move Outfield Left") PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("P2 Move Outfield Right") PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_NAME("P2 Pitch Left") PORT_PLAYER(2)
@@ -1391,29 +1391,29 @@ static INPUT_PORTS_START( dplay )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
/* fake port for cabinet type */
- PORT_START_TAG(DPLAY_CAB_TYPE_PORT_TAG)
+ PORT_START(DPLAY_CAB_TYPE_PORT_TAG)
PORT_CONFNAME( 0x01, DPLAY_CAB_TYPE_UPRIGHT, DEF_STR( Cabinet ) )
PORT_CONFSETTING( DPLAY_CAB_TYPE_UPRIGHT, DEF_STR( Upright ) )
PORT_CONFSETTING( DPLAY_CAB_TYPE_COCKTAIL, DEF_STR( Cocktail ) )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("MUSIC_ADJ") /* 3 */
+ PORT_START("MUSIC_ADJ") /* 3 */
PORT_ADJUSTER( 60, "Music Volume" )
INPUT_PORTS_END
static INPUT_PORTS_START( einning )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Hit") PORT_PLAYER(1)
PORT_BIT( 0x7e, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(dplay_pitch_left_input_r, 0)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P2 Hit") PORT_PLAYER(2)
PORT_BIT( 0x7e, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(dplay_pitch_right_input_r, 0)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME ( 0x07, 0x00, DEF_STR( Coinage )) PORT_CONDITION("IN2",0x40,PORTCOND_EQUALS,0x40) PORT_DIPLOCATION("C1:1,2,3")
PORT_DIPSETTING ( 0x05, "2 Coins/1 Inning/1 Player, 4 Coins/1 Inning/2 Players, 8 Coins/3 Innings/2 Players" )
PORT_DIPSETTING ( 0x04, "1 Coin/1 Inning/1 Player, 2 Coins/1 Inning/2 Players, 4 Coins/3 Innings/2 Players" )
@@ -1436,7 +1436,7 @@ static INPUT_PORTS_START( einning )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
/* fake ports to handle the various input configurations based on cabinet type */
- PORT_START_TAG(DPLAY_L_PITCH_PORT_TAG)
+ PORT_START(DPLAY_L_PITCH_PORT_TAG)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Move Outfield Left") PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("P1 Move Outfield Right") PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_NAME("P1 Pitch Left") PORT_PLAYER(1)
@@ -1445,7 +1445,7 @@ static INPUT_PORTS_START( einning )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_NAME("P1 Pitch Fast") PORT_PLAYER(1)
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG(DPLAY_R_PITCH_PORT_TAG)
+ PORT_START(DPLAY_R_PITCH_PORT_TAG)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P2 Move Outfield Left") PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("P2 Move Outfield Right") PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_NAME("P2 Pitch Left") PORT_PLAYER(2)
@@ -1455,13 +1455,13 @@ static INPUT_PORTS_START( einning )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
/* fake port for cabinet type */
- PORT_START_TAG(DPLAY_CAB_TYPE_PORT_TAG)
+ PORT_START(DPLAY_CAB_TYPE_PORT_TAG)
PORT_CONFNAME( 0x01, DPLAY_CAB_TYPE_UPRIGHT, DEF_STR( Cabinet ) )
PORT_CONFSETTING( DPLAY_CAB_TYPE_UPRIGHT, DEF_STR( Upright ) )
PORT_CONFSETTING( DPLAY_CAB_TYPE_COCKTAIL, DEF_STR( Cocktail ) )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("MUSIC_ADJ") /* 3 */
+ PORT_START("MUSIC_ADJ") /* 3 */
PORT_ADJUSTER( 60, "Music Volume" )
INPUT_PORTS_END
@@ -1514,7 +1514,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( gmissile )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) /* not connected */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) /* not connected */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
@@ -1524,7 +1524,7 @@ static INPUT_PORTS_START( gmissile )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) /* not connected */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -1534,7 +1534,7 @@ static INPUT_PORTS_START( gmissile )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME ( 0x03, 0x03, DEF_STR( Coinage ) ) PORT_CONDITION("IN2",0x80,PORTCOND_EQUALS,0x80) PORT_DIPLOCATION("D1:1,2")
PORT_DIPSETTING ( 0x01, "2 Coins per Player" )
PORT_DIPSETTING ( 0x00, "2 Coins/1 or 2 Players" )
@@ -1604,7 +1604,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( m4 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) /* not connected */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) /* not connected */
@@ -1614,7 +1614,7 @@ static INPUT_PORTS_START( m4 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* not connected */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* not connected */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_2WAY PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1624,7 +1624,7 @@ static INPUT_PORTS_START( m4 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* not connected */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME ( 0x03, 0x00, DEF_STR( Coinage ) ) PORT_CONDITION("IN2",0x10,PORTCOND_EQUALS,0x10) PORT_DIPLOCATION("C1:1,2")
PORT_DIPSETTING ( 0x02, "2 Coins per Player" )
PORT_DIPSETTING ( 0x03, "2 Coins/1 or 2 Players" )
@@ -1726,10 +1726,10 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( clowns )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(clowns_controller_r, 0)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) /* not connected */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) /* not connected */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) /* not connected */
@@ -1739,7 +1739,7 @@ static INPUT_PORTS_START( clowns )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* not connected */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME ( 0x03, 0x00, DEF_STR( Coinage ) ) PORT_CONDITION("IN2",0x80,PORTCOND_EQUALS,0x00) PORT_DIPLOCATION("SW:1,2")
PORT_DIPSETTING ( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING ( 0x02, DEF_STR( 2C_2C ) )
@@ -1763,22 +1763,22 @@ static INPUT_PORTS_START( clowns )
PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_HIGH, "SW:8" )
/* fake ports for two analog controls multiplexed */
- PORT_START_TAG(CLOWNS_CONTROLLER_P1_TAG)
+ PORT_START(CLOWNS_CONTROLLER_P1_TAG)
PORT_BIT( 0xff, 0x7f, IPT_PADDLE ) PORT_MINMAX(0x01,0xfe) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_PLAYER(1)
- PORT_START_TAG(CLOWNS_CONTROLLER_P2_TAG)
+ PORT_START(CLOWNS_CONTROLLER_P2_TAG)
PORT_BIT( 0xff, 0x7f, IPT_PADDLE ) PORT_MINMAX(0x01,0xfe) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_PLAYER(2)
- PORT_START_TAG("MUSIC_ADJ") /* 3 */
+ PORT_START("MUSIC_ADJ") /* 3 */
PORT_ADJUSTER( 40, "Music Volume" )
INPUT_PORTS_END
static INPUT_PORTS_START( clowns1 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(clowns_controller_r, 0)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1788,7 +1788,7 @@ static INPUT_PORTS_START( clowns1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME ( 0x03, 0x00, DEF_STR( Coinage ) ) PORT_CONDITION("IN2",0x80,PORTCOND_EQUALS,0x00) PORT_DIPLOCATION("SW:1,2")
PORT_DIPSETTING ( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING ( 0x02, DEF_STR( 2C_2C ) )
@@ -1810,13 +1810,13 @@ static INPUT_PORTS_START( clowns1 )
PORT_DIPSETTING ( 0x40, DEF_STR( On ) )
PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_HIGH, "SW:8" )
- PORT_START_TAG(CLOWNS_CONTROLLER_P1_TAG)
+ PORT_START(CLOWNS_CONTROLLER_P1_TAG)
PORT_BIT( 0xff, 0x7f, IPT_PADDLE ) PORT_MINMAX(0x01,0xfe) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_PLAYER(1)
- PORT_START_TAG(CLOWNS_CONTROLLER_P2_TAG)
+ PORT_START(CLOWNS_CONTROLLER_P2_TAG)
PORT_BIT( 0xff, 0x7f, IPT_PADDLE ) PORT_MINMAX(0x01,0xfe) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_PLAYER(2)
- PORT_START_TAG("MUSIC_ADJ") /* 3 */
+ PORT_START("MUSIC_ADJ") /* 3 */
PORT_ADJUSTER( 40, "Music Volume" )
INPUT_PORTS_END
@@ -1861,7 +1861,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( shuffle )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_DIPNAME ( 0x03, 0x00, DEF_STR( Language ) ) PORT_CONDITION("IN0",0x80,PORTCOND_EQUALS,0x80) PORT_DIPLOCATION("B3:1,2")
PORT_DIPSETTING ( 0x00, DEF_STR( English ) )
PORT_DIPSETTING ( 0x01, DEF_STR( French ) )
@@ -1882,7 +1882,7 @@ static INPUT_PORTS_START( shuffle )
PORT_DIPSETTING ( 0x40, DEF_STR( On ) )
PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_LOW, "B3:8" )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
@@ -1892,10 +1892,10 @@ static INPUT_PORTS_START( shuffle )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* not connected */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* not connected */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(10) PORT_KEYDELTA(50) PORT_PLAYER(1)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0xff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(10) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
INPUT_PORTS_END
@@ -1944,7 +1944,7 @@ static const UINT32 dogpatch_controller_table[7] =
static INPUT_PORTS_START( dogpatch )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
@@ -1952,7 +1952,7 @@ static INPUT_PORTS_START( dogpatch )
PORT_BIT( 0x70, 0x30, IPT_POSITIONAL_V ) PORT_POSITIONS(7) PORT_REMAP_TABLE(dogpatch_controller_table) PORT_SENSITIVITY(5) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_M) PORT_CODE_INC(KEYCODE_J) PORT_CENTERDELTA(0) PORT_REVERSE PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1960,7 +1960,7 @@ static INPUT_PORTS_START( dogpatch )
PORT_BIT( 0x70, 0x30, IPT_POSITIONAL_V ) PORT_POSITIONS(7) PORT_REMAP_TABLE(dogpatch_controller_table) PORT_SENSITIVITY(5) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_H) PORT_CENTERDELTA(0) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME ( 0x03, 0x02, "Number of Cans" ) PORT_CONDITION("IN2",0x20,PORTCOND_EQUALS,0x20) PORT_DIPLOCATION("SW:1,2")
PORT_DIPSETTING ( 0x03, "10" )
PORT_DIPSETTING ( 0x02, "15" )
@@ -2114,19 +2114,19 @@ static const UINT32 spcenctr_controller_table[] =
static INPUT_PORTS_START( spcenctr )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
/* horizontal range is limited to 12 - 46 by stoppers on the control for 35 positions */
PORT_BIT( 0x3f, 17, IPT_POSITIONAL ) PORT_POSITIONS(35) PORT_REMAP_TABLE(spcenctr_controller_table+12) PORT_SENSITIVITY(5) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_REVERSE /* 6 bit horiz encoder */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
/* vertical range is limited to 22 - 41 by stoppers on the control for 20 positions */
PORT_BIT( 0x3f, 19, IPT_POSITIONAL_V ) PORT_POSITIONS(20) PORT_REMAP_TABLE(spcenctr_controller_table+22) PORT_SENSITIVITY(5) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_REVERSE /* 6 bit vert encoder - pushing control in makes ship move faster */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* not connected */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* marked as COIN #2, but the software never reads it */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Bonus_Life ) ) PORT_CONDITION("IN2",0x30,PORTCOND_EQUALS,0x00) PORT_DIPLOCATION("F3:1,2")
PORT_DIPSETTING( 0x00, "2000 4000 8000" )
PORT_DIPSETTING( 0x01, "3000 6000 12000" )
@@ -2223,7 +2223,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( phantom2 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -2233,7 +2233,7 @@ static INPUT_PORTS_START( phantom2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* not connected */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* not connected */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME ( 0x01, 0x00, DEF_STR( Coinage ) ) PORT_CONDITION("IN1",0x20,PORTCOND_EQUALS,0x20) PORT_DIPLOCATION("SW:1")
PORT_DIPSETTING ( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING ( 0x00, DEF_STR( 1C_1C ) )
@@ -2354,7 +2354,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( bowler )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_DIPNAME ( 0x03, 0x00, DEF_STR( Language ) ) PORT_CONDITION("IN0",0x80,PORTCOND_EQUALS,0x00) PORT_DIPLOCATION("B3:1,2")
PORT_DIPSETTING ( 0x00, DEF_STR( English ) )
PORT_DIPSETTING ( 0x01, DEF_STR( French ) )
@@ -2377,7 +2377,7 @@ static INPUT_PORTS_START( bowler )
PORT_DIPSETTING ( 0x40, "Cocktail (not functional)" )
PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_HIGH, "B3:8" )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Hook/Straight") PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -2387,10 +2387,10 @@ static INPUT_PORTS_START( bowler )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(10) PORT_KEYDELTA(50) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0xff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(10) PORT_KEYDELTA(10) PORT_PLAYER(1)
INPUT_PORTS_END
@@ -2546,7 +2546,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( invaders )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW:8")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -2555,7 +2555,7 @@ static INPUT_PORTS_START( invaders )
PORT_BIT( 0x70, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(invaders_in0_control_r, 0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(invaders_sw5_r, 0)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(invaders_coin_input_r, 0)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -2563,7 +2563,7 @@ static INPUT_PORTS_START( invaders )
PORT_BIT( 0x70, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(invaders_in1_control_r, 0)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW:3,4")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -2579,19 +2579,19 @@ static INPUT_PORTS_START( invaders )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
/* fake port for reading the coin input */
- PORT_START_TAG(INVADERS_COIN_INPUT_PORT_TAG)
+ PORT_START(INVADERS_COIN_INPUT_PORT_TAG)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
/* fake port for cabinet type */
- PORT_START_TAG(INVADERS_CAB_TYPE_PORT_TAG)
+ PORT_START(INVADERS_CAB_TYPE_PORT_TAG)
PORT_CONFNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_CONFSETTING( 0x00, DEF_STR( Upright ) )
PORT_CONFSETTING( 0x01, DEF_STR( Cocktail ) )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
/* fake ports for handling the various input ports based on cabinet type */
- PORT_START_TAG(INVADERS_SW6_SW7_PORT_TAG)
+ PORT_START(INVADERS_SW6_SW7_PORT_TAG)
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unused ) ) PORT_DIPLOCATION("SW:7")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -2600,19 +2600,19 @@ static INPUT_PORTS_START( invaders )
PORT_DIPSETTING( 0x02, DEF_STR( On ) )
PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG(INVADERS_SW5_PORT_TAG)
+ PORT_START(INVADERS_SW5_PORT_TAG)
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unused ) ) PORT_DIPLOCATION("SW:5")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG(INVADERS_P1_CONTROL_PORT_TAG)
+ PORT_START(INVADERS_P1_CONTROL_PORT_TAG)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0xf8, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG(INVADERS_P2_CONTROL_PORT_TAG)
+ PORT_START(INVADERS_P2_CONTROL_PORT_TAG)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
@@ -2673,10 +2673,10 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( blueshrk )
- PORT_START_TAG(BLUESHRK_SPEAR_PORT_TAG)
+ PORT_START(BLUESHRK_SPEAR_PORT_TAG)
PORT_BIT( 0xff, 0x45, IPT_PADDLE ) PORT_CROSSHAIR(X, 1.0, 0.0, 0.139) PORT_MINMAX(0x08,0x82) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_PLAYER(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(blueshrk_coin_input_r, 0)
PORT_DIPNAME ( 0x04, 0x04, DEF_STR( Unused ) ) PORT_CONDITION("IN1",0x80,PORTCOND_EQUALS,0x80) PORT_DIPLOCATION("SW:3")
@@ -2694,7 +2694,7 @@ static INPUT_PORTS_START( blueshrk )
PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW:8" )
/* fake port for reading the coin input */
- PORT_START_TAG(BLUESHRK_COIN_INPUT_PORT_TAG)
+ PORT_START(BLUESHRK_COIN_INPUT_PORT_TAG)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -2754,7 +2754,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( invad2ct )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_SERVICE_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW:8" )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2764,7 +2764,7 @@ static INPUT_PORTS_START( invad2ct )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* labeled NAMED RESET, but not read by the software */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(invaders_coin_input_r, 0)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -2774,7 +2774,7 @@ static INPUT_PORTS_START( invad2ct )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW:3,4")
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_2C ) )
@@ -2792,7 +2792,7 @@ static INPUT_PORTS_START( invad2ct )
PORT_DIPSETTING( 0x00, "2000" )
/* fake port for reading the coin input */
- PORT_START_TAG(INVAD2CT_COIN_INPUT_PORT_TAG)
+ PORT_START(INVAD2CT_COIN_INPUT_PORT_TAG)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c
index b12a446b6c6..8136312ee73 100644
--- a/src/mame/drivers/mwarr.c
+++ b/src/mame/drivers/mwarr.c
@@ -152,7 +152,7 @@ static ADDRESS_MAP_START( mwarr_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
static INPUT_PORTS_START( mwarr )
- PORT_START
+ PORT_START("P1_P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -170,14 +170,14 @@ static INPUT_PORTS_START( mwarr )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SPECIAL ) // otherwise it doesn't boot
PORT_BIT( 0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Very_Easy ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) )
diff --git a/src/mame/drivers/mystston.c b/src/mame/drivers/mystston.c
index 9839d9636d7..1d32082de44 100644
--- a/src/mame/drivers/mystston.c
+++ b/src/mame/drivers/mystston.c
@@ -129,7 +129,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( mystston )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -139,7 +139,7 @@ static INPUT_PORTS_START( mystston )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED(coin_inserted, 0)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
@@ -149,7 +149,7 @@ static INPUT_PORTS_START( mystston )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME(0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
@@ -175,7 +175,7 @@ static INPUT_PORTS_START( mystston )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME(0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c
index e3d815104f3..b2fc607a1e0 100644
--- a/src/mame/drivers/mystwarr.c
+++ b/src/mame/drivers/mystwarr.c
@@ -1090,7 +1090,7 @@ MACHINE_DRIVER_END
/**********************************************************************************/
static INPUT_PORTS_START( mystwarr )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -1100,7 +1100,7 @@ static INPUT_PORTS_START( mystwarr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM ready (always 1) */
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
@@ -1116,7 +1116,7 @@ static INPUT_PORTS_START( mystwarr )
PORT_DIPSETTING( 0x40, "2")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -1126,7 +1126,7 @@ static INPUT_PORTS_START( mystwarr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -1136,7 +1136,7 @@ static INPUT_PORTS_START( mystwarr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
@@ -1146,7 +1146,7 @@ static INPUT_PORTS_START( mystwarr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START_TAG("P4")
+ PORT_START("P4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
@@ -1158,7 +1158,7 @@ static INPUT_PORTS_START( mystwarr )
INPUT_PORTS_END
static INPUT_PORTS_START( metamrph )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1168,7 +1168,7 @@ static INPUT_PORTS_START( metamrph )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM ready (always 1) */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL )
@@ -1186,7 +1186,7 @@ static INPUT_PORTS_START( metamrph )
PORT_DIPSETTING( 0x80, DEF_STR( No ))
PORT_DIPSETTING( 0x00, DEF_STR( Yes ))
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -1196,7 +1196,7 @@ static INPUT_PORTS_START( metamrph )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -1206,7 +1206,7 @@ static INPUT_PORTS_START( metamrph )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
@@ -1216,7 +1216,7 @@ static INPUT_PORTS_START( metamrph )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START_TAG("P4")
+ PORT_START("P4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
@@ -1228,7 +1228,7 @@ static INPUT_PORTS_START( metamrph )
INPUT_PORTS_END
static INPUT_PORTS_START( viostorm )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1238,7 +1238,7 @@ static INPUT_PORTS_START( viostorm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM ready (always 1) */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL )
@@ -1256,7 +1256,7 @@ static INPUT_PORTS_START( viostorm )
PORT_DIPSETTING( 0x00, "3")
PORT_DIPSETTING( 0x80, "2")
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -1266,7 +1266,7 @@ static INPUT_PORTS_START( viostorm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -1276,7 +1276,7 @@ static INPUT_PORTS_START( viostorm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
@@ -1286,7 +1286,7 @@ static INPUT_PORTS_START( viostorm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START_TAG("P4")
+ PORT_START("P4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
@@ -1298,7 +1298,7 @@ static INPUT_PORTS_START( viostorm )
INPUT_PORTS_END
static INPUT_PORTS_START( dadandrn )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1308,7 +1308,7 @@ static INPUT_PORTS_START( dadandrn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM ready (always 1) */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL )
@@ -1322,7 +1322,7 @@ static INPUT_PORTS_START( dadandrn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -1332,7 +1332,7 @@ static INPUT_PORTS_START( dadandrn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -1342,7 +1342,7 @@ static INPUT_PORTS_START( dadandrn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
@@ -1352,7 +1352,7 @@ static INPUT_PORTS_START( dadandrn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START_TAG("P4")
+ PORT_START("P4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
@@ -1364,7 +1364,7 @@ static INPUT_PORTS_START( dadandrn )
INPUT_PORTS_END
static INPUT_PORTS_START( martchmp )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1374,7 +1374,7 @@ static INPUT_PORTS_START( martchmp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM ready (always 1) */
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
@@ -1388,7 +1388,7 @@ static INPUT_PORTS_START( martchmp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -1398,7 +1398,7 @@ static INPUT_PORTS_START( martchmp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -1408,7 +1408,7 @@ static INPUT_PORTS_START( martchmp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
@@ -1418,7 +1418,7 @@ static INPUT_PORTS_START( martchmp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START_TAG("P4")
+ PORT_START("P4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
diff --git a/src/mame/drivers/n8080.c b/src/mame/drivers/n8080.c
index 1b53e228b06..3747e49ad60 100644
--- a/src/mame/drivers/n8080.c
+++ b/src/mame/drivers/n8080.c
@@ -150,7 +150,7 @@ MACHINE_DRIVER_END
static INPUT_PORTS_START( spacefev )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
@@ -160,7 +160,7 @@ static INPUT_PORTS_START( spacefev )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
@@ -170,7 +170,7 @@ static INPUT_PORTS_START( spacefev )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) /* enables diagnostic ROM at $1c00 */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ))
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -195,13 +195,13 @@ static INPUT_PORTS_START( spacefev )
PORT_DIPSETTING( 0x80, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ))
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
INPUT_PORTS_END
static INPUT_PORTS_START( highsplt )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
@@ -211,7 +211,7 @@ static INPUT_PORTS_START( highsplt )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
@@ -221,7 +221,7 @@ static INPUT_PORTS_START( highsplt )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) /* enables diagnostic ROM at $2000 */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ))
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -245,13 +245,13 @@ static INPUT_PORTS_START( highsplt )
PORT_DIPSETTING( 0x80, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ))
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
INPUT_PORTS_END
static INPUT_PORTS_START( spacelnc )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
@@ -261,7 +261,7 @@ static INPUT_PORTS_START( spacelnc )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
@@ -271,7 +271,7 @@ static INPUT_PORTS_START( spacelnc )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) /* enables diagnostic ROM at $2000 */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ))
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -295,13 +295,13 @@ static INPUT_PORTS_START( spacelnc )
PORT_DIPSETTING( 0x80, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ))
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
INPUT_PORTS_END
static INPUT_PORTS_START( sheriff )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_RIGHT )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_LEFT )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_UP )
@@ -311,7 +311,7 @@ static INPUT_PORTS_START( sheriff )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_UP )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_DOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_RIGHT ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_LEFT ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_UP ) PORT_COCKTAIL
@@ -321,7 +321,7 @@ static INPUT_PORTS_START( sheriff )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_UP ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_DOWN ) PORT_COCKTAIL
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -331,7 +331,7 @@ static INPUT_PORTS_START( sheriff )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) /* EXP3 enables diagnostic ROM at $2400 */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives )) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -349,7 +349,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( bandido )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_RIGHT )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_LEFT )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_UP )
@@ -359,9 +359,9 @@ static INPUT_PORTS_START( bandido )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_UP )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_DOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -371,7 +371,7 @@ static INPUT_PORTS_START( bandido )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) /* EXP3 enables diagnostic ROM at $2400 */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ))
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -399,7 +399,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( helifire )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
@@ -409,7 +409,7 @@ static INPUT_PORTS_START( helifire )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_COCKTAIL
@@ -419,7 +419,7 @@ static INPUT_PORTS_START( helifire )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -429,7 +429,7 @@ static INPUT_PORTS_START( helifire )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) /* EXP3 */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ))
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -449,7 +449,7 @@ static INPUT_PORTS_START( helifire )
/* potentiometers */
- PORT_START_TAG("POT0") /* 04 */
+ PORT_START("POT0") /* 04 */
PORT_DIPNAME( 0xff, 0x50, "VR1 sun brightness" )
PORT_DIPSETTING( 0x00, "00" )
PORT_DIPSETTING( 0x10, "10" )
@@ -460,7 +460,7 @@ static INPUT_PORTS_START( helifire )
PORT_DIPSETTING( 0x60, "60" )
PORT_DIPSETTING( 0x70, "70" )
- PORT_START_TAG("POT1") /* 05 */
+ PORT_START("POT1") /* 05 */
PORT_DIPNAME( 0xff, 0x00, "VR2 sea brightness" )
PORT_DIPSETTING( 0x00, "00" )
PORT_DIPSETTING( 0x10, "10" )
diff --git a/src/mame/drivers/namcofl.c b/src/mame/drivers/namcofl.c
index 2d224cf2b0c..b85704cf689 100644
--- a/src/mame/drivers/namcofl.c
+++ b/src/mame/drivers/namcofl.c
@@ -209,7 +209,7 @@ static ADDRESS_MAP_START( namcofl_mem, ADDRESS_SPACE_PROGRAM, 32 )
ADDRESS_MAP_END
static INPUT_PORTS_START( namcofl )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_SERVICE( 0x04, IP_ACTIVE_HIGH )
@@ -219,7 +219,7 @@ static INPUT_PORTS_START( namcofl )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // C75 status
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -229,7 +229,7 @@ static INPUT_PORTS_START( namcofl )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) // button B
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -239,7 +239,7 @@ static INPUT_PORTS_START( namcofl )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -249,13 +249,13 @@ static INPUT_PORTS_START( namcofl )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("ACCEL")
+ PORT_START("ACCEL")
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START_TAG("BRAKE")
+ PORT_START("BRAKE")
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START_TAG("WHEEL")
+ PORT_START("WHEEL")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
INPUT_PORTS_END
diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c
index 06bef4b606a..29b1c63f9fc 100644
--- a/src/mame/drivers/namcona1.c
+++ b/src/mame/drivers/namcona1.c
@@ -259,7 +259,7 @@ static WRITE16_HANDLER( namcona1_nvram_w )
/***************************************************************************/
static INPUT_PORTS_START( namcona1_joy )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -269,7 +269,7 @@ static INPUT_PORTS_START( namcona1_joy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -279,7 +279,7 @@ static INPUT_PORTS_START( namcona1_joy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
@@ -289,7 +289,7 @@ static INPUT_PORTS_START( namcona1_joy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START_TAG("P4")
+ PORT_START("P4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(4)
@@ -299,7 +299,7 @@ static INPUT_PORTS_START( namcona1_joy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, "DIP2 (Freeze)" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -315,7 +315,7 @@ static INPUT_PORTS_START( namcona1_joy )
INPUT_PORTS_END
static INPUT_PORTS_START( namcona1_quiz )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -325,7 +325,7 @@ static INPUT_PORTS_START( namcona1_quiz )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
@@ -335,7 +335,7 @@ static INPUT_PORTS_START( namcona1_quiz )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
@@ -345,7 +345,7 @@ static INPUT_PORTS_START( namcona1_quiz )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START_TAG("P4")
+ PORT_START("P4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
@@ -355,7 +355,7 @@ static INPUT_PORTS_START( namcona1_quiz )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, "DIP2 (Freeze)" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -371,7 +371,7 @@ static INPUT_PORTS_START( namcona1_quiz )
INPUT_PORTS_END
static INPUT_PORTS_START( namcona2_joy )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, "DIP2 (Freeze)" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -386,7 +386,7 @@ static INPUT_PORTS_START( namcona2_joy )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SERVICE )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -396,7 +396,7 @@ static INPUT_PORTS_START( namcona2_joy )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -406,7 +406,7 @@ static INPUT_PORTS_START( namcona2_joy )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
@@ -416,7 +416,7 @@ static INPUT_PORTS_START( namcona2_joy )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START3 )
- PORT_START_TAG("P4")
+ PORT_START("P4")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(4)
@@ -426,7 +426,7 @@ static INPUT_PORTS_START( namcona2_joy )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START4 )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN2 )
@@ -435,7 +435,7 @@ static INPUT_PORTS_START( namcona2_joy )
INPUT_PORTS_END
static INPUT_PORTS_START( namcona2_quiz )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, "DIP2 (Freeze)" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -450,7 +450,7 @@ static INPUT_PORTS_START( namcona2_quiz )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SERVICE )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON4 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 )
@@ -460,7 +460,7 @@ static INPUT_PORTS_START( namcona2_quiz )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
@@ -470,7 +470,7 @@ static INPUT_PORTS_START( namcona2_quiz )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(3)
@@ -480,7 +480,7 @@ static INPUT_PORTS_START( namcona2_quiz )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START3 )
- PORT_START_TAG("P4")
+ PORT_START("P4")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(4)
@@ -490,7 +490,7 @@ static INPUT_PORTS_START( namcona2_quiz )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START4 )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN2 )
diff --git a/src/mame/drivers/namconb1.c b/src/mame/drivers/namconb1.c
index 9aa8a268690..79323acf205 100644
--- a/src/mame/drivers/namconb1.c
+++ b/src/mame/drivers/namconb1.c
@@ -1356,11 +1356,11 @@ ROM_END
/***************************************************************/
static INPUT_PORTS_START( gunbulet )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, "DSW2 (Unused)" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1370,31 +1370,31 @@ static INPUT_PORTS_START( gunbulet )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* C75 status */
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
- PORT_START_TAG("LIGHT0_X")
+ PORT_START("LIGHT0_X")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(4)
- PORT_START_TAG("LIGHT0_Y")
+ PORT_START("LIGHT0_Y")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(4)
- PORT_START_TAG("LIGHT1_X")
+ PORT_START("LIGHT1_X")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(4) PORT_PLAYER(2)
- PORT_START_TAG("LIGHT1_Y")
+ PORT_START("LIGHT1_Y")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(4) PORT_PLAYER(2)
INPUT_PORTS_END
#ifdef UNUSED_DEFINITION
static INPUT_PORTS_START( machbrkr )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, "Freeze Screen" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1416,25 +1416,25 @@ static INPUT_PORTS_START( machbrkr )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* C75 status */
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) // self test: up
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) // self test: enter
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON3 ) // self test: down
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START3 )
- PORT_START_TAG("P4")
+ PORT_START("P4")
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(4)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(4)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(4)
@@ -1443,11 +1443,11 @@ INPUT_PORTS_END
#endif
static INPUT_PORTS_START( outfxies )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, "Freeze Screen" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1469,7 +1469,7 @@ static INPUT_PORTS_START( outfxies )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* C75 status */
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -1479,7 +1479,7 @@ static INPUT_PORTS_START( outfxies )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -1491,11 +1491,11 @@ static INPUT_PORTS_START( outfxies )
INPUT_PORTS_END
static INPUT_PORTS_START( namconb1 )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, "DSW2 (Unused)" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1517,7 +1517,7 @@ static INPUT_PORTS_START( namconb1 )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* C75 status */
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -1527,7 +1527,7 @@ static INPUT_PORTS_START( namconb1 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/namcond1.c b/src/mame/drivers/namcond1.c
index 755faf7d533..e36ae85a992 100644
--- a/src/mame/drivers/namcond1.c
+++ b/src/mame/drivers/namcond1.c
@@ -88,7 +88,7 @@ ADDRESS_MAP_END
/*************************************************************/
static INPUT_PORTS_START( namcond1 )
- PORT_START /* player 1 */
+ PORT_START("P1_P2") /* player 1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
@@ -106,7 +106,7 @@ static INPUT_PORTS_START( namcond1 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START /* dipswitches */
+ PORT_START("DSW") /* dipswitches */
PORT_DIPNAME( 0x0100, 0x0100, "Freeze" )
PORT_DIPSETTING( 0x0100, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c
index 637237604e0..44970e54c4d 100644
--- a/src/mame/drivers/namcos1.c
+++ b/src/mame/drivers/namcos1.c
@@ -503,7 +503,7 @@ ADDRESS_MAP_END
/* Standard Namco System 1 input port definition */
static INPUT_PORTS_START( ns1 )
- PORT_START_TAG( "CONTROL0" )
+ PORT_START( "CONTROL0" )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
@@ -513,7 +513,7 @@ static INPUT_PORTS_START( ns1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG( "CONTROL1" )
+ PORT_START( "CONTROL1" )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
@@ -523,7 +523,7 @@ static INPUT_PORTS_START( ns1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG( "DIPSW" )
+ PORT_START( "DIPSW" )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
@@ -547,7 +547,7 @@ static INPUT_PORTS_START( ns1 )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG( "COIN" )
+ PORT_START( "COIN" )
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* OUT:coin lockout */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* OUT:coin counter 1 */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* OUT:coin counter 2 */
@@ -614,10 +614,10 @@ static INPUT_PORTS_START( quester )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG( "PADDLE0" ) /* fake input port for player 1 paddle */
+ PORT_START( "PADDLE0" ) /* fake input port for player 1 paddle */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15)
- PORT_START_TAG( "PADDLE1" ) /* fake input port for player 2 paddle */
+ PORT_START( "PADDLE1" ) /* fake input port for player 2 paddle */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15) PORT_PLAYER(2)
INPUT_PORTS_END
@@ -697,42 +697,42 @@ static INPUT_PORTS_START( berabohm )
bit 7 is not actually read by the game but I use it to simulate the second
switch
*/
- PORT_START_TAG( "IN0" )
+ PORT_START( "IN0" )
PORT_BIT( 0x3f, 0x00, IPT_SPECIAL )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON4 )
- PORT_START_TAG( "IN1" )
+ PORT_START( "IN1" )
PORT_BIT( 0x3f, 0x00, IPT_SPECIAL )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON2 )
- PORT_START_TAG( "IN2" )
+ PORT_START( "IN2" )
PORT_BIT( 0x3f, 0x00, IPT_SPECIAL )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_START_TAG( "IN3" )
+ PORT_START( "IN3" )
PORT_BIT( 0x3f, 0x00, IPT_SPECIAL )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
#else
- PORT_START_TAG( "IN0" )
+ PORT_START( "IN0" )
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON4 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON5 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON6 )
- PORT_START_TAG( "IN1" )
+ PORT_START( "IN1" )
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 )
- PORT_START_TAG( "IN2" )
+ PORT_START( "IN2" )
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_PLAYER(2)
- PORT_START_TAG( "IN3" )
+ PORT_START( "IN3" )
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2)
@@ -811,7 +811,7 @@ static INPUT_PORTS_START( faceoff )
PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG( "IN0" )
+ PORT_START( "IN0" )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_PLAYER(1)
@@ -819,7 +819,7 @@ static INPUT_PORTS_START( faceoff )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG( "IN1" )
+ PORT_START( "IN1" )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_PLAYER(1)
@@ -827,7 +827,7 @@ static INPUT_PORTS_START( faceoff )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG( "IN2" )
+ PORT_START( "IN2" )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_PLAYER(2)
@@ -835,7 +835,7 @@ static INPUT_PORTS_START( faceoff )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG( "IN3" )
+ PORT_START( "IN3" )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_PLAYER(2)
diff --git a/src/mame/drivers/namcos10.c b/src/mame/drivers/namcos10.c
index d00e17e814c..175267dd850 100644
--- a/src/mame/drivers/namcos10.c
+++ b/src/mame/drivers/namcos10.c
@@ -403,12 +403,12 @@ MACHINE_DRIVER_END
static INPUT_PORTS_START( namcos10 )
/* IN 0 */
- PORT_START
+ PORT_START("SYSTEM")
PORT_SERVICE_NO_TOGGLE( 0x8000, IP_ACTIVE_HIGH )
PORT_BIT( 0x7fff, IP_ACTIVE_HIGH, IPT_UNUSED )
/* IN 1 */
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_START1 )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x8000, DEF_STR( On ) )
@@ -428,7 +428,7 @@ static INPUT_PORTS_START( namcos10 )
PORT_BIT( 0x000f, IP_ACTIVE_HIGH, IPT_UNUSED )
/* IN 2 */
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_START2 )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x8000, DEF_STR( On ) )
@@ -448,7 +448,7 @@ static INPUT_PORTS_START( namcos10 )
PORT_BIT( 0x000f, IP_ACTIVE_HIGH, IPT_UNUSED )
/* IN 3 */
- PORT_START
+ PORT_START("COINS")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
INPUT_PORTS_END
diff --git a/src/mame/drivers/namcos11.c b/src/mame/drivers/namcos11.c
index 6ad2c37d641..d0e723de1ab 100644
--- a/src/mame/drivers/namcos11.c
+++ b/src/mame/drivers/namcos11.c
@@ -904,7 +904,7 @@ static MACHINE_DRIVER_START( coh110 )
MACHINE_DRIVER_END
static INPUT_PORTS_START( namcos11 )
- PORT_START_TAG( "SWITCH" )
+ PORT_START( "SWITCH" )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* read by pocket racer */
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -918,7 +918,7 @@ static INPUT_PORTS_START( namcos11 )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
- PORT_START_TAG( "PLAYER1" )
+ PORT_START( "PLAYER1" )
PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -928,7 +928,7 @@ static INPUT_PORTS_START( namcos11 )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START_TAG( "PLAYER2" )
+ PORT_START( "PLAYER2" )
PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER( 2 )
PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER( 2 )
PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER( 2 )
@@ -938,7 +938,7 @@ static INPUT_PORTS_START( namcos11 )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER( 2 )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_START2 )
- PORT_START_TAG( "PLAYER3" )
+ PORT_START( "PLAYER3" )
PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER( 3 )
PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER( 3 )
PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER( 3 )
@@ -948,7 +948,7 @@ static INPUT_PORTS_START( namcos11 )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER( 3 )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_START3 )
- PORT_START_TAG( "PLAYER4" )
+ PORT_START( "PLAYER4" )
PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER( 4 )
PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER( 4 )
PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER( 4 )
@@ -958,7 +958,7 @@ static INPUT_PORTS_START( namcos11 )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER( 4 )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_START4 )
- PORT_START_TAG( "COIN" )
+ PORT_START( "COIN" )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN2 )
@@ -1101,16 +1101,16 @@ static INPUT_PORTS_START( ptblnk2a )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG( "GUN1X" )
+ PORT_START( "GUN1X" )
PORT_BIT( 0xffff, 0x022f, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX( 0xd8, 0x387 ) PORT_SENSITIVITY( 100 ) PORT_KEYDELTA( 15 ) PORT_PLAYER( 1 )
- PORT_START_TAG( "GUN1Y" )
+ PORT_START( "GUN1Y" )
PORT_BIT( 0xffff, 0x00a8, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_MINMAX( 0x2c, 0x11b ) PORT_SENSITIVITY( 50 ) PORT_KEYDELTA( 15 ) PORT_PLAYER( 1 )
- PORT_START_TAG( "GUN2X" )
+ PORT_START( "GUN2X" )
PORT_BIT( 0xffff, 0x022f, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX( 0xd8, 0x387 ) PORT_SENSITIVITY( 100 ) PORT_KEYDELTA( 15 ) PORT_PLAYER( 2 )
- PORT_START_TAG( "GUN2Y" )
+ PORT_START( "GUN2Y" )
PORT_BIT( 0xffff, 0x00a8, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_MINMAX( 0x2c, 0x11b ) PORT_SENSITIVITY( 50 ) PORT_KEYDELTA( 15 ) PORT_PLAYER( 2 )
INPUT_PORTS_END
@@ -1162,10 +1162,10 @@ static INPUT_PORTS_START( pocketrc )
PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG( "STEERING" )
+ PORT_START( "STEERING" )
PORT_BIT( 0xffff, 0x0000, IPT_PADDLE ) PORT_MINMAX( 0xff00, 0x00ff ) PORT_SENSITIVITY( 100 ) PORT_KEYDELTA( 3 ) PORT_CENTERDELTA( 128 ) PORT_PLAYER( 1 ) PORT_REVERSE
- PORT_START_TAG( "GAS" )
+ PORT_START( "GAS" )
PORT_BIT( 0x00ff, 0x0000, IPT_PEDAL ) PORT_MINMAX( 0x0000, 0x00ff ) PORT_SENSITIVITY( 100 ) PORT_KEYDELTA( 15 ) PORT_PLAYER( 1 ) PORT_REVERSE
INPUT_PORTS_END
diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c
index 88f88717f87..bba7254488a 100644
--- a/src/mame/drivers/namcos12.c
+++ b/src/mame/drivers/namcos12.c
@@ -1504,7 +1504,7 @@ static MACHINE_DRIVER_START( coh700 )
MACHINE_DRIVER_END
static INPUT_PORTS_START( namcos12 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0080, 0x0080, DEF_STR(Service_Mode) )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1513,7 +1513,7 @@ static INPUT_PORTS_START( namcos12 )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_BIT( 0xff3f, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -1531,7 +1531,7 @@ static INPUT_PORTS_START( namcos12 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
@@ -1559,16 +1559,16 @@ static INPUT_PORTS_START( ptblank2 )
PORT_MODIFY("IN1")
PORT_BIT( 0x00ee, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("LIGHT0_X")
+ PORT_START("LIGHT0_X")
PORT_BIT( 0xffff, 0x022f, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX(0xd8,0x387) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("LIGHT0_Y")
+ PORT_START("LIGHT0_Y")
PORT_BIT( 0xffff, 0x00a8, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_MINMAX(0x2c,0x11b) PORT_SENSITIVITY(50) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("LIGHT1_X")
+ PORT_START("LIGHT1_X")
PORT_BIT( 0xffff, 0x022f, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX(0xd8,0x387) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_PLAYER(2)
- PORT_START_TAG("LIGHT1_Y")
+ PORT_START("LIGHT1_Y")
PORT_BIT( 0xffff, 0x00a8, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_MINMAX(0x2c,0x11b) PORT_SENSITIVITY(50) PORT_KEYDELTA(15) PORT_PLAYER(2)
INPUT_PORTS_END
@@ -1581,16 +1581,16 @@ static INPUT_PORTS_START( ghlpanic )
PORT_MODIFY("IN1")
PORT_BIT( 0x00ee, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("LIGHT0_X")
+ PORT_START("LIGHT0_X")
PORT_BIT( 0xffff, 0x0210, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX(0xc0,0x35f) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("LIGHT0_Y")
+ PORT_START("LIGHT0_Y")
PORT_BIT( 0xffff, 0x0091, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_MINMAX(0x1a,0x109) PORT_SENSITIVITY(50) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("LIGHT1_X")
+ PORT_START("LIGHT1_X")
PORT_BIT( 0xffff, 0x0210, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX(0xc0,0x35f) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_PLAYER(2)
- PORT_START_TAG("LIGHT1_Y")
+ PORT_START("LIGHT1_Y")
PORT_BIT( 0xffff, 0x0091, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_MINMAX(0x1a,0x109) PORT_SENSITIVITY(50) PORT_KEYDELTA(15) PORT_PLAYER(2)
INPUT_PORTS_END
@@ -1606,10 +1606,10 @@ static INPUT_PORTS_START( golgo13 )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x10ee, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("LIGHT0_X")
+ PORT_START("LIGHT0_X")
PORT_BIT( 0xffff, 0x019b, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX(0x9c,0x29b) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("LIGHT0_Y")
+ PORT_START("LIGHT0_Y")
PORT_BIT( 0xffff, 0x00fe, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, -1.0, 0.0, 0) PORT_MINMAX(0x1f,0x1de) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_PLAYER(1) PORT_REVERSE
INPUT_PORTS_END
diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c
index ff42f2b2318..9ade501eb94 100644
--- a/src/mame/drivers/namcos2.c
+++ b/src/mame/drivers/namcos2.c
@@ -779,7 +779,7 @@ ADDRESS_MAP_END
/*************************************************************/
#define NAMCOS2_MCU_PORT_B_DEFAULT \
- PORT_START_TAG("MCUB") /* 63B05Z0 - PORT B */ \
+ PORT_START("MCUB") /* 63B05Z0 - PORT B */ \
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) \
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) \
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) \
@@ -790,7 +790,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
#define NAMCOS2_MCU_PORT_C_DEFAULT \
- PORT_START_TAG("MCUC") /* 63B05Z0 - PORT C & SCI */ \
+ PORT_START("MCUC") /* 63B05Z0 - PORT C & SCI */ \
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED ) \
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 ) \
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 ) \
@@ -798,25 +798,25 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
#define NAMCOS2_MCU_ANALOG_PORT_DEFAULT \
- PORT_START_TAG("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 */ \
+ PORT_START("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 */ \
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) \
- PORT_START_TAG("AN1") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 */ \
+ PORT_START("AN1") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 */ \
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) \
- PORT_START_TAG("AN2") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 */ \
+ PORT_START("AN2") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 */ \
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) \
- PORT_START_TAG("AN3") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 */ \
+ PORT_START("AN3") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 */ \
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) \
- PORT_START_TAG("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 */ \
+ PORT_START("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 */ \
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) \
- PORT_START_TAG("AN5") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 5 */ \
+ PORT_START("AN5") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 5 */ \
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) \
- PORT_START_TAG("AN6") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 6 */ \
+ PORT_START("AN6") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 6 */ \
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) \
- PORT_START_TAG("AN7") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 7 */ \
+ PORT_START("AN7") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 7 */ \
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
#define NAMCOS2_MCU_PORT_H_DEFAULT \
- PORT_START_TAG("MCUH") /* 63B05Z0 - PORT H */ \
+ PORT_START("MCUH") /* 63B05Z0 - PORT H */ \
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) \
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) \
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) \
@@ -827,7 +827,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
#define NAMCOS2_MCU_DIPSW_DEFAULT \
- PORT_START_TAG("DSW") /* 63B05Z0 - $2000 DIP SW */ \
+ PORT_START("DSW") /* 63B05Z0 - $2000 DIP SW */ \
PORT_DIPNAME( 0x01, 0x01, "Video Display") \
PORT_DIPSETTING( 0x01, DEF_STR( Normal ) ) \
PORT_DIPSETTING( 0x00, "Frozen" ) \
@@ -852,13 +852,13 @@ ADDRESS_MAP_END
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
#define NAMCOS2_MCU_DIAL_DEFAULT \
- PORT_START_TAG("MCUDI0") /* 63B05Z0 - $3000 */ \
+ PORT_START("MCUDI0") /* 63B05Z0 - $3000 */ \
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) \
- PORT_START_TAG("MCUDI1") /* 63B05Z0 - $3001 */ \
+ PORT_START("MCUDI1") /* 63B05Z0 - $3001 */ \
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) \
- PORT_START_TAG("MCUDI2") /* 63B05Z0 - $3002 */ \
+ PORT_START("MCUDI2") /* 63B05Z0 - $3002 */ \
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) \
- PORT_START_TAG("MCUDI3") /* 63B05Z0 - $3003 */ \
+ PORT_START("MCUDI3") /* 63B05Z0 - $3003 */ \
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
/*************************************************************/
@@ -888,7 +888,7 @@ static INPUT_PORTS_START( default )
INPUT_PORTS_END
static INPUT_PORTS_START( gollygho )
- PORT_START_TAG("MCUB")
+ PORT_START("MCUB")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -900,24 +900,24 @@ static INPUT_PORTS_START( gollygho )
NAMCOS2_MCU_PORT_C_DEFAULT
- PORT_START_TAG("AN0")
+ PORT_START("AN0")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(8) PORT_REVERSE
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(8) PORT_REVERSE
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(8) PORT_PLAYER(2) PORT_REVERSE
- PORT_START_TAG("AN3")
+ PORT_START("AN3")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(8) PORT_PLAYER(2) PORT_REVERSE
- PORT_START_TAG("AN4")
+ PORT_START("AN4")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN5")
+ PORT_START("AN5")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN6")
+ PORT_START("AN6")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN7")
+ PORT_START("AN7")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MCUH") /* 63B05Z0 - PORT H */ \
+ PORT_START("MCUH") /* 63B05Z0 - PORT H */ \
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
NAMCOS2_MCU_DIPSW_DEFAULT
@@ -925,7 +925,7 @@ static INPUT_PORTS_START( gollygho )
INPUT_PORTS_END
static INPUT_PORTS_START( bubbletr )
- PORT_START_TAG("MCUB")
+ PORT_START("MCUB")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -937,24 +937,24 @@ static INPUT_PORTS_START( bubbletr )
NAMCOS2_MCU_PORT_C_DEFAULT
- PORT_START_TAG("AN0")
+ PORT_START("AN0")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(8)
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(8)
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(8) PORT_PLAYER(2)
- PORT_START_TAG("AN3")
+ PORT_START("AN3")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(8) PORT_PLAYER(2)
- PORT_START_TAG("AN4")
+ PORT_START("AN4")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN5")
+ PORT_START("AN5")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN6")
+ PORT_START("AN6")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN7")
+ PORT_START("AN7")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MCUH") /* 63B05Z0 - PORT H */ \
+ PORT_START("MCUH") /* 63B05Z0 - PORT H */ \
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
NAMCOS2_MCU_DIPSW_DEFAULT
@@ -962,7 +962,7 @@ static INPUT_PORTS_START( bubbletr )
INPUT_PORTS_END
static INPUT_PORTS_START( finallap )
- PORT_START_TAG("MCUB") /* 63B05Z0 - PORT B */
+ PORT_START("MCUB") /* 63B05Z0 - PORT B */
PORT_DIPNAME( 0x01, 0x01, "PortB 0x01")
PORT_DIPSETTING( 0x01, "H" )
PORT_DIPSETTING( 0x00, "L" )
@@ -977,31 +977,31 @@ static INPUT_PORTS_START( finallap )
PORT_DIPSETTING( 0x00, "Lotus/March" )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("MCUC") /* 63B05Z0 - PORT C & SCI */
+ PORT_START("MCUC") /* 63B05Z0 - PORT C & SCI */
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_SERVICE(0x40, IP_ACTIVE_LOW)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 */
+ PORT_START("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN1") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 */
+ PORT_START("AN1") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN2") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 */
+ PORT_START("AN2") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN3") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 */
+ PORT_START("AN3") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 */
+ PORT_START("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN5") /* Steering Wheel */ /* sensitivity, delta, min, max */
+ PORT_START("AN5") /* Steering Wheel */ /* sensitivity, delta, min, max */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(75) PORT_KEYDELTA(100) PORT_PLAYER(1)
- PORT_START_TAG("AN6") /* Brake Pedal */
+ PORT_START("AN6") /* Brake Pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_PLAYER(2)
- PORT_START_TAG("AN7") /* Accelerator Pedal */
+ PORT_START("AN7") /* Accelerator Pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("MCUH") /* 63B05Z0 - PORT H */
+ PORT_START("MCUH") /* 63B05Z0 - PORT H */
PORT_DIPNAME( 0x01, 0x01, "PortH 0x01")
PORT_DIPSETTING( 0x01, "H" )
PORT_DIPSETTING( 0x00, "L" )
@@ -1031,7 +1031,7 @@ static INPUT_PORTS_START( finallap )
INPUT_PORTS_END
static INPUT_PORTS_START( finalap3 )
- PORT_START_TAG("MCUB") /* 63B05Z0 - PORT B */
+ PORT_START("MCUB") /* 63B05Z0 - PORT B */
PORT_DIPNAME( 0x01, 0x01, "PortB 0x01")
PORT_DIPSETTING( 0x01, "H" )
PORT_DIPSETTING( 0x00, "L" )
@@ -1040,32 +1040,32 @@ static INPUT_PORTS_START( finalap3 )
PORT_DIPSETTING( 0x00, "Lotus/March" )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("MCUC") /* 63B05Z0 - PORT C & SCI */
+ PORT_START("MCUC") /* 63B05Z0 - PORT C & SCI */
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_SERVICE(0x40, IP_ACTIVE_LOW)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 */
+ PORT_START("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN1") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 */
+ PORT_START("AN1") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN2") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 */
+ PORT_START("AN2") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN3") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 */
+ PORT_START("AN3") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 */
+ PORT_START("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN5") /* Steering Wheel */ /* sensitivity, delta, min, max */
+ PORT_START("AN5") /* Steering Wheel */ /* sensitivity, delta, min, max */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN6") /* Brake Pedal */
+ PORT_START("AN6") /* Brake Pedal */
PORT_BIT( 0xff, 0xff, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_PLAYER(2)
- PORT_START_TAG("AN7") /* Accelerator Pedal */
+ PORT_START("AN7") /* Accelerator Pedal */
PORT_BIT( 0xff, 0xff, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("MCUH") /* 63B05Z0 - PORT H */
+ PORT_START("MCUH") /* 63B05Z0 - PORT H */
PORT_DIPNAME( 0x01, 0x01, "PortH 0x01")
PORT_DIPSETTING( 0x01, "H" )
PORT_DIPSETTING( 0x00, "L" )
@@ -1095,7 +1095,7 @@ static INPUT_PORTS_START( finalap3 )
INPUT_PORTS_END
static INPUT_PORTS_START( fourtrax )
- PORT_START_TAG("MCUB") /* 63B05Z0 - PORT B */
+ PORT_START("MCUB") /* 63B05Z0 - PORT B */
PORT_DIPNAME( 0x01, 0x01, "PortB 0x01")
PORT_DIPSETTING( 0x01, "H" )
PORT_DIPSETTING( 0x00, "L" )
@@ -1117,7 +1117,7 @@ static INPUT_PORTS_START( fourtrax )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("MCUC") /* 63B05Z0 - PORT C & SCI */
+ PORT_START("MCUC") /* 63B05Z0 - PORT C & SCI */
PORT_DIPNAME( 0x01, 0x01, "PortC 0x01")
PORT_DIPSETTING( 0x01, "H" )
PORT_DIPSETTING( 0x00, "L" )
@@ -1136,28 +1136,28 @@ static INPUT_PORTS_START( fourtrax )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
/* Tags and additional input ports AN5 & AN6 are needed for the port handler */
- PORT_START_TAG("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 2 */
+ PORT_START("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 2 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN1") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 3 */
+ PORT_START("AN1") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 3 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN2") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 4 */
+ PORT_START("AN2") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 4 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN3") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 5 */
+ PORT_START("AN3") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 5 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 6 */
+ PORT_START("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 6 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN5")
+ PORT_START("AN5")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN6")
+ PORT_START("AN6")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN7") /* Steering Wheel 7 */ /* sensitivity, delta, min, max */
+ PORT_START("AN7") /* Steering Wheel 7 */ /* sensitivity, delta, min, max */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(75) PORT_KEYDELTA(100) PORT_PLAYER(1)
- PORT_START_TAG("AN8") /* Brake Pedal 8 */
+ PORT_START("AN8") /* Brake Pedal 8 */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0x7f) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_PLAYER(2)
- PORT_START_TAG("AN9") /* Accelerator Pedal 9 */
+ PORT_START("AN9") /* Accelerator Pedal 9 */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0x7f) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("MCUH") /* 63B05Z0 - PORT H */
+ PORT_START("MCUH") /* 63B05Z0 - PORT H */
PORT_DIPNAME( 0x01, 0x01, "PortH 0x01")
PORT_DIPSETTING( 0x01, "H" )
PORT_DIPSETTING( 0x00, "L" )
@@ -1186,7 +1186,7 @@ static INPUT_PORTS_START( fourtrax )
INPUT_PORTS_END
static INPUT_PORTS_START( assault )
- PORT_START_TAG("MCUB") /* 63B05Z0 - PORT B */
+ PORT_START("MCUB") /* 63B05Z0 - PORT B */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_PLAYER(2)
@@ -1199,7 +1199,7 @@ static INPUT_PORTS_START( assault )
NAMCOS2_MCU_PORT_C_DEFAULT
NAMCOS2_MCU_ANALOG_PORT_DEFAULT
- PORT_START_TAG("MCUH") /* 63B05Z0 - PORT H */
+ PORT_START("MCUH") /* 63B05Z0 - PORT H */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_UP ) PORT_PLAYER(2)
@@ -1212,47 +1212,47 @@ static INPUT_PORTS_START( assault )
NAMCOS2_MCU_DIPSW_DEFAULT
/* These are tagged this way to make easier reads by tag */
- PORT_START_TAG("MCUDI0") /* 63B05Z0 - $3000 */
+ PORT_START("MCUDI0") /* 63B05Z0 - $3000 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT )
- PORT_START_TAG("MCUDI1") /* 63B05Z0 - $3001 */
+ PORT_START("MCUDI1") /* 63B05Z0 - $3001 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MCUDI2") /* 63B05Z0 - $3002 */
+ PORT_START("MCUDI2") /* 63B05Z0 - $3002 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MCUDI3") /* 63B05Z0 - $3003 */
+ PORT_START("MCUDI3") /* 63B05Z0 - $3003 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( suzuka )
- PORT_START_TAG("MCUB") /* 63B05Z0 - PORT B */
+ PORT_START("MCUB") /* 63B05Z0 - PORT B */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
NAMCOS2_MCU_PORT_C_DEFAULT
- PORT_START_TAG("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 */
+ PORT_START("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN1") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 */
+ PORT_START("AN1") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN2") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 */
+ PORT_START("AN2") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN3") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 */
+ PORT_START("AN3") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 */
+ PORT_START("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN5") /* Steering Wheel */
+ PORT_START("AN5") /* Steering Wheel */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(50) PORT_KEYDELTA(100) PORT_PLAYER(1)
- PORT_START_TAG("AN6") /* Brake pedal */
+ PORT_START("AN6") /* Brake pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0x7f) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_PLAYER(2)
- PORT_START_TAG("AN7") /* Accelerator pedal */
+ PORT_START("AN7") /* Accelerator pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("MCUH") /* 63B05Z0 - PORT H */ \
+ PORT_START("MCUH") /* 63B05Z0 - PORT H */ \
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") /* 63B05Z0 - $2000 DIP SW */ \
+ PORT_START("DSW") /* 63B05Z0 - $2000 DIP SW */ \
PORT_DIPNAME( 0x01, 0x01, "Video Display") \
PORT_DIPSETTING( 0x01, DEF_STR( Normal ) ) \
PORT_DIPSETTING( 0x00, "Frozen" ) \
@@ -1280,31 +1280,31 @@ static INPUT_PORTS_START( suzuka )
INPUT_PORTS_END
static INPUT_PORTS_START( luckywld )
- PORT_START_TAG("MCUB") /* 63B05Z0 - PORT B */
+ PORT_START("MCUB") /* 63B05Z0 - PORT B */
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
NAMCOS2_MCU_PORT_C_DEFAULT
- PORT_START_TAG("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 */
+ PORT_START("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(8) PORT_PLAYER(2)
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(8)
- PORT_START_TAG("AN3")
+ PORT_START("AN3")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(8) PORT_PLAYER(2)
- PORT_START_TAG("AN4")
+ PORT_START("AN4")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(8)
- PORT_START_TAG("AN5") /* Steering Wheel */
+ PORT_START("AN5") /* Steering Wheel */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(100) PORT_KEYDELTA(70) PORT_PLAYER(1)
- PORT_START_TAG("AN6") /* Brake pedal */
+ PORT_START("AN6") /* Brake pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0x7f) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_PLAYER(2)
- PORT_START_TAG("AN7") /* Accelerator pedal */
+ PORT_START("AN7") /* Accelerator pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0x7f) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("MCUH") /* 63B05Z0 - PORT H */
+ PORT_START("MCUH") /* 63B05Z0 - PORT H */
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -1315,31 +1315,31 @@ static INPUT_PORTS_START( luckywld )
INPUT_PORTS_END
static INPUT_PORTS_START( sgunner )
- PORT_START_TAG("MCUB") /* 63B05Z0 - PORT B */
+ PORT_START("MCUB") /* 63B05Z0 - PORT B */
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
NAMCOS2_MCU_PORT_C_DEFAULT
- PORT_START_TAG("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 */
+ PORT_START("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN3")
+ PORT_START("AN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN4")
+ PORT_START("AN4")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(8)
- PORT_START_TAG("AN5")
+ PORT_START("AN5")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(8) PORT_PLAYER(2)
- PORT_START_TAG("AN6")
+ PORT_START("AN6")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(8)
- PORT_START_TAG("AN7")
+ PORT_START("AN7")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(8) PORT_PLAYER(2)
- PORT_START_TAG("MCUH") /* 63B05Z0 - PORT H */
+ PORT_START("MCUH") /* 63B05Z0 - PORT H */
PORT_BIT( 0x03, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -1352,30 +1352,30 @@ static INPUT_PORTS_START( sgunner )
INPUT_PORTS_END
static INPUT_PORTS_START( dirtfox )
- PORT_START_TAG("MCUB") /* 63B05Z0 - PORT B */ \
+ PORT_START("MCUB") /* 63B05Z0 - PORT B */ \
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_NAME("Gear Shift Up") /* Gear shift up */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_NAME("Gear Shift Down")/* Gear shift down */
NAMCOS2_MCU_PORT_C_DEFAULT
- PORT_START_TAG("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 */
+ PORT_START("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN1") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 */
+ PORT_START("AN1") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN2") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 */
+ PORT_START("AN2") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN3") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 */
+ PORT_START("AN3") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 */
+ PORT_START("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN5") /* Steering Wheel */
+ PORT_START("AN5") /* Steering Wheel */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(70) PORT_KEYDELTA(50) PORT_PLAYER(1)
- PORT_START_TAG("AN6") /* Brake pedal */
+ PORT_START("AN6") /* Brake pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0x7f) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_PLAYER(2)
- PORT_START_TAG("AN7") /* Accelerator pedal */
+ PORT_START("AN7") /* Accelerator pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0x7f) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("MCUH") /* 63B05Z0 - PORT H */
+ PORT_START("MCUH") /* 63B05Z0 - PORT H */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
NAMCOS2_MCU_DIPSW_DEFAULT
@@ -1383,30 +1383,30 @@ static INPUT_PORTS_START( dirtfox )
INPUT_PORTS_END
static INPUT_PORTS_START( metlhawk )
- PORT_START_TAG("MCUB") /* 63B05Z0 - PORT B */
+ PORT_START("MCUB") /* 63B05Z0 - PORT B */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
NAMCOS2_MCU_PORT_C_DEFAULT
- PORT_START_TAG("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 */
+ PORT_START("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN1") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 */
+ PORT_START("AN1") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN2") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 */
+ PORT_START("AN2") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN3") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 */
+ PORT_START("AN3") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 */
+ PORT_START("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN5") /* Joystick Y */
+ PORT_START("AN5") /* Joystick Y */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(0x20,0xe0) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
- PORT_START_TAG("AN6") /* Joystick X */
+ PORT_START("AN6") /* Joystick X */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0x20,0xe0) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
- PORT_START_TAG("AN7") /* Lever */
+ PORT_START("AN7") /* Lever */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(0x20,0xe0) PORT_SENSITIVITY(100) PORT_KEYDELTA(16) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("MCUH") /* 63B05Z0 - PORT H */
+ PORT_START("MCUH") /* 63B05Z0 - PORT H */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 )
diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c
index 79c8f572a20..966c1a9ef9a 100644
--- a/src/mame/drivers/namcos21.c
+++ b/src/mame/drivers/namcos21.c
@@ -2273,12 +2273,12 @@ static DRIVER_INIT( driveyes )
/*************************************************************/
static INPUT_PORTS_START( s21default )
- PORT_START /* 63B05Z0 - PORT B */
+ PORT_START("PORTB") /* 63B05Z0 - PORT B */
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START /* 63B05Z0 - PORT C & SCI */
+ PORT_START("PORTC") /* 63B05Z0 - PORT C & SCI */
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -2287,24 +2287,24 @@ static INPUT_PORTS_START( s21default )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN3 )
- PORT_START_TAG("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 */
+ PORT_START("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN1") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 */
+ PORT_START("AN1") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0x60,0x9f) PORT_SENSITIVITY(15) PORT_KEYDELTA(10)
- PORT_START_TAG("AN2") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 */
+ PORT_START("AN2") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(0x60,0x9f) PORT_SENSITIVITY(20) PORT_KEYDELTA(10)
- PORT_START_TAG("AN3") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 */
+ PORT_START("AN3") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 */
+ PORT_START("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN5") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 5 */
+ PORT_START("AN5") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 5 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN6") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 6 */
+ PORT_START("AN6") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 6 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN7") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 7 */
+ PORT_START("AN7") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 7 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 63B05Z0 - PORT H */
+ PORT_START("PORTH") /* 63B05Z0 - PORT H */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2313,7 +2313,7 @@ static INPUT_PORTS_START( s21default )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 63B05Z0 - $2000 DIP SW */
+ PORT_START("DSW") /* 63B05Z0 - $2000 DIP SW */
PORT_DIPNAME( 0x01, 0x01, "DSW1 (Test Mode)")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2339,26 +2339,26 @@ static INPUT_PORTS_START( s21default )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* 63B05Z0 - $3000 */
+ PORT_START("DIAL0") /* 63B05Z0 - $3000 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 63B05Z0 - $3001 */
+ PORT_START("DIAL1") /* 63B05Z0 - $3001 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 63B05Z0 - $3002 */
+ PORT_START("DIAL2") /* 63B05Z0 - $3002 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 63B05Z0 - $3003 */
+ PORT_START("DIAL3") /* 63B05Z0 - $3003 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
/* "SCI - ? */
static INPUT_PORTS_START( winrun )
- PORT_START /* 63B05Z0 - PORT B */
+ PORT_START("PORTB") /* 63B05Z0 - PORT B */
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 ) /* ? */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 ) /* ? */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* ? */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* ? */
- PORT_START /* 63B05Z0 - PORT C & SCI */
+ PORT_START("PORTC") /* 63B05Z0 - PORT C & SCI */
/* $a00004? */
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -2368,24 +2368,24 @@ static INPUT_PORTS_START( winrun )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) // advances through tests
- PORT_START_TAG("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 */
+ PORT_START("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN1") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 */
+ PORT_START("AN1") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(15) PORT_KEYDELTA(10) /* gas */
- PORT_START_TAG("AN2") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 */
+ PORT_START("AN2") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(15) PORT_KEYDELTA(10) /* steering */
- PORT_START_TAG("AN3") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 */
+ PORT_START("AN3") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Z ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(15) PORT_KEYDELTA(10) /* break */
- PORT_START_TAG("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 */
+ PORT_START("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN5") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 5 */
+ PORT_START("AN5") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 5 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN6") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 6 */
+ PORT_START("AN6") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 6 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN7") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 7 */
+ PORT_START("AN7") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 7 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 63B05Z0 - PORT H */
+ PORT_START("PORTH") /* 63B05Z0 - PORT H */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2394,7 +2394,7 @@ static INPUT_PORTS_START( winrun )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) /* shift up */
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 63B05Z0 - $2000 DIP SW */
+ PORT_START("DSW") /* 63B05Z0 - $2000 DIP SW */
/* $a00026.l */
PORT_DIPNAME( 0x01, 0x01, "DIP1 (Test Mode)")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
@@ -2421,23 +2421,23 @@ static INPUT_PORTS_START( winrun )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* 63B05Z0 - $3000 */
+ PORT_START("DIAL0") /* 63B05Z0 - $3000 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 63B05Z0 - $3001 */
+ PORT_START("DIAL1") /* 63B05Z0 - $3001 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 63B05Z0 - $3002 */
+ PORT_START("DIAL2") /* 63B05Z0 - $3002 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 63B05Z0 - $3003 */
+ PORT_START("DIAL3") /* 63B05Z0 - $3003 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( cybsled )
- PORT_START /* 63B05Z0 - PORT B */
+ PORT_START("PORTB") /* 63B05Z0 - PORT B */
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START /* 63B05Z0 - PORT C & SCI */
+ PORT_START("PORTC") /* 63B05Z0 - PORT C & SCI */
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -2446,24 +2446,24 @@ static INPUT_PORTS_START( cybsled )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN3 )
- PORT_START_TAG("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 */
+ PORT_START("AN0") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 */
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_Y ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2) /* right joystick: vertical */
- PORT_START_TAG("AN1") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 */
+ PORT_START("AN1") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 */
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_Y ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1) /* left joystick: vertical */
- PORT_START_TAG("AN2") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 */
+ PORT_START("AN2") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 */
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_X ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2) /* right joystick: horizontal */
- PORT_START_TAG("AN3") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 */
+ PORT_START("AN3") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 */
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_X ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1) /* left joystick: horizontal */
- PORT_START_TAG("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 */
+ PORT_START("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN5") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 5 */
+ PORT_START("AN5") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 5 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN6") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 6 */
+ PORT_START("AN6") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 6 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN7") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 7 */
+ PORT_START("AN7") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 7 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 63B05Z0 - PORT H */
+ PORT_START("PORTH") /* 63B05Z0 - PORT H */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2472,7 +2472,7 @@ static INPUT_PORTS_START( cybsled )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 63B05Z0 - $2000 DIP SW */
+ PORT_START("DSW") /* 63B05Z0 - $2000 DIP SW */
PORT_DIPNAME( 0x01, 0x01, "DSW1 (Test Mode)")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2498,23 +2498,23 @@ static INPUT_PORTS_START( cybsled )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* 63B05Z0 - $3000 */
+ PORT_START("DIAL0") /* 63B05Z0 - $3000 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 63B05Z0 - $3001 */
+ PORT_START("DIAL1") /* 63B05Z0 - $3001 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 63B05Z0 - $3002 */
+ PORT_START("DIAL2") /* 63B05Z0 - $3002 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 63B05Z0 - $3003 */
+ PORT_START("DIAL3") /* 63B05Z0 - $3003 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( aircombt )
- PORT_START /* IN#0: 63B05Z0 - PORT B */
+ PORT_START("PORTB") /* IN#0: 63B05Z0 - PORT B */
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START /* IN#1: 63B05Z0 - PORT C & SCI */
+ PORT_START("PORTC") /* IN#1: 63B05Z0 - PORT C & SCI */
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -2523,24 +2523,24 @@ static INPUT_PORTS_START( aircombt )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN3 )
- PORT_START_TAG("AN0") /* IN#2: 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 */
+ PORT_START("AN0") /* IN#2: 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN1") /* IN#3: 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 */
+ PORT_START("AN1") /* IN#3: 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(4)
- PORT_START_TAG("AN2") /* IN#4: 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 */
+ PORT_START("AN2") /* IN#4: 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(4)
- PORT_START_TAG("AN3") /* IN#5: 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 */
+ PORT_START("AN3") /* IN#5: 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(4) PORT_PLAYER(2)
- PORT_START_TAG("AN4") /* IN#6: 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 */
+ PORT_START("AN4") /* IN#6: 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN5") /* IN#7: 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 5 */
+ PORT_START("AN5") /* IN#7: 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 5 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN6") /* IN#8: 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 6 */
+ PORT_START("AN6") /* IN#8: 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 6 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN7") /* IN#9: 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 7 */
+ PORT_START("AN7") /* IN#9: 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 7 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN#10: 63B05Z0 - PORT H */
+ PORT_START("PORTH") /* IN#10: 63B05Z0 - PORT H */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) ///???
@@ -2549,7 +2549,7 @@ static INPUT_PORTS_START( aircombt )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN#11: 63B05Z0 - $2000 DIP SW */
+ PORT_START("DSW") /* IN#11: 63B05Z0 - $2000 DIP SW */
PORT_DIPNAME( 0x01, 0x01, "DSW1 (Test Mode)")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2575,13 +2575,13 @@ static INPUT_PORTS_START( aircombt )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* IN#12: 63B05Z0 - $3000 */
+ PORT_START("DIAL0") /* IN#12: 63B05Z0 - $3000 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN#13: 63B05Z0 - $3001 */
+ PORT_START("DIAL1") /* IN#13: 63B05Z0 - $3001 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN#14: 63B05Z0 - $3002 */
+ PORT_START("DIAL2") /* IN#14: 63B05Z0 - $3002 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN#15: 63B05Z0 - $3003 */
+ PORT_START("DIAL3") /* IN#15: 63B05Z0 - $3003 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c
index f5cbdeacd56..23d3a1b3bda 100644
--- a/src/mame/drivers/namcos22.c
+++ b/src/mame/drivers/namcos22.c
@@ -1049,11 +1049,11 @@ nthbyte( const UINT32 *pSource, int offs )
/* mask,default,type,sensitivity,delta,min,max */
#define DRIVING_ANALOG_PORTS \
- PORT_START_TAG("GAS") \
+ PORT_START("GAS") \
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) \
- PORT_START_TAG("BRAKE") \
+ PORT_START("BRAKE") \
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) \
- PORT_START_TAG("STEER") \
+ PORT_START("STEER") \
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
/* TODO: REMOVE (THIS IS HANDLED BY "SUBCPU") */
@@ -4273,7 +4273,7 @@ ROM_END
/*******************************************************************/
static INPUT_PORTS_START( alpiner )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x01, "DIP4-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -4299,7 +4299,7 @@ static INPUT_PORTS_START( alpiner )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("MCUP5A")
+ PORT_START("MCUP5A")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -4309,13 +4309,13 @@ static INPUT_PORTS_START( alpiner )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) /* R SELECTION */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("SWING") /* SWING */
+ PORT_START("SWING") /* SWING */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("EDGE") /* EDGE */
+ PORT_START("EDGE") /* EDGE */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("MCUP5B")
+ PORT_START("MCUP5B")
PORT_DIPNAME( 0x01, 0x01, "DIP5-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -4344,7 +4344,7 @@ INPUT_PORTS_END /* Alpine Racer */
static INPUT_PORTS_START( airco22 )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x01, "DIP1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -4370,16 +4370,16 @@ static INPUT_PORTS_START( airco22 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("PEDAL")
+ PORT_START("PEDAL")
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(4)
- PORT_START_TAG("STICKX")
+ PORT_START("STICKX")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(4)
- PORT_START_TAG("STICKY")
+ PORT_START("STICKY")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(4)
- PORT_START_TAG("MCUP5A")
+ PORT_START("MCUP5A")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON5 )
// PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -4391,12 +4391,12 @@ static INPUT_PORTS_START( airco22 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 )
// PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("MCUP5B")
+ PORT_START("MCUP5B")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_BUTTON3 )
INPUT_PORTS_END /* Air Combat22 */
static INPUT_PORTS_START( cybrcycc )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x01, "DIP4-1 (Test Mode)" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -4424,7 +4424,7 @@ static INPUT_PORTS_START( cybrcycc )
DRIVING_ANALOG_PORTS
- PORT_START_TAG("MCUP5A")
+ PORT_START("MCUP5A")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -4434,7 +4434,7 @@ static INPUT_PORTS_START( cybrcycc )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("MCUP5B")
+ PORT_START("MCUP5B")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -4446,7 +4446,7 @@ static INPUT_PORTS_START( cybrcycc )
INPUT_PORTS_END /* Cyber Cycles */
static INPUT_PORTS_START( propcycl )
- PORT_START_TAG("DSW0") /* DIP4 */
+ PORT_START("DSW0") /* DIP4 */
PORT_DIPNAME( 0x01, 0x01, "DIP1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -4472,7 +4472,7 @@ static INPUT_PORTS_START( propcycl )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("JOY")
+ PORT_START("JOY")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
@@ -4480,13 +4480,13 @@ static INPUT_PORTS_START( propcycl )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START_TAG("STICKX")
+ PORT_START("STICKX")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START_TAG("STICKY")
+ PORT_START("STICKY")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START_TAG("MCUP5A")
+ PORT_START("MCUP5A")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -4496,7 +4496,7 @@ static INPUT_PORTS_START( propcycl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("MCUP5B")
+ PORT_START("MCUP5B")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -4508,7 +4508,7 @@ static INPUT_PORTS_START( propcycl )
INPUT_PORTS_END /* Prop Cycle */
static INPUT_PORTS_START( cybrcomm )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x0001, 0x0001, "DIP2-1" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -4558,7 +4558,7 @@ static INPUT_PORTS_START( cybrcomm )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) /* SHOOT */
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* MISSLE */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -4576,18 +4576,18 @@ static INPUT_PORTS_START( cybrcomm )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("STICKY1") /* VOLUME1 */
+ PORT_START("STICKY1") /* VOLUME1 */
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_Y ) PORT_SENSITIVITY( 100) PORT_KEYDELTA(4) PORT_PLAYER(1) /* right joystick: vertical */
- PORT_START_TAG("STICKY2") /* VOLUME2 */
+ PORT_START("STICKY2") /* VOLUME2 */
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_Y ) PORT_SENSITIVITY( 100) PORT_KEYDELTA(4) PORT_PLAYER(2) /* left joystick: vertical */
- PORT_START_TAG("STICKX1") /* VOLUME3 */
+ PORT_START("STICKX1") /* VOLUME3 */
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_X ) PORT_SENSITIVITY( 100) PORT_KEYDELTA(4) PORT_PLAYER(1) /* right joystick: horizontal */
- PORT_START_TAG("STICKX2") /* VOLUME4 */
+ PORT_START("STICKX2") /* VOLUME4 */
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_X ) PORT_SENSITIVITY( 100) PORT_KEYDELTA(4) PORT_PLAYER(2) /* left joystick: horizontal */
INPUT_PORTS_END /* Cyber Commando */
static INPUT_PORTS_START( timecris )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x01, "DIP4-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -4611,12 +4611,12 @@ static INPUT_PORTS_START( timecris )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG( "LIGHTX" )
+ PORT_START( "LIGHTX" )
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, -0.1, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(4)
- PORT_START_TAG( "LIGHTY" )
+ PORT_START( "LIGHTY" )
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, -0.184, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(4)
- PORT_START_TAG("MCUP5A")
+ PORT_START("MCUP5A")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -4626,14 +4626,14 @@ static INPUT_PORTS_START( timecris )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("MCUP5B")
+ PORT_START("MCUP5B")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
INPUT_PORTS_END /* Time Crisis */
/*****************************************************************************************************/
static INPUT_PORTS_START( acedrvr )
- PORT_START_TAG("DSW0") /* 0: DIP2 and DIP3 */
+ PORT_START("DSW0") /* 0: DIP2 and DIP3 */
PORT_DIPNAME( 0x0001, 0x0001, "DIP2-1" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -4683,7 +4683,7 @@ static INPUT_PORTS_START( acedrvr )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("INPUTS") /* 1 */
+ PORT_START("INPUTS") /* 1 */
PORT_DIPNAME( 0x0003, 0x0003, "Shift" )
PORT_DIPSETTING( 0x0001, "Up" )
PORT_DIPSETTING( 0x0003, "Center" )
@@ -4707,7 +4707,7 @@ static INPUT_PORTS_START( acedrvr )
INPUT_PORTS_END /* Ace Driver */
static INPUT_PORTS_START( victlap )
- PORT_START_TAG("DSW0") /* 0: DIP2 and DIP3 */
+ PORT_START("DSW0") /* 0: DIP2 and DIP3 */
PORT_DIPNAME( 0x0001, 0x0001, "DIP2-1" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -4757,7 +4757,7 @@ static INPUT_PORTS_START( victlap )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("INPUTS") /* 1 */
+ PORT_START("INPUTS") /* 1 */
PORT_DIPNAME( 0x0003, 0x0003, "Shift" )
PORT_DIPSETTING( 0x0001, "Up" )
PORT_DIPSETTING( 0x0003, "Center" )
@@ -4783,7 +4783,7 @@ static INPUT_PORTS_START( victlap )
INPUT_PORTS_END /* Victory Lap */
static INPUT_PORTS_START( ridgera )
- PORT_START_TAG("DSW0") /* 0: DIP2 and DIP3 */
+ PORT_START("DSW0") /* 0: DIP2 and DIP3 */
PORT_DIPNAME( 0x0001, 0x0001, "DIP2-1 (test mode?)" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -4833,7 +4833,7 @@ static INPUT_PORTS_START( ridgera )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("INPUTS") /* 1 */
+ PORT_START("INPUTS") /* 1 */
PORT_DIPNAME( 0x000f, 0x000a, "Stick Shift" )
PORT_DIPSETTING( 0xa, "1" )
PORT_DIPSETTING( 0x9, "2" )
@@ -4858,7 +4858,7 @@ static INPUT_PORTS_START( ridgera )
INPUT_PORTS_END /* Ridge Racer */
static INPUT_PORTS_START( raveracw )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x0001, 0x0001, "DIP2-1 (test mode)" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -4908,7 +4908,7 @@ static INPUT_PORTS_START( raveracw )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("INPUTS") /* 1 */
+ PORT_START("INPUTS") /* 1 */
PORT_DIPNAME( 0x000f, 0x000a, "Stick Shift" )
PORT_DIPSETTING( 0xa, "1" )
PORT_DIPSETTING( 0x9, "2" )
diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c
index 0a259b93ba9..f5a29cb9560 100644
--- a/src/mame/drivers/namcos86.c
+++ b/src/mame/drivers/namcos86.c
@@ -454,7 +454,7 @@ ADDRESS_MAP_END
/*******************************************************************/
static INPUT_PORTS_START( hopmappy )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 player 2 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 2 player 1 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -464,7 +464,7 @@ static INPUT_PORTS_START( hopmappy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) /* service switch from the edge connector */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 player 1 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 2 player 2 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -474,7 +474,7 @@ static INPUT_PORTS_START( hopmappy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x60, 0x60, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
@@ -495,7 +495,7 @@ static INPUT_PORTS_START( hopmappy )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x80, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hard ) )
@@ -521,7 +521,7 @@ static INPUT_PORTS_START( hopmappy )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SPECIAL ) /* OUT:coin lockout */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* OUT:coin counter 1 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) /* OUT:coin counter 2 */
@@ -533,7 +533,7 @@ static INPUT_PORTS_START( hopmappy )
INPUT_PORTS_END
static INPUT_PORTS_START( skykiddx )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 player 2 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -543,7 +543,7 @@ static INPUT_PORTS_START( skykiddx )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) /* service switch from the edge connector */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 player 1 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -553,7 +553,7 @@ static INPUT_PORTS_START( skykiddx )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x60, 0x60, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
@@ -575,7 +575,7 @@ static INPUT_PORTS_START( skykiddx )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x80, "1" )
PORT_DIPSETTING( 0x40, "2" )
@@ -599,7 +599,7 @@ static INPUT_PORTS_START( skykiddx )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SPECIAL ) /* OUT:coin lockout */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* OUT:coin counter 1 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) /* OUT:coin counter 2 */
@@ -611,7 +611,7 @@ static INPUT_PORTS_START( skykiddx )
INPUT_PORTS_END
static INPUT_PORTS_START( roishtar )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 player 2 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_8WAY
@@ -621,7 +621,7 @@ static INPUT_PORTS_START( roishtar )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) /* service switch from the edge connector */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 player 1 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_8WAY
@@ -631,7 +631,7 @@ static INPUT_PORTS_START( roishtar )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x40, 0x40, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -655,7 +655,7 @@ static INPUT_PORTS_START( roishtar )
PORT_DIPSETTING( 0x04, DEF_STR( 1C_5C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_6C ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x80, 0x80, "Freeze" )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -681,7 +681,7 @@ static INPUT_PORTS_START( roishtar )
PORT_DIPSETTING( 0x04, DEF_STR( 1C_5C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_6C ) )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SPECIAL ) /* OUT:coin lockout */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* OUT:coin counter 1 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) /* OUT:coin counter 2 */
@@ -693,7 +693,7 @@ static INPUT_PORTS_START( roishtar )
INPUT_PORTS_END
static INPUT_PORTS_START( genpeitd )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 player 2 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -703,7 +703,7 @@ static INPUT_PORTS_START( genpeitd )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) /* service switch from the edge connector */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 player 1 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -713,7 +713,7 @@ static INPUT_PORTS_START( genpeitd )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x60, 0x60, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
@@ -735,7 +735,7 @@ static INPUT_PORTS_START( genpeitd )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0xc0, 0xc0, "Candle" )
PORT_DIPSETTING( 0x80, "40" )
PORT_DIPSETTING( 0xc0, "50" )
@@ -759,7 +759,7 @@ static INPUT_PORTS_START( genpeitd )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SPECIAL ) /* OUT:coin lockout */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* OUT:coin counter 1 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) /* OUT:coin counter 2 */
@@ -771,7 +771,7 @@ static INPUT_PORTS_START( genpeitd )
INPUT_PORTS_END
static INPUT_PORTS_START( rthunder )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 player 2 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
@@ -781,7 +781,7 @@ static INPUT_PORTS_START( rthunder )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) /* service switch from the edge connector */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 player 1 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -791,7 +791,7 @@ static INPUT_PORTS_START( rthunder )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x60, 0x60, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
@@ -813,7 +813,7 @@ static INPUT_PORTS_START( rthunder )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x80, "3" )
PORT_DIPSETTING( 0x00, "5" )
@@ -838,7 +838,7 @@ static INPUT_PORTS_START( rthunder )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "6" )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SPECIAL ) /* OUT:coin lockout */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* OUT:coin counter 1 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) /* OUT:coin counter 2 */
@@ -850,7 +850,7 @@ static INPUT_PORTS_START( rthunder )
INPUT_PORTS_END
static INPUT_PORTS_START( rthundro )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 player 2 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
@@ -860,7 +860,7 @@ static INPUT_PORTS_START( rthundro )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) /* service switch from the edge connector */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 player 1 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -870,7 +870,7 @@ static INPUT_PORTS_START( rthundro )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x60, 0x60, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
@@ -892,7 +892,7 @@ static INPUT_PORTS_START( rthundro )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x80, "1" )
PORT_DIPSETTING( 0x40, "2" )
@@ -917,7 +917,7 @@ static INPUT_PORTS_START( rthundro )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SPECIAL ) /* OUT:coin lockout */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* OUT:coin counter 1 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) /* OUT:coin counter 2 */
@@ -929,7 +929,7 @@ static INPUT_PORTS_START( rthundro )
INPUT_PORTS_END
static INPUT_PORTS_START( wndrmomo )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 player 2 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
@@ -939,7 +939,7 @@ static INPUT_PORTS_START( wndrmomo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) /* service switch from the edge connector */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 player 1 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -949,7 +949,7 @@ static INPUT_PORTS_START( wndrmomo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x60, 0x60, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
@@ -971,7 +971,7 @@ static INPUT_PORTS_START( wndrmomo )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -996,7 +996,7 @@ static INPUT_PORTS_START( wndrmomo )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SPECIAL ) /* OUT:coin lockout */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* OUT:coin counter 1 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) /* OUT:coin counter 2 */
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index 248024345b8..00c16ba5a98 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -790,10 +790,10 @@ static ADDRESS_MAP_START( dc_audio_map, ADDRESS_SPACE_PROGRAM, 32 )
ADDRESS_MAP_END
static INPUT_PORTS_START( naomi )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Service")
PORT_SERVICE_NO_TOGGLE( 0x01, IP_ACTIVE_LOW )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -801,9 +801,9 @@ static INPUT_PORTS_START( naomi )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON3 )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -811,10 +811,10 @@ static INPUT_PORTS_START( naomi )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_START_TAG("COINS")
+ PORT_START("COINS")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED(dc_coin_slots_callback, &dc_coin_counts[0])
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_CHANGED(dc_coin_slots_callback, &dc_coin_counts[1])
INPUT_PORTS_END
diff --git a/src/mame/drivers/naughtyb.c b/src/mame/drivers/naughtyb.c
index f4d98858255..2b12f5ae2c6 100644
--- a/src/mame/drivers/naughtyb.c
+++ b/src/mame/drivers/naughtyb.c
@@ -222,7 +222,7 @@ static INTERRUPT_GEN( naughtyb_interrupt )
}
static INPUT_PORTS_START( naughtyb )
- PORT_START_TAG( "IN0" )
+ PORT_START( "IN0" )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -232,7 +232,7 @@ static INPUT_PORTS_START( naughtyb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
- PORT_START_TAG( "IN0_COCKTAIL" )
+ PORT_START( "IN0_COCKTAIL" )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) // IPT_START1
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // IPT_START2
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -242,7 +242,7 @@ static INPUT_PORTS_START( naughtyb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
- PORT_START_TAG( "DSW0" )
+ PORT_START( "DSW0" )
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "3" )
@@ -265,7 +265,7 @@ static INPUT_PORTS_START( naughtyb )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG( "FAKE" )
+ PORT_START( "FAKE" )
// The coin slots are not memory mapped.
// This fake input port is used by the interrupt
// handler to be notified of coin insertions. We use IMPULSE to
@@ -277,14 +277,14 @@ static INPUT_PORTS_START( naughtyb )
INPUT_PORTS_END
static INPUT_PORTS_START( trvmstr )
- PORT_START_TAG( "IN0" )
+ PORT_START( "IN0" )
PORT_SERVICE(0x0f, IP_ACTIVE_LOW )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON4 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG( "IN0_COCKTAIL" )
+ PORT_START( "IN0_COCKTAIL" )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -294,7 +294,7 @@ static INPUT_PORTS_START( trvmstr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG( "DSW0" )
+ PORT_START( "DSW0" )
PORT_DIPNAME( 0x03, 0x00, "Screen Orientation" )
PORT_DIPSETTING( 0x00, "0'" )
PORT_DIPSETTING( 0x02, "90'" )
@@ -318,7 +318,7 @@ static INPUT_PORTS_START( trvmstr )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG( "FAKE" )
+ PORT_START( "FAKE" )
// The coin slots are not memory mapped.
// This fake input port is used by the interrupt
// handler to be notified of coin insertions. We use IMPULSE to
diff --git a/src/mame/drivers/nbmj8688.c b/src/mame/drivers/nbmj8688.c
index be48aa76040..bc923666d37 100644
--- a/src/mame/drivers/nbmj8688.c
+++ b/src/mame/drivers/nbmj8688.c
@@ -551,7 +551,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mjsikaku )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -577,7 +577,7 @@ static INPUT_PORTS_START( mjsikaku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -603,7 +603,7 @@ static INPUT_PORTS_START( mjsikaku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -618,7 +618,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mmsikaku )
#if 1
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -644,7 +644,7 @@ static INPUT_PORTS_START( mmsikaku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -671,7 +671,7 @@ static INPUT_PORTS_START( mmsikaku )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
#else
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x00, "Game Out" )
PORT_DIPSETTING( 0x07, "60% (Hard)" )
PORT_DIPSETTING( 0x06, "65%" )
@@ -695,7 +695,7 @@ static INPUT_PORTS_START( mmsikaku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x00, "Rate Up" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -708,7 +708,7 @@ static INPUT_PORTS_START( mmsikaku )
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED )
#endif
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -722,7 +722,7 @@ static INPUT_PORTS_START( mmsikaku )
INPUT_PORTS_END
static INPUT_PORTS_START( otonano )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -748,7 +748,7 @@ static INPUT_PORTS_START( otonano )
PORT_DIPSETTING( 0x80, "100 Yen" )
PORT_DIPSETTING( 0x00, "50 Yen" )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "Character Display Test" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -774,7 +774,7 @@ static INPUT_PORTS_START( otonano )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -788,7 +788,7 @@ static INPUT_PORTS_START( otonano )
INPUT_PORTS_END
static INPUT_PORTS_START( mjcamera )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -814,7 +814,7 @@ static INPUT_PORTS_START( mjcamera )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -840,7 +840,7 @@ static INPUT_PORTS_START( mjcamera )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -854,7 +854,7 @@ static INPUT_PORTS_START( mjcamera )
INPUT_PORTS_END
static INPUT_PORTS_START( kaguya )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
@@ -879,7 +879,7 @@ static INPUT_PORTS_START( kaguya )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x00, "Nudity graphic on bet" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -903,7 +903,7 @@ static INPUT_PORTS_START( kaguya )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
// PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) //
@@ -918,7 +918,7 @@ static INPUT_PORTS_START( kaguya )
INPUT_PORTS_END
static INPUT_PORTS_START( kaguya2 )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -944,7 +944,7 @@ static INPUT_PORTS_START( kaguya2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -970,7 +970,7 @@ static INPUT_PORTS_START( kaguya2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
// PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -985,7 +985,7 @@ static INPUT_PORTS_START( kaguya2 )
INPUT_PORTS_END
static INPUT_PORTS_START( kanatuen )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1011,7 +1011,7 @@ static INPUT_PORTS_START( kanatuen )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1037,7 +1037,7 @@ static INPUT_PORTS_START( kanatuen )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
// PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) //
@@ -1052,7 +1052,7 @@ static INPUT_PORTS_START( kanatuen )
INPUT_PORTS_END
static INPUT_PORTS_START( kyuhito )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1078,7 +1078,7 @@ static INPUT_PORTS_START( kyuhito )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1104,7 +1104,7 @@ static INPUT_PORTS_START( kyuhito )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
// PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) //
@@ -1119,7 +1119,7 @@ static INPUT_PORTS_START( kyuhito )
INPUT_PORTS_END
static INPUT_PORTS_START( idhimitu )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1145,7 +1145,7 @@ static INPUT_PORTS_START( idhimitu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1171,7 +1171,7 @@ static INPUT_PORTS_START( idhimitu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
// PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) //
@@ -1186,7 +1186,7 @@ static INPUT_PORTS_START( idhimitu )
INPUT_PORTS_END
static INPUT_PORTS_START( secolove )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1212,7 +1212,7 @@ static INPUT_PORTS_START( secolove )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x00, "Number of last chance" )
PORT_DIPSETTING( 0x03, "0" )
PORT_DIPSETTING( 0x02, "3" )
@@ -1237,7 +1237,7 @@ static INPUT_PORTS_START( secolove )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1251,7 +1251,7 @@ static INPUT_PORTS_START( secolove )
INPUT_PORTS_END
static INPUT_PORTS_START( citylove )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0f, "1 (Easy)" )
PORT_DIPSETTING( 0x0e, "2" )
@@ -1281,7 +1281,7 @@ static INPUT_PORTS_START( citylove )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x00, "Number of last chance" )
PORT_DIPSETTING( 0x03, "0" )
PORT_DIPSETTING( 0x02, "3" )
@@ -1305,7 +1305,7 @@ static INPUT_PORTS_START( citylove )
PORT_DIPSETTING( 0x40, "TSUMO 7" )
PORT_DIPSETTING( 0x00, "HAIPAI" )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1320,7 +1320,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mcitylov )
#if 1
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1346,7 +1346,7 @@ static INPUT_PORTS_START( mcitylov )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1373,7 +1373,7 @@ static INPUT_PORTS_START( mcitylov )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
#else
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x00, "Game Out" )
PORT_DIPSETTING( 0x07, "60% (Hard)" )
PORT_DIPSETTING( 0x06, "65%" )
@@ -1397,7 +1397,7 @@ static INPUT_PORTS_START( mcitylov )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x00, "Rate Up" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1410,7 +1410,7 @@ static INPUT_PORTS_START( mcitylov )
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED )
#endif
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1424,7 +1424,7 @@ static INPUT_PORTS_START( mcitylov )
INPUT_PORTS_END
static INPUT_PORTS_START( seiha )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Hard)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1450,7 +1450,7 @@ static INPUT_PORTS_START( seiha )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1476,7 +1476,7 @@ static INPUT_PORTS_START( seiha )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1490,7 +1490,7 @@ static INPUT_PORTS_START( seiha )
INPUT_PORTS_END
static INPUT_PORTS_START( seiham )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x00, "Game Out" )
PORT_DIPSETTING( 0x07, "60% (Hard)" )
PORT_DIPSETTING( 0x06, "65%" )
@@ -1514,7 +1514,7 @@ static INPUT_PORTS_START( seiham )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x00, "Rate Up" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1540,7 +1540,7 @@ static INPUT_PORTS_START( seiham )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1554,7 +1554,7 @@ static INPUT_PORTS_START( seiham )
INPUT_PORTS_END
static INPUT_PORTS_START( iemoto )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Hard)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1580,7 +1580,7 @@ static INPUT_PORTS_START( iemoto )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1606,7 +1606,7 @@ static INPUT_PORTS_START( iemoto )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1620,7 +1620,7 @@ static INPUT_PORTS_START( iemoto )
INPUT_PORTS_END
static INPUT_PORTS_START( iemotom )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1646,7 +1646,7 @@ static INPUT_PORTS_START( iemotom )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1672,7 +1672,7 @@ static INPUT_PORTS_START( iemotom )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1686,7 +1686,7 @@ static INPUT_PORTS_START( iemotom )
INPUT_PORTS_END
static INPUT_PORTS_START( ryuuha )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1712,7 +1712,7 @@ static INPUT_PORTS_START( ryuuha )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "Character Display Test" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1738,7 +1738,7 @@ static INPUT_PORTS_START( ryuuha )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1752,7 +1752,7 @@ static INPUT_PORTS_START( ryuuha )
INPUT_PORTS_END
static INPUT_PORTS_START( bijokkoy )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1778,7 +1778,7 @@ static INPUT_PORTS_START( bijokkoy )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x00, "Number of last chance" )
PORT_DIPSETTING( 0x03, "0" )
PORT_DIPSETTING( 0x02, "2" )
@@ -1803,7 +1803,7 @@ static INPUT_PORTS_START( bijokkoy )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1817,7 +1817,7 @@ static INPUT_PORTS_START( bijokkoy )
INPUT_PORTS_END
static INPUT_PORTS_START( bijokkog )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1843,7 +1843,7 @@ static INPUT_PORTS_START( bijokkog )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x00, "Number of last chance" )
PORT_DIPSETTING( 0x03, "0" )
PORT_DIPSETTING( 0x02, "2" )
@@ -1867,7 +1867,7 @@ static INPUT_PORTS_START( bijokkog )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1881,7 +1881,7 @@ static INPUT_PORTS_START( bijokkog )
INPUT_PORTS_END
static INPUT_PORTS_START( housemnq )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1907,7 +1907,7 @@ static INPUT_PORTS_START( housemnq )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x03, "Time" )
PORT_DIPSETTING( 0x03, "120" )
PORT_DIPSETTING( 0x02, "100" )
@@ -1931,7 +1931,7 @@ static INPUT_PORTS_START( housemnq )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1945,7 +1945,7 @@ static INPUT_PORTS_START( housemnq )
INPUT_PORTS_END
static INPUT_PORTS_START( housemn2 )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1971,7 +1971,7 @@ static INPUT_PORTS_START( housemn2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x03, "Time" )
PORT_DIPSETTING( 0x03, "120" )
PORT_DIPSETTING( 0x02, "100" )
@@ -1994,7 +1994,7 @@ static INPUT_PORTS_START( housemn2 )
// PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2008,7 +2008,7 @@ static INPUT_PORTS_START( housemn2 )
INPUT_PORTS_END
static INPUT_PORTS_START( orangec )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2034,7 +2034,7 @@ static INPUT_PORTS_START( orangec )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2060,7 +2060,7 @@ static INPUT_PORTS_START( orangec )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2074,7 +2074,7 @@ static INPUT_PORTS_START( orangec )
INPUT_PORTS_END
static INPUT_PORTS_START( orangeci )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2100,7 +2100,7 @@ static INPUT_PORTS_START( orangeci )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2126,7 +2126,7 @@ static INPUT_PORTS_START( orangeci )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2140,7 +2140,7 @@ static INPUT_PORTS_START( orangeci )
INPUT_PORTS_END
static INPUT_PORTS_START( vipclub )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2166,7 +2166,7 @@ static INPUT_PORTS_START( vipclub )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2192,7 +2192,7 @@ static INPUT_PORTS_START( vipclub )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2206,7 +2206,7 @@ static INPUT_PORTS_START( vipclub )
INPUT_PORTS_END
static INPUT_PORTS_START( livegal )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2232,7 +2232,7 @@ static INPUT_PORTS_START( livegal )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2258,7 +2258,7 @@ static INPUT_PORTS_START( livegal )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2284,7 +2284,7 @@ static INPUT_PORTS_START( livegal )
INPUT_PORTS_END
static INPUT_PORTS_START( ojousan )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -2310,7 +2310,7 @@ static INPUT_PORTS_START( ojousan )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2336,7 +2336,7 @@ static INPUT_PORTS_START( ojousan )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2350,7 +2350,7 @@ static INPUT_PORTS_START( ojousan )
INPUT_PORTS_END
static INPUT_PORTS_START( ojousanm )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2376,7 +2376,7 @@ static INPUT_PORTS_START( ojousanm )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2402,7 +2402,7 @@ static INPUT_PORTS_START( ojousanm )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2416,7 +2416,7 @@ static INPUT_PORTS_START( ojousanm )
INPUT_PORTS_END
static INPUT_PORTS_START( korinai )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2442,7 +2442,7 @@ static INPUT_PORTS_START( korinai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2468,7 +2468,7 @@ static INPUT_PORTS_START( korinai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2482,7 +2482,7 @@ static INPUT_PORTS_START( korinai )
INPUT_PORTS_END
static INPUT_PORTS_START( korinaim )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2508,7 +2508,7 @@ static INPUT_PORTS_START( korinaim )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2534,7 +2534,7 @@ static INPUT_PORTS_START( korinaim )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2548,7 +2548,7 @@ static INPUT_PORTS_START( korinaim )
INPUT_PORTS_END
static INPUT_PORTS_START( crystalg )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2574,7 +2574,7 @@ static INPUT_PORTS_START( crystalg )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2600,7 +2600,7 @@ static INPUT_PORTS_START( crystalg )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2614,7 +2614,7 @@ static INPUT_PORTS_START( crystalg )
INPUT_PORTS_END
static INPUT_PORTS_START( crystal2 )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x0f, 0x0d, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0d, "1 (Easy)" )
PORT_DIPSETTING( 0x0a, "2" )
@@ -2638,7 +2638,7 @@ static INPUT_PORTS_START( crystal2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x00, "Number of last chance" )
PORT_DIPSETTING( 0x03, "0" )
PORT_DIPSETTING( 0x02, "1" )
@@ -2662,7 +2662,7 @@ static INPUT_PORTS_START( crystal2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2676,7 +2676,7 @@ static INPUT_PORTS_START( crystal2 )
INPUT_PORTS_END
static INPUT_PORTS_START( apparel )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2702,7 +2702,7 @@ static INPUT_PORTS_START( apparel )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2728,7 +2728,7 @@ static INPUT_PORTS_START( apparel )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2742,7 +2742,7 @@ static INPUT_PORTS_START( apparel )
INPUT_PORTS_END
static INPUT_PORTS_START( nightlov )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2768,7 +2768,7 @@ static INPUT_PORTS_START( nightlov )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2794,7 +2794,7 @@ static INPUT_PORTS_START( nightlov )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
diff --git a/src/mame/drivers/nbmj8891.c b/src/mame/drivers/nbmj8891.c
index ac817cf3b24..62dad1f13e4 100644
--- a/src/mame/drivers/nbmj8891.c
+++ b/src/mame/drivers/nbmj8891.c
@@ -768,7 +768,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( hanamomo )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -794,7 +794,7 @@ static INPUT_PORTS_START( hanamomo )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -820,7 +820,7 @@ static INPUT_PORTS_START( hanamomo )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -834,7 +834,7 @@ static INPUT_PORTS_START( hanamomo )
INPUT_PORTS_END
static INPUT_PORTS_START( mjcamerb )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -860,7 +860,7 @@ static INPUT_PORTS_START( mjcamerb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -886,7 +886,7 @@ static INPUT_PORTS_START( mjcamerb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -900,7 +900,7 @@ static INPUT_PORTS_START( mjcamerb )
INPUT_PORTS_END
static INPUT_PORTS_START( mmcamera )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -926,7 +926,7 @@ static INPUT_PORTS_START( mmcamera )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -952,7 +952,7 @@ static INPUT_PORTS_START( mmcamera )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -966,7 +966,7 @@ static INPUT_PORTS_START( mmcamera )
INPUT_PORTS_END
static INPUT_PORTS_START( msjiken )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -992,7 +992,7 @@ static INPUT_PORTS_START( msjiken )
PORT_DIPSETTING( 0x80, "ROYAL" )
PORT_DIPSETTING( 0x00, "JAMMA" )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1018,7 +1018,7 @@ static INPUT_PORTS_START( msjiken )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1030,7 +1030,7 @@ static INPUT_PORTS_START( msjiken )
PORT_INCLUDE( nbmjcontrols )
- PORT_START_TAG("JAMMA1") /* (13) JAMMA-1 */
+ PORT_START("JAMMA1") /* (13) JAMMA-1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1040,7 +1040,7 @@ static INPUT_PORTS_START( msjiken )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("JAMMA2") /* (14) JAMMA-2 */
+ PORT_START("JAMMA2") /* (14) JAMMA-2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_4WAY
@@ -1052,7 +1052,7 @@ static INPUT_PORTS_START( msjiken )
INPUT_PORTS_END
static INPUT_PORTS_START( telmahjn )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1078,7 +1078,7 @@ static INPUT_PORTS_START( telmahjn )
PORT_DIPSETTING( 0x80, "ROYAL" )
PORT_DIPSETTING( 0x00, "JAMMA" )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1104,7 +1104,7 @@ static INPUT_PORTS_START( telmahjn )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1116,7 +1116,7 @@ static INPUT_PORTS_START( telmahjn )
PORT_INCLUDE( nbmjcontrols )
- PORT_START_TAG("JAMMA1") /* (13) JAMMA-1 */
+ PORT_START("JAMMA1") /* (13) JAMMA-1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1126,7 +1126,7 @@ static INPUT_PORTS_START( telmahjn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("JAMMA2") /* (14) JAMMA-2 */
+ PORT_START("JAMMA2") /* (14) JAMMA-2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_4WAY
@@ -1138,7 +1138,7 @@ static INPUT_PORTS_START( telmahjn )
INPUT_PORTS_END
static INPUT_PORTS_START( gionbana )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1163,7 +1163,7 @@ static INPUT_PORTS_START( gionbana )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x00, "Oyaken" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1189,7 +1189,7 @@ static INPUT_PORTS_START( gionbana )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1203,7 +1203,7 @@ static INPUT_PORTS_START( gionbana )
INPUT_PORTS_END
static INPUT_PORTS_START( mgion )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1229,7 +1229,7 @@ static INPUT_PORTS_START( mgion )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (0) DIPSW-B */
+ PORT_START("DSWB") /* (0) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1255,7 +1255,7 @@ static INPUT_PORTS_START( mgion )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1269,7 +1269,7 @@ static INPUT_PORTS_START( mgion )
INPUT_PORTS_END
static INPUT_PORTS_START( omotesnd )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1295,7 +1295,7 @@ static INPUT_PORTS_START( omotesnd )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (0) DIPSW-B */
+ PORT_START("DSWB") /* (0) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1321,7 +1321,7 @@ static INPUT_PORTS_START( omotesnd )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1335,7 +1335,7 @@ static INPUT_PORTS_START( omotesnd )
INPUT_PORTS_END
static INPUT_PORTS_START( abunai )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1360,7 +1360,7 @@ static INPUT_PORTS_START( abunai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x00, "Oyaken" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1386,7 +1386,7 @@ static INPUT_PORTS_START( abunai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1400,7 +1400,7 @@ static INPUT_PORTS_START( abunai )
INPUT_PORTS_END
static INPUT_PORTS_START( mgmen89 )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1426,7 +1426,7 @@ static INPUT_PORTS_START( mgmen89 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1452,7 +1452,7 @@ static INPUT_PORTS_START( mgmen89 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1469,7 +1469,7 @@ static INPUT_PORTS_START( mjfocus )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1495,7 +1495,7 @@ static INPUT_PORTS_START( mjfocus )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1521,7 +1521,7 @@ static INPUT_PORTS_START( mjfocus )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1535,7 +1535,7 @@ static INPUT_PORTS_START( mjfocus )
INPUT_PORTS_END
static INPUT_PORTS_START( mjfocusm )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, "Game Out" )
PORT_DIPSETTING( 0x07, "95% (Easy)" )
PORT_DIPSETTING( 0x06, "90%" )
@@ -1561,7 +1561,7 @@ static INPUT_PORTS_START( mjfocusm )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_2C ) )
@@ -1585,7 +1585,7 @@ static INPUT_PORTS_START( mjfocusm )
PORT_DIPSETTING( 0x80, "A" )
PORT_DIPSETTING( 0x00, "B" )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1599,7 +1599,7 @@ static INPUT_PORTS_START( mjfocusm )
INPUT_PORTS_END
static INPUT_PORTS_START( peepshow )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1625,7 +1625,7 @@ static INPUT_PORTS_START( peepshow )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1651,7 +1651,7 @@ static INPUT_PORTS_START( peepshow )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1665,7 +1665,7 @@ static INPUT_PORTS_START( peepshow )
INPUT_PORTS_END
static INPUT_PORTS_START( scandal )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1691,7 +1691,7 @@ static INPUT_PORTS_START( scandal )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "Character Display Test" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1717,7 +1717,7 @@ static INPUT_PORTS_START( scandal )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1731,7 +1731,7 @@ static INPUT_PORTS_START( scandal )
INPUT_PORTS_END
static INPUT_PORTS_START( scandalm )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, "Game Out" )
PORT_DIPSETTING( 0x07, "90% (Easy)" )
PORT_DIPSETTING( 0x06, "85%" )
@@ -1757,7 +1757,7 @@ static INPUT_PORTS_START( scandalm )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_2C ) )
@@ -1781,7 +1781,7 @@ static INPUT_PORTS_START( scandalm )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1795,7 +1795,7 @@ static INPUT_PORTS_START( scandalm )
INPUT_PORTS_END
static INPUT_PORTS_START( mjnanpas )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1821,7 +1821,7 @@ static INPUT_PORTS_START( mjnanpas )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1847,7 +1847,7 @@ static INPUT_PORTS_START( mjnanpas )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1861,7 +1861,7 @@ static INPUT_PORTS_START( mjnanpas )
INPUT_PORTS_END
static INPUT_PORTS_START( mjnanpaa )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1887,7 +1887,7 @@ static INPUT_PORTS_START( mjnanpaa )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1913,7 +1913,7 @@ static INPUT_PORTS_START( mjnanpaa )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1930,7 +1930,7 @@ static INPUT_PORTS_START( bananadr )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1956,7 +1956,7 @@ static INPUT_PORTS_START( bananadr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1982,7 +1982,7 @@ static INPUT_PORTS_START( bananadr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1996,7 +1996,7 @@ static INPUT_PORTS_START( bananadr )
INPUT_PORTS_END
static INPUT_PORTS_START( club90s )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -2021,7 +2021,7 @@ static INPUT_PORTS_START( club90s )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2047,7 +2047,7 @@ static INPUT_PORTS_START( club90s )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2064,7 +2064,7 @@ static INPUT_PORTS_START( lovehous )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, "Game Out" )
PORT_DIPSETTING( 0x07, "90% (Easy)" )
PORT_DIPSETTING( 0x06, "85%" )
@@ -2090,7 +2090,7 @@ static INPUT_PORTS_START( lovehous )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2114,7 +2114,7 @@ static INPUT_PORTS_START( lovehous )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0-1 */
+ PORT_START("SYSTEM") /* (2) PORT 0-1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2126,7 +2126,7 @@ static INPUT_PORTS_START( lovehous )
PORT_INCLUDE( nbmjcontrols )
- PORT_START_TAG("PORT0-2") /* (13) PORT 0-2 */
+ PORT_START("PORT0-2") /* (13) PORT 0-2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // OUT COIN
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2138,7 +2138,7 @@ static INPUT_PORTS_START( lovehous )
INPUT_PORTS_END
static INPUT_PORTS_START( mladyhtr )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -2163,7 +2163,7 @@ static INPUT_PORTS_START( mladyhtr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2189,7 +2189,7 @@ static INPUT_PORTS_START( mladyhtr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2203,7 +2203,7 @@ static INPUT_PORTS_START( mladyhtr )
INPUT_PORTS_END
static INPUT_PORTS_START( chinmoku )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -2228,7 +2228,7 @@ static INPUT_PORTS_START( chinmoku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2254,7 +2254,7 @@ static INPUT_PORTS_START( chinmoku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2268,7 +2268,7 @@ static INPUT_PORTS_START( chinmoku )
INPUT_PORTS_END
static INPUT_PORTS_START( maiko )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -2294,7 +2294,7 @@ static INPUT_PORTS_START( maiko )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2320,7 +2320,7 @@ static INPUT_PORTS_START( maiko )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0-1 */
+ PORT_START("SYSTEM") /* (2) PORT 0-1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) //
@@ -2332,7 +2332,7 @@ static INPUT_PORTS_START( maiko )
PORT_INCLUDE( nbmjcontrols )
- PORT_START_TAG("PORT0-2") /* (13) PORT 0-2 */
+ PORT_START("PORT0-2") /* (13) PORT 0-2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // OUT COIN
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2347,7 +2347,7 @@ static INPUT_PORTS_START( mmaiko )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, "Game Out" )
PORT_DIPSETTING( 0x07, "90% (Easy)" )
PORT_DIPSETTING( 0x06, "85%" )
@@ -2371,7 +2371,7 @@ static INPUT_PORTS_START( mmaiko )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
@@ -2396,7 +2396,7 @@ static INPUT_PORTS_START( mmaiko )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0-1 */
+ PORT_START("SYSTEM") /* (2) PORT 0-1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2408,7 +2408,7 @@ static INPUT_PORTS_START( mmaiko )
PORT_INCLUDE( nbmjcontrols )
- PORT_START_TAG("PORT0-2") /* (13) PORT 0-2 */
+ PORT_START("PORT0-2") /* (13) PORT 0-2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // OUT COIN
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2420,7 +2420,7 @@ static INPUT_PORTS_START( mmaiko )
INPUT_PORTS_END
static INPUT_PORTS_START( hanaoji )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2446,7 +2446,7 @@ static INPUT_PORTS_START( hanaoji )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2472,7 +2472,7 @@ static INPUT_PORTS_START( hanaoji )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0-1 */
+ PORT_START("SYSTEM") /* (2) PORT 0-1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) //
@@ -2484,7 +2484,7 @@ static INPUT_PORTS_START( hanaoji )
PORT_INCLUDE( nbmjcontrols )
- PORT_START_TAG("PORT0-2") /* (13) PORT 0-2 */
+ PORT_START("PORT0-2") /* (13) PORT 0-2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // OUT COIN
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2496,7 +2496,7 @@ static INPUT_PORTS_START( hanaoji )
INPUT_PORTS_END
static INPUT_PORTS_START( pairsnb )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) ) // Hearts : 10 - Time : 60/60
PORT_DIPSETTING( 0x02, DEF_STR( Medium ) ) // Hearts : 7 - Time : 44/60
@@ -2521,7 +2521,7 @@ static INPUT_PORTS_START( pairsnb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2547,7 +2547,7 @@ static INPUT_PORTS_START( pairsnb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2557,7 +2557,7 @@ static INPUT_PORTS_START( pairsnb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // not in "test mode"
- PORT_START_TAG("P1") /* (3) PORT 1 */
+ PORT_START("P1") /* (3) PORT 1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) PORT_4WAY
@@ -2567,7 +2567,7 @@ static INPUT_PORTS_START( pairsnb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2") /* (4) PORT 2 */
+ PORT_START("P2") /* (4) PORT 2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) PORT_4WAY
@@ -2579,7 +2579,7 @@ static INPUT_PORTS_START( pairsnb )
INPUT_PORTS_END
static INPUT_PORTS_START( taiwanmb )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, "Game Out" )
PORT_DIPSETTING( 0x07, "95% (Easy)" )
PORT_DIPSETTING( 0x06, "90%" )
@@ -2603,7 +2603,7 @@ static INPUT_PORTS_START( taiwanmb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x00, "Last Chance" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2627,7 +2627,7 @@ static INPUT_PORTS_START( taiwanmb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWC") /* (2) DIPSW-C */
+ PORT_START("DSWC") /* (2) DIPSW-C */
PORT_DIPNAME( 0x03, 0x03, "?? cut" )
PORT_DIPSETTING( 0x03, DEF_STR( Off ) )
PORT_DIPSETTING( 0x02, "16 - ?H??" )
@@ -2650,7 +2650,7 @@ static INPUT_PORTS_START( taiwanmb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (3) PORT 0 */
+ PORT_START("SYSTEM") /* (3) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
diff --git a/src/mame/drivers/nbmj8991.c b/src/mame/drivers/nbmj8991.c
index b4880da6e39..e36aba18138 100644
--- a/src/mame/drivers/nbmj8991.c
+++ b/src/mame/drivers/nbmj8991.c
@@ -440,7 +440,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( pstadium )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1 (Easy)" )
PORT_DIPSETTING( 0x02, "2" )
@@ -465,7 +465,7 @@ static INPUT_PORTS_START( pstadium )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -491,7 +491,7 @@ static INPUT_PORTS_START( pstadium )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -505,7 +505,7 @@ static INPUT_PORTS_START( pstadium )
INPUT_PORTS_END
static INPUT_PORTS_START( triplew1 )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1 (Easy)" )
PORT_DIPSETTING( 0x02, "2" )
@@ -530,7 +530,7 @@ static INPUT_PORTS_START( triplew1 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -556,7 +556,7 @@ static INPUT_PORTS_START( triplew1 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -570,7 +570,7 @@ static INPUT_PORTS_START( triplew1 )
INPUT_PORTS_END
static INPUT_PORTS_START( ntopstar )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1 (Easy)" )
PORT_DIPSETTING( 0x02, "2" )
@@ -595,7 +595,7 @@ static INPUT_PORTS_START( ntopstar )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -621,7 +621,7 @@ static INPUT_PORTS_START( ntopstar )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -635,7 +635,7 @@ static INPUT_PORTS_START( ntopstar )
INPUT_PORTS_END
static INPUT_PORTS_START( mjlstory )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1 (Easy)" )
PORT_DIPSETTING( 0x02, "2" )
@@ -660,7 +660,7 @@ static INPUT_PORTS_START( mjlstory )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -686,7 +686,7 @@ static INPUT_PORTS_START( mjlstory )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -700,7 +700,7 @@ static INPUT_PORTS_START( mjlstory )
INPUT_PORTS_END
static INPUT_PORTS_START( vanilla )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1 (Easy)" )
PORT_DIPSETTING( 0x02, "2" )
@@ -725,7 +725,7 @@ static INPUT_PORTS_START( vanilla )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -751,7 +751,7 @@ static INPUT_PORTS_START( vanilla )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -768,7 +768,7 @@ static INPUT_PORTS_START( finalbny )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, "Game Out" )
PORT_DIPSETTING( 0x07, "90% (Easy)" )
PORT_DIPSETTING( 0x06, "85%" )
@@ -794,7 +794,7 @@ static INPUT_PORTS_START( finalbny )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -818,7 +818,7 @@ static INPUT_PORTS_START( finalbny )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -832,7 +832,7 @@ static INPUT_PORTS_START( finalbny )
INPUT_PORTS_END
static INPUT_PORTS_START( qmhayaku )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1 (Easy)" )
PORT_DIPSETTING( 0x02, "2" )
@@ -857,7 +857,7 @@ static INPUT_PORTS_START( qmhayaku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -883,7 +883,7 @@ static INPUT_PORTS_START( qmhayaku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -897,7 +897,7 @@ static INPUT_PORTS_START( qmhayaku )
INPUT_PORTS_END
static INPUT_PORTS_START( galkoku )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -923,7 +923,7 @@ static INPUT_PORTS_START( galkoku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -949,7 +949,7 @@ static INPUT_PORTS_START( galkoku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -966,7 +966,7 @@ static INPUT_PORTS_START( hyouban )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -992,7 +992,7 @@ static INPUT_PORTS_START( hyouban )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1018,7 +1018,7 @@ static INPUT_PORTS_START( hyouban )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1035,7 +1035,7 @@ static INPUT_PORTS_START( galkaika )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1061,7 +1061,7 @@ static INPUT_PORTS_START( galkaika )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1087,7 +1087,7 @@ static INPUT_PORTS_START( galkaika )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1104,7 +1104,7 @@ static INPUT_PORTS_START( tokyogal )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1130,7 +1130,7 @@ static INPUT_PORTS_START( tokyogal )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1156,7 +1156,7 @@ static INPUT_PORTS_START( tokyogal )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1173,7 +1173,7 @@ static INPUT_PORTS_START( tokimbsj )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1199,7 +1199,7 @@ static INPUT_PORTS_START( tokimbsj )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1225,7 +1225,7 @@ static INPUT_PORTS_START( tokimbsj )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1242,7 +1242,7 @@ static INPUT_PORTS_START( mcontest )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1268,7 +1268,7 @@ static INPUT_PORTS_START( mcontest )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1294,7 +1294,7 @@ static INPUT_PORTS_START( mcontest )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1311,7 +1311,7 @@ static INPUT_PORTS_START( uchuuai )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1337,7 +1337,7 @@ static INPUT_PORTS_START( uchuuai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1363,7 +1363,7 @@ static INPUT_PORTS_START( uchuuai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1380,7 +1380,7 @@ static INPUT_PORTS_START( mjgottub )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1406,7 +1406,7 @@ static INPUT_PORTS_START( mjgottub )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1432,7 +1432,7 @@ static INPUT_PORTS_START( mjgottub )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1446,7 +1446,7 @@ static INPUT_PORTS_START( mjgottub )
INPUT_PORTS_END
static INPUT_PORTS_START( av2mj1bb )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1471,7 +1471,7 @@ static INPUT_PORTS_START( av2mj1bb )
PORT_DIPSETTING( 0x40, "Type-C" )
PORT_DIPSETTING( 0x00, "Type-D" )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x03, "Attract mode" )
PORT_DIPSETTING( 0x03, "No attract mode" )
PORT_DIPSETTING( 0x02, "Once per 10min." )
@@ -1496,7 +1496,7 @@ static INPUT_PORTS_START( av2mj1bb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1513,7 +1513,7 @@ static INPUT_PORTS_START( av2mj2rg )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1538,7 +1538,7 @@ static INPUT_PORTS_START( av2mj2rg )
PORT_DIPSETTING( 0x40, "Type-C" )
PORT_DIPSETTING( 0x00, "Type-D" )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x03, "Attract mode" )
PORT_DIPSETTING( 0x03, "No attract mode" )
PORT_DIPSETTING( 0x02, "Once per 10min." )
@@ -1563,7 +1563,7 @@ static INPUT_PORTS_START( av2mj2rg )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c
index 90f20755443..5d5e02c4b95 100644
--- a/src/mame/drivers/nbmj9195.c
+++ b/src/mame/drivers/nbmj9195.c
@@ -1776,7 +1776,7 @@ static INPUT_PORTS_START( mjuraden )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1802,7 +1802,7 @@ static INPUT_PORTS_START( mjuraden )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1828,7 +1828,7 @@ static INPUT_PORTS_START( mjuraden )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -1845,7 +1845,7 @@ static INPUT_PORTS_START( koinomp )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1871,7 +1871,7 @@ static INPUT_PORTS_START( koinomp )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1897,7 +1897,7 @@ static INPUT_PORTS_START( koinomp )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -1914,7 +1914,7 @@ static INPUT_PORTS_START( patimono )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1940,7 +1940,7 @@ static INPUT_PORTS_START( patimono )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1966,7 +1966,7 @@ static INPUT_PORTS_START( patimono )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -1983,7 +1983,7 @@ static INPUT_PORTS_START( janbari )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2009,7 +2009,7 @@ static INPUT_PORTS_START( janbari )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -2035,7 +2035,7 @@ static INPUT_PORTS_START( janbari )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2052,7 +2052,7 @@ static INPUT_PORTS_START( mjanbari )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2078,7 +2078,7 @@ static INPUT_PORTS_START( mjanbari )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -2104,7 +2104,7 @@ static INPUT_PORTS_START( mjanbari )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2121,7 +2121,7 @@ static INPUT_PORTS_START( mmehyou )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2147,7 +2147,7 @@ static INPUT_PORTS_START( mmehyou )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -2173,7 +2173,7 @@ static INPUT_PORTS_START( mmehyou )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2190,7 +2190,7 @@ static INPUT_PORTS_START( ultramhm )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2216,7 +2216,7 @@ static INPUT_PORTS_START( ultramhm )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2242,7 +2242,7 @@ static INPUT_PORTS_START( ultramhm )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2259,7 +2259,7 @@ static INPUT_PORTS_START( gal10ren )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2285,7 +2285,7 @@ static INPUT_PORTS_START( gal10ren )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2311,7 +2311,7 @@ static INPUT_PORTS_START( gal10ren )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2328,7 +2328,7 @@ static INPUT_PORTS_START( renaiclb )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2354,7 +2354,7 @@ static INPUT_PORTS_START( renaiclb )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2380,7 +2380,7 @@ static INPUT_PORTS_START( renaiclb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2394,7 +2394,7 @@ static INPUT_PORTS_START( renaiclb )
INPUT_PORTS_END
static INPUT_PORTS_START( mjlaman )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -2419,7 +2419,7 @@ static INPUT_PORTS_START( mjlaman )
PORT_DIPSETTING( 0x20, "7" )
PORT_DIPSETTING( 0x00, "8 (Hard)" )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2445,7 +2445,7 @@ static INPUT_PORTS_START( mjlaman )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2459,7 +2459,7 @@ static INPUT_PORTS_START( mjlaman )
INPUT_PORTS_END
static INPUT_PORTS_START( mkeibaou )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -2484,7 +2484,7 @@ static INPUT_PORTS_START( mkeibaou )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2510,7 +2510,7 @@ static INPUT_PORTS_START( mkeibaou )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2524,7 +2524,7 @@ static INPUT_PORTS_START( mkeibaou )
INPUT_PORTS_END
static INPUT_PORTS_START( pachiten )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, "Game Out" )
PORT_DIPSETTING( 0x07, "90% (Easy)" )
PORT_DIPSETTING( 0x06, "85%" )
@@ -2550,7 +2550,7 @@ static INPUT_PORTS_START( pachiten )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -2574,7 +2574,7 @@ static INPUT_PORTS_START( pachiten )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2588,7 +2588,7 @@ static INPUT_PORTS_START( pachiten )
INPUT_PORTS_END
static INPUT_PORTS_START( sailorws )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -2613,7 +2613,7 @@ static INPUT_PORTS_START( sailorws )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2639,7 +2639,7 @@ static INPUT_PORTS_START( sailorws )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2653,7 +2653,7 @@ static INPUT_PORTS_START( sailorws )
INPUT_PORTS_END
static INPUT_PORTS_START( sailorwr )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, "Game Out" )
PORT_DIPSETTING( 0x07, "90% (Easy)" )
PORT_DIPSETTING( 0x06, "85%" )
@@ -2679,7 +2679,7 @@ static INPUT_PORTS_START( sailorwr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -2703,7 +2703,7 @@ static INPUT_PORTS_START( sailorwr )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2717,7 +2717,7 @@ static INPUT_PORTS_START( sailorwr )
INPUT_PORTS_END
static INPUT_PORTS_START( psailor1 )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -2742,7 +2742,7 @@ static INPUT_PORTS_START( psailor1 )
PORT_DIPSETTING( 0x20, "7" )
PORT_DIPSETTING( 0x00, "8 (Hard)" )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x03, "Start Score" )
PORT_DIPSETTING( 0x00, "5000" )
PORT_DIPSETTING( 0x01, "3000" )
@@ -2767,7 +2767,7 @@ static INPUT_PORTS_START( psailor1 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2781,7 +2781,7 @@ static INPUT_PORTS_START( psailor1 )
INPUT_PORTS_END
static INPUT_PORTS_START( psailor2 )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -2806,7 +2806,7 @@ static INPUT_PORTS_START( psailor2 )
PORT_DIPSETTING( 0x20, "7" )
PORT_DIPSETTING( 0x00, "8 (Hard)" )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x03, "Start Score" )
PORT_DIPSETTING( 0x00, "5000" )
PORT_DIPSETTING( 0x01, "3000" )
@@ -2831,7 +2831,7 @@ static INPUT_PORTS_START( psailor2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2848,7 +2848,7 @@ static INPUT_PORTS_START( otatidai )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -2873,7 +2873,7 @@ static INPUT_PORTS_START( otatidai )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_3C ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x03, "Start Score" )
PORT_DIPSETTING( 0x00, "5000" )
PORT_DIPSETTING( 0x01, "3000" )
@@ -2898,7 +2898,7 @@ static INPUT_PORTS_START( otatidai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2915,7 +2915,7 @@ static INPUT_PORTS_START( wcatcher )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -2940,7 +2940,7 @@ static INPUT_PORTS_START( wcatcher )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_3C ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2966,7 +2966,7 @@ static INPUT_PORTS_START( wcatcher )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2983,7 +2983,7 @@ static INPUT_PORTS_START( yosimoto )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -3008,7 +3008,7 @@ static INPUT_PORTS_START( yosimoto )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x03, "Start Score" )
PORT_DIPSETTING( 0x00, "5000" )
PORT_DIPSETTING( 0x01, "3000" )
@@ -3033,7 +3033,7 @@ static INPUT_PORTS_START( yosimoto )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -3050,7 +3050,7 @@ static INPUT_PORTS_START( jituroku )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3076,7 +3076,7 @@ static INPUT_PORTS_START( jituroku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3102,7 +3102,7 @@ static INPUT_PORTS_START( jituroku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -3116,7 +3116,7 @@ static INPUT_PORTS_START( jituroku )
INPUT_PORTS_END
static INPUT_PORTS_START( ngpgal )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -3142,7 +3142,7 @@ static INPUT_PORTS_START( ngpgal )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3168,7 +3168,7 @@ static INPUT_PORTS_START( ngpgal )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -3182,7 +3182,7 @@ static INPUT_PORTS_START( ngpgal )
INPUT_PORTS_END
static INPUT_PORTS_START( mjgottsu )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -3207,7 +3207,7 @@ static INPUT_PORTS_START( mjgottsu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3233,7 +3233,7 @@ static INPUT_PORTS_START( mjgottsu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -3247,7 +3247,7 @@ static INPUT_PORTS_START( mjgottsu )
INPUT_PORTS_END
static INPUT_PORTS_START( bakuhatu )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -3272,7 +3272,7 @@ static INPUT_PORTS_START( bakuhatu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3298,7 +3298,7 @@ static INPUT_PORTS_START( bakuhatu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -3312,7 +3312,7 @@ static INPUT_PORTS_START( bakuhatu )
INPUT_PORTS_END
static INPUT_PORTS_START( cmehyou )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -3338,7 +3338,7 @@ static INPUT_PORTS_START( cmehyou )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3364,7 +3364,7 @@ static INPUT_PORTS_START( cmehyou )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -3378,7 +3378,7 @@ static INPUT_PORTS_START( cmehyou )
INPUT_PORTS_END
static INPUT_PORTS_START( mjkoiura )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -3404,7 +3404,7 @@ static INPUT_PORTS_START( mjkoiura )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3430,7 +3430,7 @@ static INPUT_PORTS_START( mjkoiura )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -3444,7 +3444,7 @@ static INPUT_PORTS_START( mjkoiura )
INPUT_PORTS_END
static INPUT_PORTS_START( mscoutm )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -3469,7 +3469,7 @@ static INPUT_PORTS_START( mscoutm )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3495,7 +3495,7 @@ static INPUT_PORTS_START( mscoutm )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -3509,7 +3509,7 @@ static INPUT_PORTS_START( mscoutm )
INPUT_PORTS_END
static INPUT_PORTS_START( imekura )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -3534,7 +3534,7 @@ static INPUT_PORTS_START( imekura )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_3C ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3560,7 +3560,7 @@ static INPUT_PORTS_START( imekura )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -3574,7 +3574,7 @@ static INPUT_PORTS_START( imekura )
INPUT_PORTS_END
static INPUT_PORTS_START( mjegolf )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -3599,7 +3599,7 @@ static INPUT_PORTS_START( mjegolf )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_3C ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3625,7 +3625,7 @@ static INPUT_PORTS_START( mjegolf )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c
index cc37cfbd9bb..613acf634d7 100644
--- a/src/mame/drivers/nemesis.c
+++ b/src/mame/drivers/nemesis.c
@@ -870,7 +870,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( nemesis )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 )
@@ -880,7 +880,7 @@ static INPUT_PORTS_START( nemesis )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -890,7 +890,7 @@ static INPUT_PORTS_START( nemesis )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) // missile
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -900,7 +900,7 @@ static INPUT_PORTS_START( nemesis )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("TEST") /* TEST */
+ PORT_START("TEST") /* TEST */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SWT:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -914,10 +914,10 @@ static INPUT_PORTS_START( nemesis )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
GX400_COINAGE_DIP
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -943,7 +943,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( nemesuk )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 )
@@ -953,7 +953,7 @@ static INPUT_PORTS_START( nemesuk )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -963,7 +963,7 @@ static INPUT_PORTS_START( nemesuk )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) // missile
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -973,7 +973,7 @@ static INPUT_PORTS_START( nemesuk )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("TEST") /* TEST */
+ PORT_START("TEST") /* TEST */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SWT:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -987,10 +987,10 @@ static INPUT_PORTS_START( nemesuk )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
GX400_COINAGE_DIP
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -1017,7 +1017,7 @@ INPUT_PORTS_END
/* This needs to be sorted */
static INPUT_PORTS_START( konamigt )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 )
@@ -1027,14 +1027,14 @@ static INPUT_PORTS_START( konamigt )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON3 ) /* gear */
PORT_BIT( 0xef, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("TEST") /* TEST */
+ PORT_START("TEST") /* TEST */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SWT:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1048,10 +1048,10 @@ static INPUT_PORTS_START( konamigt )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
GX400_COINAGE_DIP
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1076,10 +1076,10 @@ static INPUT_PORTS_START( konamigt )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("PADDLE") /* IN6 */
+ PORT_START("PADDLE") /* IN6 */
PORT_BIT( 0x7f, 0x40, IPT_PADDLE ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10)
- PORT_START_TAG("IN3") /* IN7 */
+ PORT_START("IN3") /* IN7 */
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 )
// PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON4 )
@@ -1088,7 +1088,7 @@ INPUT_PORTS_END
/* This needs to be sorted */
static INPUT_PORTS_START( rf2 )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1098,14 +1098,14 @@ static INPUT_PORTS_START( rf2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_BUTTON3 ) /* gear (0-7) */
PORT_BIT( 0x8f, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("TEST") /* TEST */
+ PORT_START("TEST") /* TEST */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SWT:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1119,10 +1119,10 @@ static INPUT_PORTS_START( rf2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
GX400_COINAGE_DIP
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1147,10 +1147,10 @@ static INPUT_PORTS_START( rf2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("PADDLE") /* IN6 */
+ PORT_START("PADDLE") /* IN6 */
PORT_BIT( 0x7f, 0x40, IPT_PADDLE ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10)
- PORT_START_TAG("IN3") /* IN7 */
+ PORT_START("IN3") /* IN7 */
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 )
// PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON4 )
@@ -1159,7 +1159,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( gwarrior )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1169,7 +1169,7 @@ static INPUT_PORTS_START( gwarrior )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -1179,7 +1179,7 @@ static INPUT_PORTS_START( gwarrior )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -1189,7 +1189,7 @@ static INPUT_PORTS_START( gwarrior )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("TEST") /* TEST */
+ PORT_START("TEST") /* TEST */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SWT:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1203,10 +1203,10 @@ static INPUT_PORTS_START( gwarrior )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
GX400_COINAGE_DIP
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -1232,7 +1232,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( twinbee )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1242,7 +1242,7 @@ static INPUT_PORTS_START( twinbee )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -1252,7 +1252,7 @@ static INPUT_PORTS_START( twinbee )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -1262,7 +1262,7 @@ static INPUT_PORTS_START( twinbee )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("TEST") /* TEST */
+ PORT_START("TEST") /* TEST */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SWT:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1276,10 +1276,10 @@ static INPUT_PORTS_START( twinbee )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
GX400_COINAGE_DIP
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -1305,7 +1305,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( gradius )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1315,7 +1315,7 @@ static INPUT_PORTS_START( gradius )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -1325,7 +1325,7 @@ static INPUT_PORTS_START( gradius )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) // missile
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -1335,7 +1335,7 @@ static INPUT_PORTS_START( gradius )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("TEST") /* TEST */
+ PORT_START("TEST") /* TEST */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SWT:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1349,10 +1349,10 @@ static INPUT_PORTS_START( gradius )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
GX400_COINAGE_DIP
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -1378,7 +1378,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( salamand )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 )
@@ -1392,7 +1392,7 @@ static INPUT_PORTS_START( salamand )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_LOW, "SWT:3" )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -1404,7 +1404,7 @@ static INPUT_PORTS_START( salamand )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -1414,7 +1414,7 @@ static INPUT_PORTS_START( salamand )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW0:1,2,3,4")
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -1445,7 +1445,7 @@ static INPUT_PORTS_START( salamand )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -1471,7 +1471,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( lifefrcj )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 )
@@ -1485,7 +1485,7 @@ static INPUT_PORTS_START( lifefrcj )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_LOW, "SWT:3" )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -1497,7 +1497,7 @@ static INPUT_PORTS_START( lifefrcj )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -1507,7 +1507,7 @@ static INPUT_PORTS_START( lifefrcj )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW0:1,2,3,4")
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -1543,7 +1543,7 @@ static INPUT_PORTS_START( lifefrcj )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x00, "Disabled" )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -1568,7 +1568,7 @@ static INPUT_PORTS_START( lifefrcj )
INPUT_PORTS_END
static INPUT_PORTS_START( blkpnthr )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 )
@@ -1583,7 +1583,7 @@ static INPUT_PORTS_START( blkpnthr )
PORT_DIPSETTING( 0x40, "3 Areas" )
PORT_DIPSETTING( 0x00, "4 Areas" )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -1593,7 +1593,7 @@ static INPUT_PORTS_START( blkpnthr )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_LOW, "SWT:3" )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -1603,7 +1603,7 @@ static INPUT_PORTS_START( blkpnthr )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW0:1,2,3,4")
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -1639,7 +1639,7 @@ static INPUT_PORTS_START( blkpnthr )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x00, "Disabled" )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -1664,7 +1664,7 @@ static INPUT_PORTS_START( blkpnthr )
INPUT_PORTS_END
static INPUT_PORTS_START( citybomb )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1678,7 +1678,7 @@ static INPUT_PORTS_START( citybomb )
PORT_DIPSETTING( 0x00, DEF_STR( Dual ) )
PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_LOW, "SWT:3" )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -1690,7 +1690,7 @@ static INPUT_PORTS_START( citybomb )
PORT_DIPSETTING( 0x00, "Handle" )
PORT_DIPSETTING( 0x80, DEF_STR( Joystick ) )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -1700,7 +1700,7 @@ static INPUT_PORTS_START( citybomb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW0:1,2,3,4")
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -1736,7 +1736,7 @@ static INPUT_PORTS_START( citybomb )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x00, "Disabled" )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x04, DEF_STR( Cocktail ) )
@@ -1756,7 +1756,7 @@ static INPUT_PORTS_START( citybomb )
INPUT_PORTS_END
static INPUT_PORTS_START( nyanpani )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1768,7 +1768,7 @@ static INPUT_PORTS_START( nyanpani )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_LOW, "SWT:2" )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -1778,7 +1778,7 @@ static INPUT_PORTS_START( nyanpani )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -1788,7 +1788,7 @@ static INPUT_PORTS_START( nyanpani )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW0:1,2,3,4")
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -1824,7 +1824,7 @@ static INPUT_PORTS_START( nyanpani )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x00, "Disabled" )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -1841,7 +1841,7 @@ static INPUT_PORTS_START( nyanpani )
INPUT_PORTS_END
static INPUT_PORTS_START( hcrash )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 )
@@ -1851,7 +1851,7 @@ static INPUT_PORTS_START( hcrash )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -1861,10 +1861,10 @@ static INPUT_PORTS_START( hcrash )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("TEST") /* TEST */
+ PORT_START("TEST") /* TEST */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SWT:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1888,10 +1888,10 @@ static INPUT_PORTS_START( hcrash )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
GX400_COINAGE_DIP
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, "Konami GT without brake" )
PORT_DIPSETTING( 0x02, "WEC Le Mans 24 Upright" )
@@ -1916,19 +1916,19 @@ static INPUT_PORTS_START( hcrash )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
/* Konami GT specific control */
- PORT_START_TAG("PADDLE") /* IN6 */
+ PORT_START("PADDLE") /* IN6 */
PORT_BIT( 0x7f, 0x40, IPT_PADDLE ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10)
- PORT_START_TAG("IN3") /* IN7 */
+ PORT_START("IN3") /* IN7 */
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Brake (Konami GT cabinet)")
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 )
// PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON4 )
/* WEC Le Mans 24 specific control */
- PORT_START_TAG("ACCEL") /* IN8 - Accelerator */
+ PORT_START("ACCEL") /* IN8 - Accelerator */
PORT_BIT( 0xff, 0, IPT_PEDAL ) PORT_MINMAX(0,0x80) PORT_SENSITIVITY(30) PORT_KEYDELTA(10)
- PORT_START_TAG("WHEEL") /* IN9 - Steering Wheel */
+ PORT_START("WHEEL") /* IN9 - Steering Wheel */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5)
INPUT_PORTS_END
diff --git a/src/mame/drivers/neodrvr.c b/src/mame/drivers/neodrvr.c
index 7b33e3e8084..585c3c3c82d 100644
--- a/src/mame/drivers/neodrvr.c
+++ b/src/mame/drivers/neodrvr.c
@@ -18,7 +18,7 @@ static INPUT_PORTS_START( svcpcb )
STANDARD_IN4
/* the rom banking is tied directly to the dipswitch?, or is there a bank write somewhere? */
- PORT_START_TAG("HARDDIP")
+ PORT_START("HARDDIP")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Region ) ) PORT_DIPLOCATION("HARDDIP:3")
PORT_DIPSETTING( 0x00, DEF_STR( Asia ) )
PORT_DIPSETTING( 0x01, DEF_STR( Japan ) )
@@ -37,7 +37,7 @@ static INPUT_PORTS_START( kog )
STANDARD_IN4
/* a jumper on the pcb overlays a ROM address, very strange but that's how it works. */
- PORT_START_TAG("JUMPER")
+ PORT_START("JUMPER")
PORT_DIPNAME( 0x0001, 0x0001, "Title Language" ) PORT_DIPLOCATION("CART-JUMPER:1")
PORT_DIPSETTING( 0x0001, DEF_STR( English ) )
PORT_DIPSETTING( 0x0000, "Non-English" )
@@ -47,7 +47,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mjneogeo )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_DIPNAME( 0x0001, 0x0001, "Test Switch" ) PORT_DIPLOCATION("SW:1")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -79,7 +79,7 @@ static INPUT_PORTS_START( mjneogeo )
STANDARD_IN4
- PORT_START_TAG("MAHJONG1")
+ PORT_START("MAHJONG1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_C )
@@ -90,7 +90,7 @@ static INPUT_PORTS_START( mjneogeo )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("MAHJONG2")
+ PORT_START("MAHJONG2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_I )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_J )
@@ -101,7 +101,7 @@ static INPUT_PORTS_START( mjneogeo )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("MAHJONG3")
+ PORT_START("MAHJONG3")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
@@ -112,7 +112,7 @@ static INPUT_PORTS_START( mjneogeo )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON4 )
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("MAHJONG4")
+ PORT_START("MAHJONG4")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
@@ -126,18 +126,18 @@ INPUT_PORTS_END
static INPUT_PORTS_START( irrmaze )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
STANDARD_DIPS
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(multiplexed_controller_r, "0")
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0fff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -148,7 +148,7 @@ static INPUT_PORTS_START( irrmaze )
STANDARD_IN3
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -159,22 +159,22 @@ static INPUT_PORTS_START( irrmaze )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Enter BIOS") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0-0")
+ PORT_START("IN0-0")
PORT_BIT( 0x00ff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(10) PORT_KEYDELTA(20) PORT_REVERSE
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN0-1")
+ PORT_START("IN0-1")
PORT_BIT( 0x00ff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(10) PORT_KEYDELTA(20) PORT_REVERSE
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( popbounc )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
STANDARD_DIPS
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(multiplexed_controller_r, "0")
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(multiplexed_controller_r, "1")
@@ -184,7 +184,7 @@ static INPUT_PORTS_START( popbounc )
STANDARD_IN4
- PORT_START_TAG("IN0-0")
+ PORT_START("IN0-0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
@@ -194,10 +194,10 @@ static INPUT_PORTS_START( popbounc )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN0-1")
+ PORT_START("IN0-1")
PORT_BIT( 0x00ff, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START_TAG("IN1-0")
+ PORT_START("IN1-0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -207,14 +207,14 @@ static INPUT_PORTS_START( popbounc )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN1-1") /* IN1 multiplexed */
+ PORT_START("IN1-1") /* IN1 multiplexed */
PORT_BIT( 0x00ff, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(20) PORT_PLAYER(2)
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( vliner )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
STANDARD_DIPS
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
@@ -225,7 +225,7 @@ static INPUT_PORTS_START( vliner )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Stop/Double Up")
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Start/Collect")
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* this bit is used.. */
@@ -234,14 +234,14 @@ static INPUT_PORTS_START( vliner )
PORT_BIT( 0x7000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(get_memcard_status, 0 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x003f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x00c0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(get_calendar_status, 0 )
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(get_audio_result, 0 )
STANDARD_IN4
- PORT_START_TAG("IN5")
+ PORT_START("IN5")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -253,7 +253,7 @@ static INPUT_PORTS_START( vliner )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
/* not sure what any of these bits are */
- PORT_START_TAG("IN6")
+ PORT_START("IN6")
PORT_BIT( 0x0003, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xffc0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -264,7 +264,7 @@ static INPUT_PORTS_START( jockeygp )
STANDARD_IN1
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* game freezes with this bit enabled */
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Next Game") PORT_CODE(KEYCODE_7)
diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c
index cbbc6308a3c..c79d0db4b45 100644
--- a/src/mame/drivers/neogeo.c
+++ b/src/mame/drivers/neogeo.c
@@ -1148,7 +1148,7 @@ static struct YM2610interface ym2610_interface =
#define STANDARD_IN0 \
- PORT_START_TAG("IN0") \
+ PORT_START("IN0") \
STANDARD_DIPS \
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) \
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) \
@@ -1161,7 +1161,7 @@ static struct YM2610interface ym2610_interface =
#define STANDARD_IN1 \
- PORT_START_TAG("IN1") \
+ PORT_START("IN1") \
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED ) \
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) \
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) \
@@ -1174,7 +1174,7 @@ static struct YM2610interface ym2610_interface =
#define STANDARD_IN2 \
- PORT_START_TAG("IN2") \
+ PORT_START("IN2") \
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED ) \
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 ) \
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Next Game") PORT_CODE(KEYCODE_7) \
@@ -1185,7 +1185,7 @@ static struct YM2610interface ym2610_interface =
#define STANDARD_IN3 \
- PORT_START_TAG("IN3") \
+ PORT_START("IN3") \
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) \
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) \
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) \
@@ -1197,7 +1197,7 @@ static struct YM2610interface ym2610_interface =
#define STANDARD_IN4 \
- PORT_START_TAG("IN4") \
+ PORT_START("IN4") \
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_UNKNOWN ) \
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_UNKNOWN ) \
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_UNKNOWN ) \
diff --git a/src/mame/drivers/news.c b/src/mame/drivers/news.c
index f0780ad56d2..50fcde9d6ff 100644
--- a/src/mame/drivers/news.c
+++ b/src/mame/drivers/news.c
@@ -39,7 +39,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( news )
- PORT_START /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SWA:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -59,7 +59,7 @@ static INPUT_PORTS_START( news )
PORT_DIPUNUSED_DIPLOC( 0x40, IP_ACTIVE_LOW, "SWA:7" )
PORT_DIPUNUSED_DIPLOC( 0x80, IP_ACTIVE_LOW, "SWA:8" )
- PORT_START
+ PORT_START("INPUTS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -71,7 +71,7 @@ static INPUT_PORTS_START( news )
INPUT_PORTS_END
static INPUT_PORTS_START( newsa )
- PORT_START /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SWA:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -91,7 +91,7 @@ static INPUT_PORTS_START( newsa )
PORT_DIPUNUSED_DIPLOC( 0x40, IP_ACTIVE_LOW, "SWA:7" )
PORT_DIPUNUSED_DIPLOC( 0x80, IP_ACTIVE_LOW, "SWA:8" )
- PORT_START
+ PORT_START("INPUTS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
diff --git a/src/mame/drivers/ninjakd2.c b/src/mame/drivers/ninjakd2.c
index 097dc4bfb3d..cdd15b25d72 100644
--- a/src/mame/drivers/ninjakd2.c
+++ b/src/mame/drivers/ninjakd2.c
@@ -486,7 +486,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( common )
- PORT_START_TAG("KEYCOIN")
+ PORT_START("KEYCOIN")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -496,7 +496,7 @@ static INPUT_PORTS_START( common )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("PAD1")
+ PORT_START("PAD1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -506,7 +506,7 @@ static INPUT_PORTS_START( common )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("PAD2")
+ PORT_START("PAD2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -518,7 +518,7 @@ static INPUT_PORTS_START( common )
INPUT_PORTS_END
static INPUT_PORTS_START( common_2p )
- PORT_START_TAG("KEYCOIN")
+ PORT_START("KEYCOIN")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -528,7 +528,7 @@ static INPUT_PORTS_START( common_2p )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("PAD1")
+ PORT_START("PAD1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -538,7 +538,7 @@ static INPUT_PORTS_START( common_2p )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("PAD2")
+ PORT_START("PAD2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -553,7 +553,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( ninjakd2 )
PORT_INCLUDE(common)
- PORT_START_TAG("DIPSW1")
+ PORT_START("DIPSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -578,7 +578,7 @@ static INPUT_PORTS_START( ninjakd2 )
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
PORT_DIPSETTING( 0x80, DEF_STR( Japanese ) )
- PORT_START_TAG("DIPSW2")
+ PORT_START("DIPSW2")
PORT_SERVICE_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW2:1" )
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:2")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
@@ -615,7 +615,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mnight )
PORT_INCLUDE(common)
- PORT_START_TAG("DIPSW1")
+ PORT_START("DIPSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -640,7 +640,7 @@ static INPUT_PORTS_START( mnight )
PORT_DIPSETTING( 0x40, "4" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_START_TAG("DIPSW2")
+ PORT_START("DIPSW2")
PORT_SERVICE_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW2:1" )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:2")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -668,7 +668,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( arkarea )
PORT_INCLUDE(common_2p)
- PORT_START_TAG("DIPSW1")
+ PORT_START("DIPSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -693,7 +693,7 @@ static INPUT_PORTS_START( arkarea )
PORT_DIPSETTING( 0x80, "3" )
PORT_DIPSETTING( 0x00, "4" )
- PORT_START_TAG("DIPSW2")
+ PORT_START("DIPSW2")
PORT_SERVICE_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW2:1" )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:2")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -721,7 +721,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( robokid )
PORT_INCLUDE(common)
- PORT_START_TAG("DIPSW1")
+ PORT_START("DIPSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -746,7 +746,7 @@ static INPUT_PORTS_START( robokid )
PORT_DIPSETTING( 0x40, "4" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_START_TAG("DIPSW2")
+ PORT_START("DIPSW2")
PORT_SERVICE_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW2:8" )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:7")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -786,7 +786,7 @@ static INPUT_PORTS_START( omegaf )
PORT_MODIFY("KEYCOIN")
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("DIPSW1")
+ PORT_START("DIPSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -808,7 +808,7 @@ static INPUT_PORTS_START( omegaf )
PORT_DIPSETTING( 0x40, "4" )
PORT_DIPSETTING( 0x80, "5" )
- PORT_START_TAG("DIPSW2")
+ PORT_START("DIPSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:8,7")
PORT_DIPSETTING( 0x00, "200000" )
PORT_DIPSETTING( 0x03, "300000" )
diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c
index 76bd647f2af..e59a648bdc9 100644
--- a/src/mame/drivers/ninjaw.c
+++ b/src/mame/drivers/ninjaw.c
@@ -438,7 +438,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( ninjaw )
/* 0x200000 (port 0) -> 0x0c2291.b and 0x24122c (shared RAM) */
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x01, DEF_STR( Yes ) )
@@ -447,7 +447,7 @@ static INPUT_PORTS_START( ninjaw )
TAITO_COINAGE_WORLD_LOC(SW1)
/* 0x200000 (port 1) -> 0x0c2290.b and 0x24122e (shared RAM) */
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY_LOC(SW2)
PORT_DIPUNUSED_DIPLOC( 0x04, IP_ACTIVE_LOW, "SW2:3" ) /* Manual shows switches 3, 4, 5, 6 & 8 as not used */
PORT_DIPUNUSED_DIPLOC( 0x08, IP_ACTIVE_LOW, "SW2:4" )
@@ -456,7 +456,7 @@ static INPUT_PORTS_START( ninjaw )
PORT_DIPUNUSED_DIPLOC( 0x40, IP_ACTIVE_LOW, "SW2:7" ) /* see notes */
PORT_DIPUNUSED_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW2:8" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Stops working if this is high */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -466,10 +466,10 @@ static INPUT_PORTS_START( ninjaw )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_DUAL_UDRL( 1, 2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
diff --git a/src/mame/drivers/nitedrvr.c b/src/mame/drivers/nitedrvr.c
index 1aac992fdc6..99c496e0746 100644
--- a/src/mame/drivers/nitedrvr.c
+++ b/src/mame/drivers/nitedrvr.c
@@ -58,7 +58,7 @@ ADDRESS_MAP_END
/* Input Ports */
static INPUT_PORTS_START( nitedrvr )
- PORT_START_TAG("DSW0") // fake
+ PORT_START("DSW0") // fake
PORT_DIPNAME( 0x30, 0x10, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x30, DEF_STR( 2C_1C ) )
//PORT_DIPSETTING( 0x20, DEF_STR( 1C_1C ) ) // not a typo
@@ -70,7 +70,7 @@ static INPUT_PORTS_START( nitedrvr )
PORT_DIPSETTING( 0x80, "100" )
PORT_DIPSETTING( 0xC0, "125" )
- PORT_START_TAG("DSW1") // fake
+ PORT_START("DSW1") // fake
PORT_DIPNAME( 0x10, 0x00, "Track Set" )
PORT_DIPSETTING( 0x00, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x10, DEF_STR( Reverse ) )
@@ -80,20 +80,20 @@ static INPUT_PORTS_START( nitedrvr )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("GEARS") // fake
+ PORT_START("GEARS") // fake
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("1st Gear")
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("2nd Gear")
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON7 ) PORT_NAME("3rd Gear")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON8 ) PORT_NAME("4th Gear")
- PORT_START_TAG("DSW2") // fake
+ PORT_START("DSW2") // fake
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // Spare
PORT_DIPNAME( 0x20, 0x00, "Difficult Bonus" )
PORT_DIPSETTING( 0x00, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x20, "Difficult" )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN0") // fake
+ PORT_START("IN0") // fake
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -103,10 +103,10 @@ static INPUT_PORTS_START( nitedrvr )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Pro Track")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) // Alternating signal?
- PORT_START_TAG("STEER") // fake
+ PORT_START("STEER") // fake
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START_TAG("MOTOR")
+ PORT_START("MOTOR")
PORT_ADJUSTER( 60, "Motor RPM" )
INPUT_PORTS_END
diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c
index 4569f1b6726..e19403fac98 100644
--- a/src/mame/drivers/niyanpai.c
+++ b/src/mame/drivers/niyanpai.c
@@ -538,7 +538,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( niyanpai )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -562,7 +562,7 @@ static INPUT_PORTS_START( niyanpai )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x00, "Nudity" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -571,7 +571,7 @@ static INPUT_PORTS_START( niyanpai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
@@ -581,7 +581,7 @@ static INPUT_PORTS_START( niyanpai )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ?
PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) // TEST
- PORT_START_TAG("P1") /* (3) PLAYER-1 */
+ PORT_START("P1") /* (3) PLAYER-1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -591,7 +591,7 @@ static INPUT_PORTS_START( niyanpai )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2") /* (4) PLAYER-2 */
+ PORT_START("P2") /* (4) PLAYER-2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
@@ -606,7 +606,7 @@ static INPUT_PORTS_START( musobana )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, "Game Out" )
PORT_DIPSETTING( 0x03, "90% (Easy)" )
PORT_DIPSETTING( 0x02, "80%" )
@@ -630,7 +630,7 @@ static INPUT_PORTS_START( musobana )
PORT_DIPSETTING( 0x80, "Medal Type" )
PORT_DIPSETTING( 0x00, "Credit Type" )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x03, "Bet Min" )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -654,7 +654,7 @@ static INPUT_PORTS_START( musobana )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
@@ -671,7 +671,7 @@ static INPUT_PORTS_START( 4psimasy )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -697,7 +697,7 @@ static INPUT_PORTS_START( 4psimasy )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -723,7 +723,7 @@ static INPUT_PORTS_START( 4psimasy )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
@@ -740,7 +740,7 @@ static INPUT_PORTS_START( mhhonban )
// I don't have manual for this game.
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -766,7 +766,7 @@ static INPUT_PORTS_START( mhhonban )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -792,7 +792,7 @@ static INPUT_PORTS_START( mhhonban )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
+ PORT_START("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c
index 000effb8683..1d6bbdebcf6 100644
--- a/src/mame/drivers/nmg5.c
+++ b/src/mame/drivers/nmg5.c
@@ -352,7 +352,7 @@ static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( nmg5 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0001, 0x0001, "Game Title" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x0001, "Multi 5" )
PORT_DIPSETTING( 0x0000, "New Multi Game 5" )
@@ -401,13 +401,13 @@ static INPUT_PORTS_START( nmg5 )
PORT_DIPSETTING( 0x0000, "2" )
PORT_SERVICE_DIPLOC( 0x8000, IP_ACTIVE_LOW, "SW2:1" )
- PORT_START /* Coins */
+ PORT_START("SYSTEM") /* Coins */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0050, IP_ACTIVE_HIGH, IPT_SPECIAL ) // otherwise it doesn't boot (unneeded for 'nmg5e' - see notes)
PORT_BIT( 0xffac, IP_ACTIVE_LOW, IPT_UNUSED ) // tested in service mode
- PORT_START
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_8WAY
@@ -427,7 +427,7 @@ static INPUT_PORTS_START( nmg5 )
INPUT_PORTS_END
static INPUT_PORTS_START( searchey )
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x0003, 0x0003, "Timer Speed" ) PORT_DIPLOCATION("SW1:8,7")
PORT_DIPSETTING( 0x0003, "Slowest" )
PORT_DIPSETTING( 0x0002, "Slow" )
@@ -463,11 +463,11 @@ static INPUT_PORTS_START( searchey )
PORT_DIPSETTING( 0x0000, "Less" )
PORT_DIPSETTING( 0x8000, "More" )
- PORT_START /* Coins */
+ PORT_START("SYSTEM") /* Coins */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xfffe, IP_ACTIVE_LOW, IPT_UNUSED ) // tested in service mode
- PORT_START
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_8WAY
@@ -487,7 +487,7 @@ static INPUT_PORTS_START( searchey )
INPUT_PORTS_END
static INPUT_PORTS_START( searchp2 )
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x0003, 0x0003, "Timer Speed" ) PORT_DIPLOCATION("SW1:8,7")
PORT_DIPSETTING( 0x0003, "Slowest" )
PORT_DIPSETTING( 0x0002, "Slow" )
@@ -530,11 +530,11 @@ static INPUT_PORTS_START( searchp2 )
PORT_DIPSETTING( 0x0000, "Less" )
PORT_DIPSETTING( 0x8000, "More" )
- PORT_START /* Coins */
+ PORT_START("SYSTEM") /* Coins */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xfffe, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_8WAY
@@ -554,7 +554,7 @@ static INPUT_PORTS_START( searchp2 )
INPUT_PORTS_END
static INPUT_PORTS_START( pclubys )
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x0001, 0x0000, "Lives (Mad Ball)" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x0000, "3" )
PORT_DIPSETTING( 0x0001, "4" )
@@ -593,11 +593,11 @@ static INPUT_PORTS_START( pclubys )
PORT_DIPSETTING( 0x8000, "Slow" )
PORT_DIPSETTING( 0x0000, "Fast" )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xfffe, IP_ACTIVE_LOW, IPT_UNUSED ) // tested in service mode
- PORT_START
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_8WAY
@@ -617,7 +617,7 @@ static INPUT_PORTS_START( pclubys )
INPUT_PORTS_END
static INPUT_PORTS_START( garogun )
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x0003, 0x0003, "Helps" ) PORT_DIPLOCATION("SW1:8,7")
PORT_DIPSETTING( 0x0000, "1" )
PORT_DIPSETTING( 0x0001, "2" )
@@ -649,11 +649,11 @@ static INPUT_PORTS_START( garogun )
PORT_DIPUNUSED_DIPLOC( 0x4000, IP_ACTIVE_LOW, "SW2:2" )
PORT_DIPUNUSED_DIPLOC( 0x8000, IP_ACTIVE_LOW, "SW2:1" )
- PORT_START /* Coins */
+ PORT_START("SYSTEM") /* Coins */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xfffe, IP_ACTIVE_LOW, IPT_UNUSED ) // tested in service mode
- PORT_START
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -666,7 +666,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( 7ordi )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0001, 0x0001, "High-Low Error" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x0001, "-500" )
PORT_DIPSETTING( 0x0000, "Lose All" )
@@ -710,11 +710,11 @@ static INPUT_PORTS_START( 7ordi )
PORT_DIPSETTING( 0x2000, "60%" )
PORT_DIPSETTING( 0x0000, "55%" )
- PORT_START /* Coins */
+ PORT_START("SYSTEM") /* Coins */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xfffe, IP_ACTIVE_LOW, IPT_UNUSED ) // tested in service mode
- PORT_START
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
@@ -734,7 +734,7 @@ static INPUT_PORTS_START( 7ordi )
INPUT_PORTS_END
static INPUT_PORTS_START( wondstck )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPUNUSED_DIPLOC( 0x0001, IP_ACTIVE_LOW, "SW1:8" )
PORT_DIPUNUSED_DIPLOC( 0x0002, IP_ACTIVE_LOW, "SW1:7" )
PORT_DIPUNUSED_DIPLOC( 0x0004, IP_ACTIVE_LOW, "SW1:6" )
@@ -764,11 +764,11 @@ static INPUT_PORTS_START( wondstck )
PORT_DIPSETTING( 0x4000, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Hardest ) )
- PORT_START /* Coins */
+ PORT_START("SYSTEM") /* Coins */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xfffe, IP_ACTIVE_LOW, IPT_UNUSED ) // tested in service mode
- PORT_START
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_8WAY
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index 3f0a9457256..36596525005 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -1140,7 +1140,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( vandyke )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1150,7 +1150,7 @@ static INPUT_PORTS_START( vandyke )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Maybe unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Maybe unused */
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -1168,7 +1168,7 @@ static INPUT_PORTS_START( vandyke )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DSW 1 */
+ PORT_START("DSW1") /* DSW 1 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) ) /* The manual states this dip is "Unused" */
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "3" )
@@ -1191,7 +1191,7 @@ static INPUT_PORTS_START( vandyke )
PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x80, DEF_STR( Hardest ) )
- PORT_START_TAG("DSW2") /* DSW 2 */
+ PORT_START("DSW2") /* DSW 2 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1219,7 +1219,7 @@ static INPUT_PORTS_START( vandyke )
INPUT_PORTS_END
static INPUT_PORTS_START( blkheart )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1229,7 +1229,7 @@ static INPUT_PORTS_START( blkheart )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Maybe unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Maybe unused */
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -1247,7 +1247,7 @@ static INPUT_PORTS_START( blkheart )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DSW 1 */
+ PORT_START("DSW1") /* DSW 1 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1269,7 +1269,7 @@ static INPUT_PORTS_START( blkheart )
PORT_DIPSETTING( 0x80, "4" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_START_TAG("DSW2") /* DSW 2 */
+ PORT_START("DSW2") /* DSW 2 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1297,11 +1297,11 @@ static INPUT_PORTS_START( blkheart )
INPUT_PORTS_END
static INPUT_PORTS_START( manybloc )
- PORT_START_TAG("IN0") /* IN0 - 0x080000 */
+ PORT_START("IN0") /* IN0 - 0x080000 */
PORT_BIT( 0x7fff, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // VBLANK ? Check code at 0x005640
- PORT_START_TAG("IN1") /* IN1 - 0x080002 */
+ PORT_START("IN1") /* IN1 - 0x080002 */
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) // select fruits
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) // help
@@ -1319,7 +1319,7 @@ static INPUT_PORTS_START( manybloc )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_COIN2 )
- PORT_START_TAG("DSW1") /* DSW - 0x080004 -> 0x0f0036 */
+ PORT_START("DSW1") /* DSW - 0x080004 -> 0x0f0036 */
PORT_DIPNAME( 0x0001, 0x0000, "Slot System" )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0001, DEF_STR( On ) )
@@ -1376,7 +1376,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( tharrier )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_SERVICE1 )
@@ -1385,7 +1385,7 @@ static INPUT_PORTS_START( tharrier )
PORT_BIT( 0x7fe0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_SPECIAL ) /* Mcu status? */
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2) //title
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1403,7 +1403,7 @@ static INPUT_PORTS_START( tharrier )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DSW */
+ PORT_START("DSW1") /* DSW */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1450,7 +1450,7 @@ static INPUT_PORTS_START( tharrier )
PORT_DIPSETTING( 0x8000, "4" )
PORT_DIPSETTING( 0x0000, "5" )
- PORT_START_TAG("IN2") /* IN2 ? */
+ PORT_START("IN2") /* IN2 ? */
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_PLAYER(1)
@@ -1472,7 +1472,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mustang )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1482,7 +1482,7 @@ static INPUT_PORTS_START( mustang )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -1500,7 +1500,7 @@ static INPUT_PORTS_START( mustang )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DSW */
+ PORT_START("DSW1") /* DSW */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1550,7 +1550,7 @@ static INPUT_PORTS_START( mustang )
INPUT_PORTS_END
static INPUT_PORTS_START( hachamf )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1560,7 +1560,7 @@ static INPUT_PORTS_START( hachamf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) //bryan: test mode in some games?
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -1578,7 +1578,7 @@ static INPUT_PORTS_START( hachamf )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DSW A */
+ PORT_START("DSW1") /* DSW A */
PORT_DIPNAME( 0x0700, 0x0700, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0100, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0200, DEF_STR( 3C_1C ) )
@@ -1629,7 +1629,7 @@ static INPUT_PORTS_START( hachamf )
INPUT_PORTS_END
static INPUT_PORTS_START( strahl )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1639,7 +1639,7 @@ static INPUT_PORTS_START( strahl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) //bryan: test mode in some games?
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -1657,7 +1657,7 @@ static INPUT_PORTS_START( strahl )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DSW A */
+ PORT_START("DSW1") /* DSW A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
@@ -1683,7 +1683,7 @@ static INPUT_PORTS_START( strahl )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* DSW B */
+ PORT_START("DSW2") /* DSW B */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x02, "2" )
PORT_DIPSETTING( 0x03, "3" )
@@ -1706,7 +1706,7 @@ static INPUT_PORTS_START( strahl )
INPUT_PORTS_END
static INPUT_PORTS_START( acrobatm )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1716,7 +1716,7 @@ static INPUT_PORTS_START( acrobatm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -1734,7 +1734,7 @@ static INPUT_PORTS_START( acrobatm )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DSW A */
+ PORT_START("DSW1") /* DSW A */
PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1760,7 +1760,7 @@ static INPUT_PORTS_START( acrobatm )
PORT_DIPSETTING( 0x00A0, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x0020, DEF_STR( 1C_4C ) )
- PORT_START_TAG("DSW2") /* DSW B */
+ PORT_START("DSW2") /* DSW B */
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x06, 0x06, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x02, "50k and 100k" )
@@ -1783,7 +1783,7 @@ static INPUT_PORTS_START( acrobatm )
INPUT_PORTS_END
static INPUT_PORTS_START( bioship )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1793,7 +1793,7 @@ static INPUT_PORTS_START( bioship )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) //bryan: test mode in some games?
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -1811,7 +1811,7 @@ static INPUT_PORTS_START( bioship )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DSW A */
+ PORT_START("DSW1") /* DSW A */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1833,7 +1833,7 @@ static INPUT_PORTS_START( bioship )
PORT_DIPSETTING( 0x0080, "4" )
PORT_DIPSETTING( 0x0040, "5" )
- PORT_START_TAG("DSW2") /* DSW B */
+ PORT_START("DSW2") /* DSW B */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1861,7 +1861,7 @@ static INPUT_PORTS_START( bioship )
INPUT_PORTS_END
static INPUT_PORTS_START( tdragon )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1871,7 +1871,7 @@ static INPUT_PORTS_START( tdragon )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -1889,7 +1889,7 @@ static INPUT_PORTS_START( tdragon )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DSW 1 */
+ PORT_START("DSW1") /* DSW 1 */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1913,7 +1913,7 @@ static INPUT_PORTS_START( tdragon )
PORT_DIPSETTING( 0x00c0, "3" )
PORT_DIPSETTING( 0x0080, "4" )
- PORT_START_TAG("DSW2") /* DSW 2 */
+ PORT_START("DSW2") /* DSW 2 */
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0004, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0005, DEF_STR( 3C_1C ) )
@@ -1941,7 +1941,7 @@ static INPUT_PORTS_START( tdragon )
INPUT_PORTS_END
static INPUT_PORTS_START( tdragonb )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1951,7 +1951,7 @@ static INPUT_PORTS_START( tdragonb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -1969,7 +1969,7 @@ static INPUT_PORTS_START( tdragonb )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DSW 1 */
+ PORT_START("DSW1") /* DSW 1 */
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0000, "1" )
PORT_DIPSETTING( 0x0002, "2" )
@@ -1993,7 +1993,7 @@ static INPUT_PORTS_START( tdragonb )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* DSW 2 */
+ PORT_START("DSW2") /* DSW 2 */
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0004, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0005, DEF_STR( 3C_1C ) )
@@ -2021,7 +2021,7 @@ static INPUT_PORTS_START( tdragonb )
INPUT_PORTS_END
static INPUT_PORTS_START( ssmissin )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // "Servise" in "test mode"
@@ -2031,7 +2031,7 @@ static INPUT_PORTS_START( ssmissin )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -2049,7 +2049,7 @@ static INPUT_PORTS_START( ssmissin )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DSW 1 */
+ PORT_START("DSW1") /* DSW 1 */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -2111,7 +2111,7 @@ static INPUT_PORTS_START( ssmissin )
INPUT_PORTS_END
static INPUT_PORTS_START( airattck )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // "Servise" in "test mode"
@@ -2121,7 +2121,7 @@ static INPUT_PORTS_START( airattck )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -2139,7 +2139,7 @@ static INPUT_PORTS_START( airattck )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DSW 1 */
+ PORT_START("DSW1") /* DSW 1 */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -2189,7 +2189,7 @@ static INPUT_PORTS_START( airattck )
INPUT_PORTS_END
static INPUT_PORTS_START( macross )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2199,7 +2199,7 @@ static INPUT_PORTS_START( macross )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Maybe unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Maybe unused */
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -2217,7 +2217,7 @@ static INPUT_PORTS_START( macross )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DSW A */
+ PORT_START("DSW1") /* DSW A */
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -2239,7 +2239,7 @@ static INPUT_PORTS_START( macross )
PORT_DIPSETTING( 0xc0, "3" )
PORT_DIPSETTING( 0x80, "4" )
- PORT_START_TAG("DSW2") /* DSW B */
+ PORT_START("DSW2") /* DSW B */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0a, DEF_STR( 3C_1C ) )
@@ -2277,7 +2277,7 @@ static INPUT_PORTS_START( macross )
INPUT_PORTS_END
static INPUT_PORTS_START( macross2 )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2287,7 +2287,7 @@ static INPUT_PORTS_START( macross2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Maybe unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Maybe unused */
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -2305,7 +2305,7 @@ static INPUT_PORTS_START( macross2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DSW A */
+ PORT_START("DSW1") /* DSW A */
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -2328,7 +2328,7 @@ static INPUT_PORTS_START( macross2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* DSW B */
+ PORT_START("DSW2") /* DSW B */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0a, DEF_STR( 3C_1C ) )
@@ -2366,7 +2366,7 @@ static INPUT_PORTS_START( macross2 )
INPUT_PORTS_END
static INPUT_PORTS_START( tdragon2 )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2376,7 +2376,7 @@ static INPUT_PORTS_START( tdragon2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Maybe unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Maybe unused */
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -2394,7 +2394,7 @@ static INPUT_PORTS_START( tdragon2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DSW A */
+ PORT_START("DSW1") /* DSW A */
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -2416,7 +2416,7 @@ static INPUT_PORTS_START( tdragon2 )
PORT_DIPSETTING( 0xc0, "3" )
PORT_DIPSETTING( 0x80, "4" )
- PORT_START_TAG("DSW2") /* DSW B */
+ PORT_START("DSW2") /* DSW B */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0a, DEF_STR( 3C_1C ) )
@@ -2454,7 +2454,7 @@ static INPUT_PORTS_START( tdragon2 )
INPUT_PORTS_END
static INPUT_PORTS_START( gunnail )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2464,7 +2464,7 @@ static INPUT_PORTS_START( gunnail )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Maybe unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Maybe unused */
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -2482,7 +2482,7 @@ static INPUT_PORTS_START( gunnail )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DSW A */
+ PORT_START("DSW1") /* DSW A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2507,7 +2507,7 @@ static INPUT_PORTS_START( gunnail )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* DSW B */
+ PORT_START("DSW2") /* DSW B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) /* The manual states this dip is "Unused" */
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2535,7 +2535,7 @@ static INPUT_PORTS_START( gunnail )
INPUT_PORTS_END
static INPUT_PORTS_START( raphero )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2545,7 +2545,7 @@ static INPUT_PORTS_START( raphero )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Maybe unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Maybe unused */
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -2563,7 +2563,7 @@ static INPUT_PORTS_START( raphero )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DSW A */
+ PORT_START("DSW1") /* DSW A */
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Language ) ) /* Doesn't seem to have any effect */
PORT_DIPSETTING( 0x02, DEF_STR( Japanese ) )
@@ -2585,7 +2585,7 @@ static INPUT_PORTS_START( raphero )
PORT_DIPSETTING( 0xc0, "3" )
PORT_DIPSETTING( 0x80, "4" )
- PORT_START_TAG("DSW2") /* DSW B */
+ PORT_START("DSW2") /* DSW B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2613,7 +2613,7 @@ static INPUT_PORTS_START( raphero )
INPUT_PORTS_END
static INPUT_PORTS_START( sabotenb )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2623,7 +2623,7 @@ static INPUT_PORTS_START( sabotenb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Maybe unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Maybe unused */
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -2641,7 +2641,7 @@ static INPUT_PORTS_START( sabotenb )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DSW A */
+ PORT_START("DSW1") /* DSW A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2659,7 +2659,7 @@ static INPUT_PORTS_START( sabotenb )
PORT_DIPSETTING( 0xc0, "3" )
PORT_DIPSETTING( 0x80, "4" )
- PORT_START_TAG("DSW2") /* DSW B */
+ PORT_START("DSW2") /* DSW B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) /* The manual states this dip is "Unused" */
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2687,7 +2687,7 @@ static INPUT_PORTS_START( sabotenb )
INPUT_PORTS_END
static INPUT_PORTS_START( bjtwin )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2697,7 +2697,7 @@ static INPUT_PORTS_START( bjtwin )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Maybe unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Maybe unused */
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -2715,7 +2715,7 @@ static INPUT_PORTS_START( bjtwin )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DSW A */
+ PORT_START("DSW1") /* DSW A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2739,7 +2739,7 @@ static INPUT_PORTS_START( bjtwin )
PORT_DIPSETTING( 0xc0, "3" )
PORT_DIPSETTING( 0x80, "4" )
- PORT_START_TAG("DSW2") /* DSW B */
+ PORT_START("DSW2") /* DSW B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2767,7 +2767,7 @@ static INPUT_PORTS_START( bjtwin )
INPUT_PORTS_END
static INPUT_PORTS_START( nouryoku )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2777,7 +2777,7 @@ static INPUT_PORTS_START( nouryoku )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -2795,7 +2795,7 @@ static INPUT_PORTS_START( nouryoku )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DSW A */
+ PORT_START("DSW1") /* DSW A */
PORT_DIPNAME( 0x03, 0x03, "Life Decrease Speed" )
PORT_DIPSETTING( 0x02, "Slow" )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -2819,7 +2819,7 @@ static INPUT_PORTS_START( nouryoku )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_4C ) )
- PORT_START_TAG("DSW2") /* DSW B */
+ PORT_START("DSW2") /* DSW B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) /* The manual states this dip is "Unused" */
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2860,7 +2860,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( afega_common )
- PORT_START_TAG("IN0") // $080000.w
+ PORT_START("IN0") // $080000.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2871,7 +2871,7 @@ static INPUT_PORTS_START( afega_common )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") // $080002.w
+ PORT_START("IN1") // $080002.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -2894,7 +2894,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( stagger1 )
PORT_INCLUDE( afega_common )
- PORT_START_TAG("DSW1") // $080004.w
+ PORT_START("DSW1") // $080004.w
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -2942,7 +2942,7 @@ INPUT_PORTS_END
/* everything seems active high.. not low */
static INPUT_PORTS_START( redhawkb )
- PORT_START_TAG("IN0") // $080000.w
+ PORT_START("IN0") // $080000.w
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_SERVICE1 )
@@ -2953,7 +2953,7 @@ static INPUT_PORTS_START( redhawkb )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1") // $080002.w
+ PORT_START("IN1") // $080002.w
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -2971,7 +2971,7 @@ static INPUT_PORTS_START( redhawkb )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") // $080004.w -- probably just redhawk but inverted
+ PORT_START("DSW1") // $080004.w -- probably just redhawk but inverted
PORT_SERVICE( 0x0001, IP_ACTIVE_HIGH ) /* not working */
PORT_DIPNAME( 0x0002, 0x0000, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Off ) )
@@ -3024,7 +3024,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( grdnstrm )
PORT_INCLUDE( afega_common )
- PORT_START_TAG("DSW1") // $080004.w
+ PORT_START("DSW1") // $080004.w
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -3078,7 +3078,7 @@ static INPUT_PORTS_START( popspops )
PORT_INCLUDE( afega_common )
/* the dips on this are a mess.. service mode doesn't seem to be 100% trustable */
- PORT_START_TAG("DSW1") // $080004.w
+ PORT_START("DSW1") // $080004.w
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -3133,7 +3133,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( bubl2000 )
PORT_INCLUDE( afega_common )
- PORT_START_TAG("DSW1") // $080004.w
+ PORT_START("DSW1") // $080004.w
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -3189,7 +3189,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mangchi )
PORT_INCLUDE( afega_common )
- PORT_START_TAG("DSW1") // $080004.w
+ PORT_START("DSW1") // $080004.w
PORT_DIPNAME( 0x0001, 0x0001, "DSWS" ) /* Setting to on cuases screen issues, Flip Screen? or unfinished test mode? */
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -3246,7 +3246,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( firehawk )
PORT_INCLUDE( afega_common )
- PORT_START_TAG("DSW1") // $080004.w
+ PORT_START("DSW1") // $080004.w
PORT_DIPNAME( 0x0001, 0x0001, "Show Dip-Switch Settings" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -3303,7 +3303,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( spec2k )
PORT_INCLUDE( afega_common )
- PORT_START_TAG("DSW1") // $080004.w
+ PORT_START("DSW1") // $080004.w
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -3365,7 +3365,7 @@ static INPUT_PORTS_START( twinactn )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH,IPT_UNKNOWN ) // Tested at boot
PORT_BIT( 0x8000, IP_ACTIVE_HIGH,IPT_UNKNOWN ) // Tested at boot
- PORT_START_TAG("DSW1") // $080004.w
+ PORT_START("DSW1") // $080004.w
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/nova2001.c b/src/mame/drivers/nova2001.c
index 90957ed25d7..b4c3693e1ed 100644
--- a/src/mame/drivers/nova2001.c
+++ b/src/mame/drivers/nova2001.c
@@ -292,7 +292,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( nova2001 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -301,7 +301,7 @@ static INPUT_PORTS_START( nova2001 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) // pause
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) // fire
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -310,14 +310,14 @@ static INPUT_PORTS_START( nova2001 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x78, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("DSW1") /* dsw0 */
+ PORT_START("DSW1") /* dsw0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -341,7 +341,7 @@ static INPUT_PORTS_START( nova2001 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* dsw1 */
+ PORT_START("DSW2") /* dsw1 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Medium ) )
@@ -360,7 +360,7 @@ static INPUT_PORTS_START( nova2001 )
INPUT_PORTS_END
static INPUT_PORTS_START( ninjakun )
- PORT_START_TAG("IN0") /* 0xa000 */
+ PORT_START("IN0") /* 0xa000 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY /* "XPOS1" */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -370,7 +370,7 @@ static INPUT_PORTS_START( ninjakun )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* 0xa001 */
+ PORT_START("IN1") /* 0xa001 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT) PORT_2WAY PORT_COCKTAIL /* "YPOS1" */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -380,10 +380,10 @@ static INPUT_PORTS_START( ninjakun )
PORT_SERVICE( 0x40, IP_ACTIVE_HIGH )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("IN2") /* 0xa002 */
+ PORT_START("IN2") /* 0xa002 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -407,7 +407,7 @@ static INPUT_PORTS_START( ninjakun )
PORT_DIPSETTING( 0x80, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hard ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -435,7 +435,7 @@ static INPUT_PORTS_START( ninjakun )
INPUT_PORTS_END
static INPUT_PORTS_START( pkunwar )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -445,7 +445,7 @@ static INPUT_PORTS_START( pkunwar )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -455,7 +455,7 @@ static INPUT_PORTS_START( pkunwar )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN2") /* DSW0 */
+ PORT_START("IN2") /* DSW0 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -481,7 +481,7 @@ static INPUT_PORTS_START( pkunwar )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
@@ -507,7 +507,7 @@ static INPUT_PORTS_START( pkunwar )
INPUT_PORTS_END
static INPUT_PORTS_START( raiders5 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
@@ -517,7 +517,7 @@ static INPUT_PORTS_START( raiders5 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
@@ -527,7 +527,7 @@ static INPUT_PORTS_START( raiders5 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -551,7 +551,7 @@ static INPUT_PORTS_START( raiders5 )
PORT_DIPSETTING( 0x80, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hard ) )
- PORT_START_TAG("DSW2") /* DSW2*/
+ PORT_START("DSW2") /* DSW2*/
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/nss.c b/src/mame/drivers/nss.c
index b51ab33b9a7..7c77f5ca970 100644
--- a/src/mame/drivers/nss.c
+++ b/src/mame/drivers/nss.c
@@ -325,12 +325,12 @@ static ADDRESS_MAP_START( spc_mem, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( snes )
- PORT_START_TAG("PAD1L") /* IN 0 : Joypad 1 - L */
+ PORT_START("PAD1L") /* IN 0 : Joypad 1 - L */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("P1 Button A") PORT_PLAYER(1)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("P1 Button X") PORT_PLAYER(1)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("P1 Button L") PORT_PLAYER(1)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("P1 Button R") PORT_PLAYER(1)
- PORT_START_TAG("PAD1H") /* IN 1 : Joypad 1 - H */
+ PORT_START("PAD1H") /* IN 1 : Joypad 1 - H */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("P1 Button B") PORT_PLAYER(1)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("P1 Button Y") PORT_PLAYER(1)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_NAME("P1 Select")
@@ -340,12 +340,12 @@ static INPUT_PORTS_START( snes )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
- PORT_START_TAG("PAD2L") /* IN 2 : Joypad 2 - L */
+ PORT_START("PAD2L") /* IN 2 : Joypad 2 - L */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("P2 Button A") PORT_PLAYER(2)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("P2 Button X") PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("P2 Button L") PORT_PLAYER(2)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("P2 Button R") PORT_PLAYER(2)
- PORT_START_TAG("PAD2H") /* IN 3 : Joypad 2 - H */
+ PORT_START("PAD2H") /* IN 3 : Joypad 2 - H */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("P2 Button B") PORT_PLAYER(2)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("P2 Button Y") PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SERVICE2 ) PORT_NAME("P2 Select")
@@ -355,12 +355,12 @@ static INPUT_PORTS_START( snes )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_START_TAG("PAD3L") /* IN 4 : Joypad 3 - L */
+ PORT_START("PAD3L") /* IN 4 : Joypad 3 - L */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("P3 Button A") PORT_PLAYER(3)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("P3 Button X") PORT_PLAYER(3)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("P3 Button L") PORT_PLAYER(3)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("P3 Button R") PORT_PLAYER(3)
- PORT_START_TAG("PAD3H") /* IN 5 : Joypad 3 - H */
+ PORT_START("PAD3H") /* IN 5 : Joypad 3 - H */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("P3 Button B") PORT_PLAYER(3)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("P3 Button Y") PORT_PLAYER(3)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SERVICE3 ) PORT_NAME("P3 Select")
@@ -370,12 +370,12 @@ static INPUT_PORTS_START( snes )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(3)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(3)
- PORT_START_TAG("PAD4L") /* IN 6 : Joypad 4 - L */
+ PORT_START("PAD4L") /* IN 6 : Joypad 4 - L */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("P4 Button A") PORT_PLAYER(4)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("P4 Button X") PORT_PLAYER(4)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("P4 Button L") PORT_PLAYER(4)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("P4 Button R") PORT_PLAYER(4)
- PORT_START_TAG("PAD4H") /* IN 7 : Joypad 4 - H */
+ PORT_START("PAD4H") /* IN 7 : Joypad 4 - H */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("P4 Button B") PORT_PLAYER(4)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("P4 Button Y") PORT_PLAYER(4)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SERVICE4 ) PORT_NAME("P4 Select")
@@ -385,7 +385,7 @@ static INPUT_PORTS_START( snes )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(4)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(4)
- PORT_START_TAG("DSW") /* IN 8 : dip-switches */
+ PORT_START("DSW") /* IN 8 : dip-switches */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x00, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x03, DEF_STR( Hard ) )
diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c
index 52d700682af..8eb5d8f2044 100644
--- a/src/mame/drivers/nwk-tr.c
+++ b/src/mame/drivers/nwk-tr.c
@@ -1018,7 +1018,7 @@ ADDRESS_MAP_END
/*****************************************************************************/
static INPUT_PORTS_START( nwktr )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -1028,17 +1028,17 @@ static INPUT_PORTS_START( nwktr )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service Button") PORT_CODE(KEYCODE_7)
PORT_SERVICE_NO_TOGGLE( 0x10, IP_ACTIVE_LOW )
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x80, 0x00, "Test Mode" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
@@ -1064,19 +1064,19 @@ static INPUT_PORTS_START( nwktr )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("ANALOG1") // Steering
+ PORT_START("ANALOG1") // Steering
PORT_BIT( 0xfff, 0x800, IPT_PADDLE ) PORT_MINMAX(0x000, 0xfff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
- PORT_START_TAG("ANALOG2") // Acceleration pedal
+ PORT_START("ANALOG2") // Acceleration pedal
PORT_BIT( 0x7ff, 0x000, IPT_PEDAL ) PORT_MINMAX(0x000, 0x7ff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
- PORT_START_TAG("ANALOG3") // Foot brake pedal
+ PORT_START("ANALOG3") // Foot brake pedal
PORT_BIT( 0x7ff, 0x000, IPT_PEDAL2 ) PORT_MINMAX(0x000, 0x7ff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
- PORT_START_TAG("ANALOG4") // Hand brake lever
+ PORT_START("ANALOG4") // Hand brake lever
PORT_BIT( 0x7ff, 0x000, IPT_AD_STICK_Y ) PORT_MINMAX(0x000, 0x7ff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
- PORT_START_TAG("ANALOG5") // Clutch pedal
+ PORT_START("ANALOG5") // Clutch pedal
PORT_BIT( 0x7ff, 0x000, IPT_PEDAL3 ) PORT_MINMAX(0x000, 0x7ff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
INPUT_PORTS_END
diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c
index 72dabc53db9..66beeafb89f 100644
--- a/src/mame/drivers/nycaptor.c
+++ b/src/mame/drivers/nycaptor.c
@@ -580,7 +580,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( cyclshtg )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x04, 0x04, "Test Mode" )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -601,11 +601,11 @@ static INPUT_PORTS_START( cyclshtg )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )//?
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -617,19 +617,19 @@ static INPUT_PORTS_START( cyclshtg )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("LIGHTX")
+ PORT_START("LIGHTX")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("LIGHTY")
+ PORT_START("LIGHTY")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(Y, -1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1)
INPUT_PORTS_END
static INPUT_PORTS_START( nycaptor )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x02, "20k, 80k then every 80k" )
PORT_DIPSETTING( 0x03, "50k, 150k then every 200k" )
@@ -653,7 +653,7 @@ static INPUT_PORTS_START( nycaptor )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0f, DEF_STR( 9C_1C ) )
PORT_DIPSETTING( 0x0e, DEF_STR( 8C_1C ) )
@@ -689,7 +689,7 @@ static INPUT_PORTS_START( nycaptor )
PORT_DIPSETTING( 0x60, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x70, DEF_STR( 1C_8C ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, "Freeze" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -714,7 +714,7 @@ static INPUT_PORTS_START( nycaptor )
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x80, "2" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* IPT_START2 is some similar Taito games (eg: 'flstory') */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -724,14 +724,14 @@ static INPUT_PORTS_START( nycaptor )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* "I/O ERROR" if active */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* "I/O ERROR" if active */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("LIGHTX")
+ PORT_START("LIGHTX")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("LIGHTY")
+ PORT_START("LIGHTY")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1)
INPUT_PORTS_END
diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c
index 7c59b128f53..d660015933a 100644
--- a/src/mame/drivers/nyny.c
+++ b/src/mame/drivers/nyny.c
@@ -577,7 +577,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( nyny )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) /* PIA0 PA0 */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* PIA0 PA1 */
PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_HIGH) /* PIA0 PA2 */
@@ -587,14 +587,14 @@ static INPUT_PORTS_START( nyny )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 ) /* PIA0 PA6 */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL /* PIA0 PB0 */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL /* PIA0 PB1 */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY /* PIA0 PB2 */
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY /* PIA0 PB3 */
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("SW1") /* port 2 */
+ PORT_START("SW1") /* port 2 */
PORT_DIPNAME( 0x03, 0x03, "Bombs from UFO (Screens 3+)" ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "6" )
@@ -607,7 +607,7 @@ static INPUT_PORTS_START( nyny )
PORT_DIPSETTING( 0x00, DEF_STR( Low ) )
PORT_DIPSETTING( 0x80, DEF_STR( High ) )
- PORT_START_TAG("SW2") /* port 3 */
+ PORT_START("SW2") /* port 3 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -625,7 +625,7 @@ static INPUT_PORTS_START( nyny )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START_TAG("SW3") /* port 4 */
+ PORT_START("SW3") /* port 4 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW3:1")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -649,7 +649,7 @@ static INPUT_PORTS_START( nyny )
PORT_DIPSETTING( 0x40, "+2" )
PORT_DIPSETTING( 0x20, "+3" )
- PORT_START_TAG("CROSS") /* connected to PIA1 CB1 input */
+ PORT_START("CROSS") /* connected to PIA1 CB1 input */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("PS1 (Crosshatch)") PORT_CODE(KEYCODE_F1)
INPUT_PORTS_END
diff --git a/src/mame/drivers/offtwall.c b/src/mame/drivers/offtwall.c
index 2f6b3e56c8f..0e6b4e961b6 100644
--- a/src/mame/drivers/offtwall.c
+++ b/src/mame/drivers/offtwall.c
@@ -310,7 +310,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( offtwall )
- PORT_START_TAG("260000") /* 260000 */
+ PORT_START("260000") /* 260000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
@@ -328,7 +328,7 @@ static INPUT_PORTS_START( offtwall )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_START_TAG("260002") /* 260002 */
+ PORT_START("260002") /* 260002 */
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(3)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
@@ -341,7 +341,7 @@ static INPUT_PORTS_START( offtwall )
PORT_INCLUDE( atarijsa_iii ) /* audio board port */
- PORT_START_TAG("260010") /* 260010 */
+ PORT_START("260010") /* 260010 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0002, 0x0000, DEF_STR( Controls ) )
PORT_DIPSETTING( 0x0000, "Whirly-gigs" ) /* this is official Atari terminology! */
@@ -354,18 +354,18 @@ static INPUT_PORTS_START( offtwall )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("260012") /* 260012 */
+ PORT_START("260012") /* 260012 */
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("260020") /* 260020 */
+ PORT_START("260020") /* 260020 */
PORT_BIT( 0xff, 0, IPT_DIAL_V ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(1)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("260022") /* 260022 */
+ PORT_START("260022") /* 260022 */
PORT_BIT( 0xff, 0, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(2)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("260024") /* 260024 */
+ PORT_START("260024") /* 260024 */
PORT_BIT( 0xff, 0, IPT_DIAL_V ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(3)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/ohmygod.c b/src/mame/drivers/ohmygod.c
index 6eddc06cb6d..30a1516a546 100644
--- a/src/mame/drivers/ohmygod.c
+++ b/src/mame/drivers/ohmygod.c
@@ -95,7 +95,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( ohmygod )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -113,7 +113,7 @@ static INPUT_PORTS_START( ohmygod )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -131,7 +131,7 @@ static INPUT_PORTS_START( ohmygod )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("DSW1")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x0f00, 0x0f00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0700, DEF_STR( 4C_1C ) )
@@ -168,7 +168,7 @@ static INPUT_PORTS_START( ohmygod )
PORT_DIPSETTING( 0xa000, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Free_Play ) )
- PORT_START
+ PORT_START("DSW2")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x0300, 0x0300, "1P Difficulty" )
PORT_DIPSETTING( 0x0200, DEF_STR( Easy ) )
@@ -195,7 +195,7 @@ static INPUT_PORTS_START( ohmygod )
INPUT_PORTS_END
static INPUT_PORTS_START( naname )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -213,7 +213,7 @@ static INPUT_PORTS_START( naname )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -231,7 +231,7 @@ static INPUT_PORTS_START( naname )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("DSW1")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x0f00, 0x0f00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0700, DEF_STR( 4C_1C ) )
@@ -268,7 +268,7 @@ static INPUT_PORTS_START( naname )
PORT_DIPSETTING( 0xa000, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Free_Play ) )
- PORT_START
+ PORT_START("DSW2")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0200, DEF_STR( Easy ) )
diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c
index c057e7eed51..c34b1a37946 100644
--- a/src/mame/drivers/ojankohs.c
+++ b/src/mame/drivers/ojankohs.c
@@ -355,7 +355,7 @@ static ADDRESS_MAP_START( writeport_ojankoc, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( mahjong_p1 )
- PORT_START_TAG("KEY0") /* (4) PORT 1-0 */
+ PORT_START("KEY0") /* (4) PORT 1-0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
@@ -365,7 +365,7 @@ static INPUT_PORTS_START( mahjong_p1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY1") /* (5) PORT 1-1 */
+ PORT_START("KEY1") /* (5) PORT 1-1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
@@ -375,7 +375,7 @@ static INPUT_PORTS_START( mahjong_p1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY2") /* (6) PORT 1-2 */
+ PORT_START("KEY2") /* (6) PORT 1-2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
@@ -385,7 +385,7 @@ static INPUT_PORTS_START( mahjong_p1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3") /* (7) PORT 1-3 */
+ PORT_START("KEY3") /* (7) PORT 1-3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
@@ -395,7 +395,7 @@ static INPUT_PORTS_START( mahjong_p1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY4") /* (8) PORT 1-4 */
+ PORT_START("KEY4") /* (8) PORT 1-4 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
@@ -407,7 +407,7 @@ static INPUT_PORTS_START( mahjong_p1 )
INPUT_PORTS_END
static INPUT_PORTS_START( ojankohs )
- PORT_START_TAG("IN0") /* (0) TEST SW */
+ PORT_START("IN0") /* (0) TEST SW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -417,7 +417,7 @@ static INPUT_PORTS_START( ojankohs )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* (1) COIN SW */
+ PORT_START("IN1") /* (1) COIN SW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -427,7 +427,7 @@ static INPUT_PORTS_START( ojankohs )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1") /* (2) DIPSW-1 */
+ PORT_START("DSW1") /* (2) DIPSW-1 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x03, "2" )
@@ -452,7 +452,7 @@ static INPUT_PORTS_START( ojankohs )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* (3) DIPSW-2 */
+ PORT_START("DSW2") /* (3) DIPSW-2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x02, 0x02, "Opponent's initial score" )
PORT_DIPSETTING ( 0x02, "2000" )
@@ -468,7 +468,7 @@ static INPUT_PORTS_START( ojankohs )
INPUT_PORTS_END
static INPUT_PORTS_START( ojankoy )
- PORT_START_TAG("IN0") /* (0) TEST SW */
+ PORT_START("IN0") /* (0) TEST SW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -478,7 +478,7 @@ static INPUT_PORTS_START( ojankoy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* (1) COIN SW */
+ PORT_START("IN1") /* (1) COIN SW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -488,7 +488,7 @@ static INPUT_PORTS_START( ojankoy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1") /* (2) DIPSW-1 */
+ PORT_START("DSW1") /* (2) DIPSW-1 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x03, "2" )
@@ -512,7 +512,7 @@ static INPUT_PORTS_START( ojankoy )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* (3) DIPSW-2 */
+ PORT_START("DSW2") /* (3) DIPSW-2 */
PORT_DIPNAME( 0x03, 0x02, "Number of ending chance" )
PORT_DIPSETTING( 0x03, "0" )
PORT_DIPSETTING( 0x01, "3" )
@@ -539,7 +539,7 @@ static INPUT_PORTS_START( ojankoy )
INPUT_PORTS_END
static INPUT_PORTS_START( ccasino )
- PORT_START_TAG("IN0") /* (0) TEST SW */
+ PORT_START("IN0") /* (0) TEST SW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -549,7 +549,7 @@ static INPUT_PORTS_START( ccasino )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* (1) COIN SW */
+ PORT_START("IN1") /* (1) COIN SW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -559,7 +559,7 @@ static INPUT_PORTS_START( ccasino )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1") /* (2) DIPSW-1 */
+ PORT_START("DSW1") /* (2) DIPSW-1 */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -585,7 +585,7 @@ static INPUT_PORTS_START( ccasino )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* (3) DIPSW-2 */
+ PORT_START("DSW2") /* (3) DIPSW-2 */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -613,7 +613,7 @@ static INPUT_PORTS_START( ccasino )
PORT_INCLUDE( mahjong_p1 )
- PORT_START_TAG("DSW3") /* (9) DIPSW-3 */
+ PORT_START("DSW3") /* (9) DIPSW-3 */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 3-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -639,7 +639,7 @@ static INPUT_PORTS_START( ccasino )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW4") /* (10) DIPSW-4 */
+ PORT_START("DSW4") /* (10) DIPSW-4 */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 4-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -667,7 +667,7 @@ static INPUT_PORTS_START( ccasino )
INPUT_PORTS_END
static INPUT_PORTS_START( ojankoc )
- PORT_START_TAG("DSW1") /* DSW1 (0) */
+ PORT_START("DSW1") /* DSW1 (0) */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -691,7 +691,7 @@ static INPUT_PORTS_START( ojankoc )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW2") /* DSW2 (1) */
+ PORT_START("DSW2") /* DSW2 (1) */
PORT_DIPNAME( 0x01, 0x01, "2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -717,7 +717,7 @@ static INPUT_PORTS_START( ojankoc )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("KEY0") /* (4) PORT 1-0 */
+ PORT_START("KEY0") /* (4) PORT 1-0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_A )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_E )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_I )
@@ -727,7 +727,7 @@ static INPUT_PORTS_START( ojankoc )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("KEY1") /* (5) PORT 1-1 */
+ PORT_START("KEY1") /* (5) PORT 1-1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_B )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_F )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_J )
@@ -737,7 +737,7 @@ static INPUT_PORTS_START( ojankoc )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("KEY2") /* (6) PORT 1-2 */
+ PORT_START("KEY2") /* (6) PORT 1-2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_C )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_G )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_K )
@@ -747,7 +747,7 @@ static INPUT_PORTS_START( ojankoc )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("KEY3") /* (7) PORT 1-3 */
+ PORT_START("KEY3") /* (7) PORT 1-3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_D )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_H )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_L )
@@ -757,7 +757,7 @@ static INPUT_PORTS_START( ojankoc )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("KEY4") /* (8) PORT 1-4 */
+ PORT_START("KEY4") /* (8) PORT 1-4 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_LAST_CHANCE )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_SCORE )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_DOUBLE_UP )
@@ -767,7 +767,7 @@ static INPUT_PORTS_START( ojankoc )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("KEY5") /* (7) PORT 2-0 */
+ PORT_START("KEY5") /* (7) PORT 2-0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_A )PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_E )PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_I )PORT_PLAYER(2)
@@ -776,7 +776,7 @@ static INPUT_PORTS_START( ojankoc )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("KEY6") /* (8) PORT 2-1 */
+ PORT_START("KEY6") /* (8) PORT 2-1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_B )PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_F )PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_J )PORT_PLAYER(2)
@@ -785,7 +785,7 @@ static INPUT_PORTS_START( ojankoc )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_MAHJONG_BET )PORT_PLAYER(2)
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("KEY7") /* (9) PORT 2-2 */
+ PORT_START("KEY7") /* (9) PORT 2-2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_C )PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_G )PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_K )PORT_PLAYER(2)
@@ -794,7 +794,7 @@ static INPUT_PORTS_START( ojankoc )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("KEY8") /* (10) PORT 2-3 */
+ PORT_START("KEY8") /* (10) PORT 2-3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_D )PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_H )PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_L )PORT_PLAYER(2)
@@ -803,7 +803,7 @@ static INPUT_PORTS_START( ojankoc )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("KEY9") /* (11) PORT 2-4 */
+ PORT_START("KEY9") /* (11) PORT 2-4 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
@@ -812,12 +812,12 @@ static INPUT_PORTS_START( ojankoc )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN0") /* IN1 (12) */
+ PORT_START("IN0") /* IN1 (12) */
PORT_BIT( 0x3f, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN2 (13) */
+ PORT_START("IN1") /* IN2 (13) */
PORT_BIT( 0x3f, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c
index 05b78112c6e..ef87fb7f780 100644
--- a/src/mame/drivers/olibochu.c
+++ b/src/mame/drivers/olibochu.c
@@ -216,7 +216,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( olibochu )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -226,7 +226,7 @@ static INPUT_PORTS_START( olibochu )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) /* works in service mode but not in game */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
@@ -236,7 +236,7 @@ static INPUT_PORTS_START( olibochu )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2)
@@ -246,7 +246,7 @@ static INPUT_PORTS_START( olibochu )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0") /* Listed as sw1 */
+ PORT_START("DSW0") /* Listed as sw1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x03, "3" )
@@ -270,7 +270,7 @@ static INPUT_PORTS_START( olibochu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* Most likely not a bank of Dip Switches */
+ PORT_START("DSW1") /* Most likely not a bank of Dip Switches */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -296,7 +296,7 @@ static INPUT_PORTS_START( olibochu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* Listed as sw2 */
+ PORT_START("DSW2") /* Listed as sw2 */
PORT_DIPNAME( 0x01, 0x01, "Stop Mode (Cheat)") /* In stop mode, press 2 to stop and 1 to restart */
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/omegrace.c b/src/mame/drivers/omegrace.c
index 80be1ee0672..267b015ac6a 100644
--- a/src/mame/drivers/omegrace.c
+++ b/src/mame/drivers/omegrace.c
@@ -388,7 +388,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( omegrace )
- PORT_START_TAG("DSW1") /* SW0 */
+ PORT_START("DSW1") /* SW0 */
PORT_DIPNAME( 0x03, 0x03, "1st Bonus Life" ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING ( 0x00, "40k" )
PORT_DIPSETTING ( 0x01, "50k" )
@@ -411,7 +411,7 @@ static INPUT_PORTS_START( omegrace )
PORT_DIPSETTING ( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING ( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* SW1 */
+ PORT_START("DSW2") /* SW1 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3")
PORT_DIPSETTING ( 0x06, DEF_STR( 2C_1C ) )
PORT_DIPSETTING ( 0x07, DEF_STR( 1C_1C ) )
@@ -437,7 +437,7 @@ static INPUT_PORTS_START( omegrace )
PORT_DIPSETTING ( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING ( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("IN0") /* IN2 - port 0x11 */
+ PORT_START("IN0") /* IN2 - port 0x11 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -447,7 +447,7 @@ static INPUT_PORTS_START( omegrace )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN1") /* IN3 - port 0x12 */
+ PORT_START("IN1") /* IN3 - port 0x12 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START2 ) PORT_NAME("2 Players Start (1 credit)")
@@ -457,10 +457,10 @@ static INPUT_PORTS_START( omegrace )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("1 Player Start (1 credit)")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START3 ) PORT_NAME("1 Player Start (2 credits)")
- PORT_START_TAG("SPIN0") /* IN4 - port 0x15 - spinner */
+ PORT_START("SPIN0") /* IN4 - port 0x15 - spinner */
PORT_BIT(0x3f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(12) PORT_KEYDELTA(10)
- PORT_START_TAG("SPIN1") /* IN5 - port 0x16 - second spinner */
+ PORT_START("SPIN1") /* IN5 - port 0x16 - second spinner */
PORT_BIT(0x3f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(12) PORT_KEYDELTA(10) PORT_COCKTAIL
INPUT_PORTS_END
diff --git a/src/mame/drivers/oneshot.c b/src/mame/drivers/oneshot.c
index 32450768f87..78f4036f82c 100644
--- a/src/mame/drivers/oneshot.c
+++ b/src/mame/drivers/oneshot.c
@@ -161,7 +161,7 @@ static ADDRESS_MAP_START( snd_writemem, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( oneshot )
- PORT_START_TAG("DSW1") /* DSW 1 (0x19c020.l -> 0x08006c.l) */
+ PORT_START("DSW1") /* DSW 1 (0x19c020.l -> 0x08006c.l) */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) ) // 0x080084.l : credits (00-09)
PORT_DIPSETTING( 0x03, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
@@ -183,7 +183,7 @@ static INPUT_PORTS_START( oneshot )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* DSW 2 (0x19c024.l -> 0x08006e.l) */
+ PORT_START("DSW2") /* DSW 2 (0x19c024.l -> 0x08006e.l) */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) // 0x082500.l
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -203,7 +203,7 @@ static INPUT_PORTS_START( oneshot )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("CREDITS") /* Credits (0x19c02c.l -> 0x08007a.l) */
+ PORT_START("CREDITS") /* Credits (0x19c02c.l -> 0x08007a.l) */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -213,7 +213,7 @@ static INPUT_PORTS_START( oneshot )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("P1") /* Player 1 Gun Trigger (0x19c030.l) */
+ PORT_START("P1") /* Player 1 Gun Trigger (0x19c030.l) */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -223,7 +223,7 @@ static INPUT_PORTS_START( oneshot )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("P2") /* Player 2 Gun Trigger (0x19c034.l) */
+ PORT_START("P2") /* Player 2 Gun Trigger (0x19c034.l) */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -233,22 +233,22 @@ static INPUT_PORTS_START( oneshot )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("LIGHT0_X") /* Player 1 Gun X ($190026.l) */
+ PORT_START("LIGHT0_X") /* Player 1 Gun X ($190026.l) */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("LIGHT0_Y") /* Player 1 Gun Y ($190036.l) */
+ PORT_START("LIGHT0_Y") /* Player 1 Gun Y ($190036.l) */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("LIGHT1_X") /* Player 2 Gun X ($19002e.l) */
+ PORT_START("LIGHT1_X") /* Player 2 Gun X ($19002e.l) */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(15) PORT_PLAYER(2)
- PORT_START_TAG("LIGHT1_Y") /* Player 2 Gun Y ($19003e.l) */
+ PORT_START("LIGHT1_Y") /* Player 2 Gun Y ($19003e.l) */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(15) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( maddonna )
- PORT_START_TAG("DSW1") /* DSW A */
+ PORT_START("DSW1") /* DSW A */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
@@ -271,7 +271,7 @@ static INPUT_PORTS_START( maddonna )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_HIGH )
- PORT_START_TAG("DSW2") /* DSW B */
+ PORT_START("DSW2") /* DSW B */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x00, DEF_STR( Easy ) ) // 2 Monsters at start, but "dumber"??
PORT_DIPSETTING( 0x01, DEF_STR( Normal ) ) // 2 Monsters at start
@@ -294,7 +294,7 @@ static INPUT_PORTS_START( maddonna )
PORT_DIPSETTING( 0x80, "On - 01" )
PORT_DIPSETTING( 0xc0, "On - 11" )
- PORT_START_TAG("CREDITS") /* Credits */
+ PORT_START("CREDITS") /* Credits */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -304,7 +304,7 @@ static INPUT_PORTS_START( maddonna )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("P1") /* Player 1 */
+ PORT_START("P1") /* Player 1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -314,7 +314,7 @@ static INPUT_PORTS_START( maddonna )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("P2") /* Player 1 */
+ PORT_START("P2") /* Player 1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c
index 4c98d31782c..bc2e3dfc772 100644
--- a/src/mame/drivers/onetwo.c
+++ b/src/mame/drivers/onetwo.c
@@ -140,7 +140,7 @@ static ADDRESS_MAP_START( sound_cpu_io, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( onetwo )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Timer" ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -179,7 +179,7 @@ static INPUT_PORTS_START( onetwo )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_5C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_6C ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown) ) PORT_DIPLOCATION("SW2:1") /* Flip Sreen? */
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -206,7 +206,7 @@ static INPUT_PORTS_START( onetwo )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -216,7 +216,7 @@ static INPUT_PORTS_START( onetwo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -226,7 +226,7 @@ static INPUT_PORTS_START( onetwo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c
index b850c89751c..a28f2d987a3 100644
--- a/src/mame/drivers/opwolf.c
+++ b/src/mame/drivers/opwolf.c
@@ -411,7 +411,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( opwolf )
/* 0x380000 -> 0x0ff028 (-$fd8,A5) (C-chip) */
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPUNUSED( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Allow_Continue ) )
PORT_DIPSETTING( 0x02, DEF_STR( No ) )
@@ -420,7 +420,7 @@ static INPUT_PORTS_START( opwolf )
TAITO_COINAGE_WORLD
/* 0x380002 -> 0x0ff02a (-$fd6,A5) (C-chip) */
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, "Ammo Magazines at Start" )
PORT_DIPSETTING( 0x00, "4" )
@@ -434,7 +434,7 @@ static INPUT_PORTS_START( opwolf )
PORT_DIPSETTING( 0x80, DEF_STR( Japanese ) )
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -444,7 +444,7 @@ static INPUT_PORTS_START( opwolf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -455,11 +455,11 @@ static INPUT_PORTS_START( opwolf )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
/* P1X (span allows you to shoot enemies behind status bar) */
- PORT_START_TAG(P1X_PORT_TAG)
+ PORT_START(P1X_PORT_TAG)
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1)
/* P1Y (span allows you to be slightly offscreen) */
- PORT_START_TAG(P1Y_PORT_TAG)
+ PORT_START(P1Y_PORT_TAG)
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1)
INPUT_PORTS_END
diff --git a/src/mame/drivers/orbit.c b/src/mame/drivers/orbit.c
index 8561e4ac7c9..9b888b2bb16 100644
--- a/src/mame/drivers/orbit.c
+++ b/src/mame/drivers/orbit.c
@@ -145,7 +145,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( orbit )
- PORT_START_TAG("P1") /* 0800 */
+ PORT_START("P1") /* 0800 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) /* actually buttons */
@@ -155,7 +155,7 @@ static INPUT_PORTS_START( orbit )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("P2") /* 1000 */
+ PORT_START("P2") /* 1000 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) /* actually buttons */
@@ -165,7 +165,7 @@ static INPUT_PORTS_START( orbit )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("DSW1") /* 1800 */
+ PORT_START("DSW1") /* 1800 */
PORT_DIPNAME( 0x07, 0x00, "Play Time Per Credit" )
PORT_DIPSETTING( 0x00, "0:30" )
PORT_DIPSETTING( 0x01, "1:00" )
@@ -190,7 +190,7 @@ static INPUT_PORTS_START( orbit )
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x80, DEF_STR( On ))
- PORT_START_TAG("DSW2") /* 2000 */
+ PORT_START("DSW2") /* 2000 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Game Reset") PORT_CODE(KEYCODE_PLUS_PAD)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Game 9") PORT_CODE(KEYCODE_9_PAD)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Game 8") PORT_CODE(KEYCODE_8_PAD)
@@ -206,7 +206,7 @@ static INPUT_PORTS_START( orbit )
PORT_DIPSETTING( 0x00, DEF_STR( On ))
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("BUTTONS") /* 2800 */
+ PORT_START("BUTTONS") /* 2800 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Game 7 / Strong Gravity") PORT_CODE(KEYCODE_7_PAD)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Game 6 / Stars") PORT_CODE(KEYCODE_6_PAD)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Game 5 / Unlimited Supplies") PORT_CODE(KEYCODE_5_PAD)
diff --git a/src/mame/drivers/othldrby.c b/src/mame/drivers/othldrby.c
index d7b3df29786..c9e586fd76b 100644
--- a/src/mame/drivers/othldrby.c
+++ b/src/mame/drivers/othldrby.c
@@ -126,7 +126,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( othldrby )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -148,7 +148,7 @@ static INPUT_PORTS_START( othldrby )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_2C ) )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x00, DEF_STR( Normal ) )
@@ -173,7 +173,7 @@ static INPUT_PORTS_START( othldrby )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -183,7 +183,7 @@ static INPUT_PORTS_START( othldrby )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -193,7 +193,7 @@ static INPUT_PORTS_START( othldrby )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* TEST */
diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c
index 35faedd50bf..e8a9e7a3f65 100644
--- a/src/mame/drivers/othunder.c
+++ b/src/mame/drivers/othunder.c
@@ -551,7 +551,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( othunder )
/* 0x090000 -> 0x08a000 */
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPUNUSED( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Allow_Continue ) )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
@@ -560,7 +560,7 @@ static INPUT_PORTS_START( othunder )
TAITO_COINAGE_WORLD
/* 0x090002 -> 0x08a002 */
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Medium ) )
@@ -581,7 +581,7 @@ static INPUT_PORTS_START( othunder )
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
PORT_DIPSETTING( 0x80, DEF_STR( Japanese ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -591,10 +591,10 @@ static INPUT_PORTS_START( othunder )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1") /* unused */
+ PORT_START("IN1") /* unused */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -608,20 +608,20 @@ static INPUT_PORTS_START( othunder )
enough and being accurate enough not to miss targets. 20 is too
inaccurate, and 10 is too slow. */
- PORT_START_TAG(P1X_PORT_TAG)
+ PORT_START(P1X_PORT_TAG)
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(13) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG(P1Y_PORT_TAG)
+ PORT_START(P1Y_PORT_TAG)
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_CROSSHAIR(Y, 1.0, -0.057, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(13) PORT_PLAYER(1)
- PORT_START_TAG(P2X_PORT_TAG)
+ PORT_START(P2X_PORT_TAG)
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(13) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG(P2Y_PORT_TAG)
+ PORT_START(P2Y_PORT_TAG)
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_CROSSHAIR(Y, 1.0, -0.057, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(13) PORT_PLAYER(2)
/* rotary volume control */
- PORT_START_TAG(ROTARY_PORT_TAG)
+ PORT_START(ROTARY_PORT_TAG)
PORT_CONFNAME( 0x07, 0x07, "Stereo Separation" )
PORT_CONFSETTING( 0x07, "Maximum" )
PORT_CONFSETTING( 0x03, DEF_STR( High ) )
diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c
index 65689d71ce0..81ce5da936c 100644
--- a/src/mame/drivers/overdriv.c
+++ b/src/mame/drivers/overdriv.c
@@ -344,7 +344,7 @@ ADDRESS_MAP_END
/* is missing. */
static INPUT_PORTS_START( overdriv )
- PORT_START_TAG("INPUT")
+ PORT_START("INPUT")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_TOGGLE
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -354,7 +354,7 @@ static INPUT_PORTS_START( overdriv )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -364,7 +364,7 @@ static INPUT_PORTS_START( overdriv )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) // ?
- PORT_START_TAG("PADDLE")
+ PORT_START("PADDLE")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(100) PORT_KEYDELTA(50)
INPUT_PORTS_END
diff --git a/src/mame/drivers/pacland.c b/src/mame/drivers/pacland.c
index bd5577da37d..33e2fdbe251 100644
--- a/src/mame/drivers/pacland.c
+++ b/src/mame/drivers/pacland.c
@@ -291,7 +291,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( pacland )
- PORT_START_TAG("DSWA") /* DSWA */
+ PORT_START("DSWA") /* DSWA */
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x60, 0x60, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x40, "2" )
@@ -312,7 +312,7 @@ static INPUT_PORTS_START( pacland )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSWB") /* DSWB */
+ PORT_START("DSWB") /* DSWB */
PORT_DIPNAME( 0xe0, 0xe0, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0xe0, "30K 80K 130K 300K 500K 1M" )
PORT_DIPSETTING( 0x80, "30K 80K every 100K" )
@@ -337,7 +337,7 @@ static INPUT_PORTS_START( pacland )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
- PORT_START_TAG("IN0") /* Memory Mapped Port */
+ PORT_START("IN0") /* Memory Mapped Port */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -349,7 +349,7 @@ static INPUT_PORTS_START( pacland )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("IN1") /* Memory Mapped Port */
+ PORT_START("IN1") /* Memory Mapped Port */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -359,7 +359,7 @@ static INPUT_PORTS_START( pacland )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) // IPT_JOYSTICK_DOWN according to schematics
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_COCKTAIL // IPT_JOYSTICK_UP according to schematics
- PORT_START_TAG("IN2") /* MCU Input Port */
+ PORT_START("IN2") /* MCU Input Port */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_COCKTAIL /* OUT:coin lockout */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* OUT:coin counter 1 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) /* OUT:coin counter 2 */
diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c
index 0e6b33b5047..24ccbf2d836 100644
--- a/src/mame/drivers/pacman.c
+++ b/src/mame/drivers/pacman.c
@@ -1215,7 +1215,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( pacman )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) PORT_4WAY
@@ -1227,7 +1227,7 @@ static INPUT_PORTS_START( pacman )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) PORT_4WAY PORT_COCKTAIL
@@ -1239,7 +1239,7 @@ static INPUT_PORTS_START( pacman )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -1262,10 +1262,10 @@ static INPUT_PORTS_START( pacman )
PORT_DIPSETTING( 0x80, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x00, DEF_STR( Alternate ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("FAKE")
+ PORT_START("FAKE")
/* This fake input port is used to get the status of the fire button */
/* and activate the speedup cheat if it is. */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME( "2x Speed (Cheat)" )
@@ -1279,7 +1279,7 @@ INPUT_PORTS_END
/* Ms. Pac-Man input ports are identical to Pac-Man, the only difference is */
/* the missing Ghost Names dip switch. */
static INPUT_PORTS_START( mspacman )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -1291,7 +1291,7 @@ static INPUT_PORTS_START( mspacman )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -1303,7 +1303,7 @@ static INPUT_PORTS_START( mspacman )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -1324,10 +1324,10 @@ static INPUT_PORTS_START( mspacman )
PORT_DIPSETTING( 0x00, DEF_STR( Hard ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("FAKE")
+ PORT_START("FAKE")
/* This fake input port is used to get the status of the fire button */
/* and activate the speedup cheat if it is. */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME( "2x Speed (Cheat)" )
@@ -1340,7 +1340,7 @@ INPUT_PORTS_END
/* Same as 'mspacman', but no fake input port */
static INPUT_PORTS_START( mspacpls )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -1352,7 +1352,7 @@ static INPUT_PORTS_START( mspacpls )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -1364,7 +1364,7 @@ static INPUT_PORTS_START( mspacpls )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -1385,13 +1385,13 @@ static INPUT_PORTS_START( mspacpls )
PORT_DIPSETTING( 0x00, DEF_STR( Hard ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( mschamp )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -1403,7 +1403,7 @@ static INPUT_PORTS_START( mschamp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN3 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -1415,7 +1415,7 @@ static INPUT_PORTS_START( mschamp )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -1436,10 +1436,10 @@ static INPUT_PORTS_START( mschamp )
PORT_DIPSETTING( 0x00, DEF_STR( Hard ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("GAME")
+ PORT_START("GAME")
PORT_DIPNAME( 0x01, 0x01, "Game" )
PORT_DIPSETTING( 0x01, "Champion Edition" )
PORT_DIPSETTING( 0x00, "Super Zola Pac Gal" )
@@ -1455,7 +1455,7 @@ static INPUT_PORTS_START( mschamp )
INPUT_PORTS_END
static INPUT_PORTS_START( maketrax )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -1467,7 +1467,7 @@ static INPUT_PORTS_START( maketrax )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -1477,7 +1477,7 @@ static INPUT_PORTS_START( maketrax )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Protection */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -1496,19 +1496,19 @@ static INPUT_PORTS_START( maketrax )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Protection */
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( crush4 )
PORT_INCLUDE( maketrax )
- PORT_START_TAG("GAME")
+ PORT_START("GAME")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SPECIAL ) // always select 2nd part of code
INPUT_PORTS_END
static INPUT_PORTS_START( korosuke )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -1520,7 +1520,7 @@ static INPUT_PORTS_START( korosuke )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -1530,7 +1530,7 @@ static INPUT_PORTS_START( korosuke )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Protection */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -1549,12 +1549,12 @@ static INPUT_PORTS_START( korosuke )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Protection */
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( mbrush )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -1566,7 +1566,7 @@ static INPUT_PORTS_START( mbrush )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -1576,7 +1576,7 @@ static INPUT_PORTS_START( mbrush )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Protection in Make Trax */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -1595,13 +1595,13 @@ static INPUT_PORTS_START( mbrush )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Protection in Make Trax */
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( paintrlr )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -1613,7 +1613,7 @@ static INPUT_PORTS_START( paintrlr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -1623,7 +1623,7 @@ static INPUT_PORTS_START( paintrlr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Protection in Make Trax */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -1642,13 +1642,13 @@ static INPUT_PORTS_START( paintrlr )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Protection in Make Trax */
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( crushs )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -1658,7 +1658,7 @@ static INPUT_PORTS_START( crushs )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -1670,7 +1670,7 @@ static INPUT_PORTS_START( crushs )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW)
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1697,7 +1697,7 @@ static INPUT_PORTS_START( crushs )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x08, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x09, DEF_STR( 2C_2C ) )
@@ -1736,7 +1736,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( ponpoko )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
@@ -1747,7 +1747,7 @@ static INPUT_PORTS_START( ponpoko )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
/* The 2nd player controls are used even in upright mode */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
@@ -1757,7 +1757,7 @@ static INPUT_PORTS_START( ponpoko )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x01, "10000" )
PORT_DIPSETTING( 0x02, "30000" )
@@ -1780,7 +1780,7 @@ static INPUT_PORTS_START( ponpoko )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0f, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x04, "A 3/1 B 3/1" )
PORT_DIPSETTING( 0x0e, "A 3/1 B 1/2" )
@@ -1814,7 +1814,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( eyes )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -1824,7 +1824,7 @@ static INPUT_PORTS_START( eyes )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -1834,7 +1834,7 @@ static INPUT_PORTS_START( eyes )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -1857,13 +1857,13 @@ static INPUT_PORTS_START( eyes )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( mrtnt )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -1873,7 +1873,7 @@ static INPUT_PORTS_START( mrtnt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -1883,7 +1883,7 @@ static INPUT_PORTS_START( mrtnt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -1906,13 +1906,13 @@ static INPUT_PORTS_START( mrtnt )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( lizwiz )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
@@ -1922,7 +1922,7 @@ static INPUT_PORTS_START( lizwiz )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
@@ -1932,7 +1932,7 @@ static INPUT_PORTS_START( lizwiz )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -1955,13 +1955,13 @@ static INPUT_PORTS_START( lizwiz )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( theglobp )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -1971,7 +1971,7 @@ static INPUT_PORTS_START( theglobp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -1983,7 +1983,7 @@ static INPUT_PORTS_START( theglobp )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -2008,13 +2008,13 @@ static INPUT_PORTS_START( theglobp )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( vanvan )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -2024,7 +2024,7 @@ static INPUT_PORTS_START( vanvan )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -2034,7 +2034,7 @@ static INPUT_PORTS_START( vanvan )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -2058,7 +2058,7 @@ static INPUT_PORTS_START( vanvan )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_3C ) )
/* When all DSW2 are ON, there is no sprite collision detection */
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -2087,7 +2087,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( vanvank )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -2097,7 +2097,7 @@ static INPUT_PORTS_START( vanvank )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -2107,7 +2107,7 @@ static INPUT_PORTS_START( vanvank )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -2132,7 +2132,7 @@ static INPUT_PORTS_START( vanvank )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_3C ) )
/* When all DSW2 are ON, there is no sprite collision detection */
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -2161,7 +2161,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( dremshpr )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -2171,7 +2171,7 @@ static INPUT_PORTS_START( dremshpr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -2181,7 +2181,7 @@ static INPUT_PORTS_START( dremshpr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -2204,7 +2204,7 @@ static INPUT_PORTS_START( dremshpr )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_3C ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
/* turning this on crashes puts the */
/* emulated machine in an infinite loop once in a while */
#if 0
@@ -2218,7 +2218,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( alibaba )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -2230,7 +2230,7 @@ static INPUT_PORTS_START( alibaba )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -2242,7 +2242,7 @@ static INPUT_PORTS_START( alibaba )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -2268,7 +2268,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( jumpshot )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
@@ -2280,7 +2280,7 @@ static INPUT_PORTS_START( jumpshot )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
@@ -2292,7 +2292,7 @@ static INPUT_PORTS_START( jumpshot )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x01, "Time" )
// PORT_DIPSETTING( 0x00, "2 Minutes" )
PORT_DIPSETTING( 0x02, "2 Minutes" )
@@ -2317,13 +2317,13 @@ static INPUT_PORTS_START( jumpshot )
PORT_DIPSETTING( 0x80, DEF_STR( Off) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( jumpshtp )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
@@ -2335,7 +2335,7 @@ static INPUT_PORTS_START( jumpshtp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
@@ -2347,7 +2347,7 @@ static INPUT_PORTS_START( jumpshtp )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x01, "Time Limit" )
// PORT_DIPSETTING( 0x00, "Short" )
PORT_DIPSETTING( 0x02, "Short" )
@@ -2372,19 +2372,19 @@ static INPUT_PORTS_START( jumpshtp )
PORT_DIPSETTING( 0x80, DEF_STR( Off) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( shootbul )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0f, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(25)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN3 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0f, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(25) PORT_REVERSE
PORT_SERVICE( 0x10, IP_ACTIVE_LOW )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -2393,7 +2393,7 @@ static INPUT_PORTS_START( shootbul )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x07, "Time" )
PORT_DIPSETTING( 0x01, "Short")
PORT_DIPSETTING( 0x07, "Average" )
@@ -2414,7 +2414,7 @@ static INPUT_PORTS_START( shootbul )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -2425,7 +2425,7 @@ INPUT_PORTS_END
can test everything. Wierd. */
static INPUT_PORTS_START( bwcasino )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 )
@@ -2435,7 +2435,7 @@ static INPUT_PORTS_START( bwcasino )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_COCKTAIL PORT_PLAYER(2)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL PORT_PLAYER(2)
@@ -2447,7 +2447,7 @@ static INPUT_PORTS_START( bwcasino )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2478,7 +2478,7 @@ static INPUT_PORTS_START( bwcasino )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -2488,7 +2488,7 @@ INPUT_PORTS_END
"Boardwalk" */
static INPUT_PORTS_START( acitya )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 )
@@ -2498,7 +2498,7 @@ static INPUT_PORTS_START( acitya )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2508,7 +2508,7 @@ static INPUT_PORTS_START( acitya )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON6 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2539,13 +2539,13 @@ static INPUT_PORTS_START( acitya )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( nmouse )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -2557,7 +2557,7 @@ static INPUT_PORTS_START( nmouse )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -2569,7 +2569,7 @@ static INPUT_PORTS_START( nmouse )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -2592,13 +2592,13 @@ static INPUT_PORTS_START( nmouse )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( woodpek )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -2610,7 +2610,7 @@ static INPUT_PORTS_START( woodpek )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -2620,7 +2620,7 @@ static INPUT_PORTS_START( woodpek )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -2641,12 +2641,12 @@ static INPUT_PORTS_START( woodpek )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( bigbucks )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -2658,7 +2658,7 @@ static INPUT_PORTS_START( bigbucks )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -2668,7 +2668,7 @@ static INPUT_PORTS_START( bigbucks )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, "Time to bet / answer" )
PORT_DIPSETTING( 0x00, "15 sec. / 10 sec." )
PORT_DIPSETTING( 0x01, "20 sec. / 15 sec." )
@@ -2694,13 +2694,13 @@ static INPUT_PORTS_START( bigbucks )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( drivfrcp )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
@@ -2710,7 +2710,7 @@ static INPUT_PORTS_START( drivfrcp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2720,7 +2720,7 @@ static INPUT_PORTS_START( drivfrcp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -2746,13 +2746,13 @@ static INPUT_PORTS_START( drivfrcp )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("Sense")
+ PORT_START("Sense")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
INPUT_PORTS_END
static INPUT_PORTS_START( 8bpm )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -2762,7 +2762,7 @@ static INPUT_PORTS_START( 8bpm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -2772,7 +2772,7 @@ static INPUT_PORTS_START( 8bpm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Start 2 / P1 Button 1")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -2798,13 +2798,13 @@ static INPUT_PORTS_START( 8bpm )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("Sense")
+ PORT_START("Sense")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
INPUT_PORTS_END
static INPUT_PORTS_START( porky )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
@@ -2814,7 +2814,7 @@ static INPUT_PORTS_START( porky )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
@@ -2824,7 +2824,7 @@ static INPUT_PORTS_START( porky )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -2850,13 +2850,13 @@ static INPUT_PORTS_START( porky )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("Sense")
+ PORT_START("Sense")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
INPUT_PORTS_END
static INPUT_PORTS_START( rocktrv2 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -2866,7 +2866,7 @@ static INPUT_PORTS_START( rocktrv2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_TILT )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2)
@@ -2876,7 +2876,7 @@ static INPUT_PORTS_START( rocktrv2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -2900,7 +2900,7 @@ static INPUT_PORTS_START( rocktrv2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, "Mode" )
PORT_DIPSETTING( 0x01, "Amusement" )
PORT_DIPSETTING( 0x00, "Credit" )
@@ -2926,7 +2926,7 @@ static INPUT_PORTS_START( rocktrv2 )
INPUT_PORTS_END
static INPUT_PORTS_START( cannonbp )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -2936,7 +2936,7 @@ static INPUT_PORTS_START( cannonbp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -2946,7 +2946,7 @@ static INPUT_PORTS_START( cannonbp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 ) PORT_NAME( "Select" )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Display" )
PORT_DIPSETTING( 0x03, "Scores and Progession Bars" )
PORT_DIPSETTING( 0x01, "Scores only" )
@@ -2964,7 +2964,7 @@ static INPUT_PORTS_START( cannonbp )
PORT_DIPUNUSED( 0x40, IP_ACTIVE_LOW )
PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c
index 0023c4f7dcf..47e4f9087a7 100644
--- a/src/mame/drivers/pandoras.c
+++ b/src/mame/drivers/pandoras.c
@@ -203,7 +203,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( pandoras )
- PORT_START /* DSW #1 */
+ PORT_START("DSW1") /* DSW #1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -239,7 +239,7 @@ static INPUT_PORTS_START( pandoras )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START /* DSW #2 */
+ PORT_START("DSW2") /* DSW #2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -262,7 +262,7 @@ static INPUT_PORTS_START( pandoras )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW #3 */
+ PORT_START("DSw3") /* DSW #3 */
PORT_DIPNAME( 0x01, 0x01, "Freeze" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -288,7 +288,7 @@ static INPUT_PORTS_START( pandoras )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* COINSW */
+ PORT_START("SYSTEM") /* COINSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -297,7 +297,7 @@ static INPUT_PORTS_START( pandoras )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* PLAYER 1 INPUTS */
+ PORT_START("P1") /* PLAYER 1 INPUTS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -305,7 +305,7 @@ static INPUT_PORTS_START( pandoras )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* PLAYER 2 INPUTS */
+ PORT_START("P2") /* PLAYER 2 INPUTS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c
index 30317b166f7..ac717838876 100644
--- a/src/mame/drivers/panicr.c
+++ b/src/mame/drivers/panicr.c
@@ -239,26 +239,26 @@ static INTERRUPT_GEN( panicr_interrupt )
}
static INPUT_PORTS_START( panicr )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) //left
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) //right
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) //shake 1
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) //shake 2
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) //left
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) //right
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) //shake 1
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) //shake 2
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xe7, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:8,7,6")
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ))
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ))
@@ -281,7 +281,7 @@ static INPUT_PORTS_START( panicr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -304,7 +304,7 @@ static INPUT_PORTS_START( panicr )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG(T5182COINPORT)
+ PORT_START(T5182COINPORT)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(2)
INPUT_PORTS_END
diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c
index bcd9550bee1..48042833993 100644
--- a/src/mame/drivers/paradise.c
+++ b/src/mame/drivers/paradise.c
@@ -132,7 +132,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( paradise )
- PORT_START // IN0 - port $2020 - DSW 1
+ PORT_START("DSW1") // IN0 - port $2020 - DSW 1
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -155,7 +155,7 @@ static INPUT_PORTS_START( paradise )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START // IN1 - port $2021 - DSW 2
+ PORT_START("DSW2") // IN1 - port $2021 - DSW 2
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -180,7 +180,7 @@ static INPUT_PORTS_START( paradise )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START // IN2 - port $2022 - Player 1
+ PORT_START("P1") // IN2 - port $2022 - Player 1
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -190,7 +190,7 @@ static INPUT_PORTS_START( paradise )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) // alias for button1?
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START // IN3 - port $2023 - Player 2
+ PORT_START("P2") // IN3 - port $2023 - Player 2
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -200,7 +200,7 @@ static INPUT_PORTS_START( paradise )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) // alias for button1?
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START // IN4 - port $2024 - Coins
+ PORT_START("SYSTEM") // IN4 - port $2024 - Coins
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -213,7 +213,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( tgtball )
- PORT_START // IN0 - port $2020 - DSW 1
+ PORT_START("DSW1") // IN0 - port $2020 - DSW 1
PORT_DIPNAME( 0x03, 0x02, "Time" )
PORT_DIPSETTING( 0x03, "60" )
PORT_DIPSETTING( 0x02, "80" )
@@ -236,7 +236,7 @@ static INPUT_PORTS_START( tgtball )
PORT_DIPSETTING( 0x80, "Target Score" )
PORT_DIPSETTING( 0x00, "Balls Sequence" )
- PORT_START // IN1 - port $2021 - DSW 2
+ PORT_START("DSW2") // IN1 - port $2021 - DSW 2
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -260,7 +260,7 @@ static INPUT_PORTS_START( tgtball )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START // IN2 - port $2022 - Player 1
+ PORT_START("P1") // IN2 - port $2022 - Player 1
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -270,7 +270,7 @@ static INPUT_PORTS_START( tgtball )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START // IN3 - port $2023 - Player 2
+ PORT_START("P2") // IN3 - port $2023 - Player 2
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -280,7 +280,7 @@ static INPUT_PORTS_START( tgtball )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START // IN4 - port $2024 - Coins
+ PORT_START("SYSTEM") // IN4 - port $2024 - Coins
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -292,8 +292,7 @@ static INPUT_PORTS_START( tgtball )
INPUT_PORTS_END
static INPUT_PORTS_START( torus )
-
- PORT_START // IN0 - port $2020 - DSW 1
+ PORT_START("DSW1") // IN0 - port $2020 - DSW 1
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -318,7 +317,7 @@ static INPUT_PORTS_START( torus )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START // IN1 - port $2021 - DSW 2
+ PORT_START("DSW2") // IN1 - port $2021 - DSW 2
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -344,7 +343,7 @@ static INPUT_PORTS_START( torus )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START // IN2 - port $2022 - Player 1
+ PORT_START("P1") // IN2 - port $2022 - Player 1
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -354,7 +353,7 @@ static INPUT_PORTS_START( torus )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START // IN3 - port $2023 - Player 2
+ PORT_START("P2") // IN3 - port $2023 - Player 2
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -364,7 +363,7 @@ static INPUT_PORTS_START( torus )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START // IN4 - port $2024 - Coins
+ PORT_START("SYSTEM") // IN4 - port $2024 - Coins
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -377,7 +376,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( madball )
- PORT_START /* 8bit DSW 1 */
+ PORT_START("DSW1") /* 8bit DSW 1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -401,7 +400,7 @@ static INPUT_PORTS_START( madball )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* 8bit DSW 2 */
+ PORT_START("DSW2") /* 8bit DSW 2 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -426,7 +425,7 @@ static INPUT_PORTS_START( madball )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START // IN2 - port $2022 - Player 1
+ PORT_START("P1") // IN2 - port $2022 - Player 1
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -436,7 +435,7 @@ static INPUT_PORTS_START( madball )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START // IN3 - port $2023 - Player 2
+ PORT_START("P2") // IN3 - port $2023 - Player 2
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -446,7 +445,7 @@ static INPUT_PORTS_START( madball )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START // IN4 - port $2024 - Coins
+ PORT_START("SYSTEM") // IN4 - port $2024 - Coins
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/paranoia.c b/src/mame/drivers/paranoia.c
index 28982099af6..4cfc30c02c2 100644
--- a/src/mame/drivers/paranoia.c
+++ b/src/mame/drivers/paranoia.c
@@ -41,7 +41,7 @@ HuC6280A (Hudson)
#include "sound/c6280.h"
static INPUT_PORTS_START( paranoia )
- PORT_START_TAG( "JOY" )
+ PORT_START( "JOY" )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* button I */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) /* button II */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) /* select */
diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c
index 7664dcd7f2a..0a91023108a 100644
--- a/src/mame/drivers/parodius.c
+++ b/src/mame/drivers/parodius.c
@@ -183,7 +183,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( parodius )
- PORT_START /* PLAYER 1 INPUTS */
+ PORT_START("P1") /* PLAYER 1 INPUTS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -193,7 +193,7 @@ static INPUT_PORTS_START( parodius )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) // shoot
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) // missile
- PORT_START /* PLAYER 2 INPUTS */
+ PORT_START("P2") /* PLAYER 2 INPUTS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -203,7 +203,7 @@ static INPUT_PORTS_START( parodius )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_START /* DSW #1 */
+ PORT_START("DSW1") /* DSW #1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -239,7 +239,7 @@ static INPUT_PORTS_START( parodius )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "No Use" )
- PORT_START /* DSW #2 */
+ PORT_START("DSW2") /* DSW #2 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -262,7 +262,7 @@ static INPUT_PORTS_START( parodius )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW #3 */
+ PORT_START("DSW3") /* DSW #3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c
index 8286beb6564..9fa78bdd17d 100644
--- a/src/mame/drivers/pasha2.c
+++ b/src/mame/drivers/pasha2.c
@@ -246,7 +246,7 @@ static ADDRESS_MAP_START( pasha2_io, ADDRESS_SPACE_IO, 16 )
ADDRESS_MAP_END
static INPUT_PORTS_START( pasha2 )
- PORT_START
+ PORT_START("COINS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -265,7 +265,7 @@ static INPUT_PORTS_START( pasha2 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
// 2 physical dip-switches
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -313,7 +313,7 @@ static INPUT_PORTS_START( pasha2 )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
diff --git a/src/mame/drivers/pass.c b/src/mame/drivers/pass.c
index a5ea0a6b068..2a928ee530d 100644
--- a/src/mame/drivers/pass.c
+++ b/src/mame/drivers/pass.c
@@ -170,7 +170,7 @@ ADDRESS_MAP_END
/* todo : work out function of unknown but used dsw */
static INPUT_PORTS_START( pass )
- PORT_START /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_DIPNAME( 0x0001, 0x0001, "Unknown SW 0-0" ) // USED ! Check code at 0x0046ea
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -218,7 +218,7 @@ static INPUT_PORTS_START( pass )
PORT_DIPSETTING( 0xa000, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x2000, DEF_STR( 1C_4C ) )
- PORT_START
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 )
diff --git a/src/mame/drivers/pastelg.c b/src/mame/drivers/pastelg.c
index 07808b91cdc..33ee8ef321d 100644
--- a/src/mame/drivers/pastelg.c
+++ b/src/mame/drivers/pastelg.c
@@ -94,7 +94,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( pastelg )
- PORT_START_TAG("DSWA") /* (0) DIPSW-A */
+ PORT_START("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1 (Easy)" )
PORT_DIPSETTING( 0x02, "2" )
@@ -119,7 +119,7 @@ static INPUT_PORTS_START( pastelg )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* (1) DIPSW-B */
+ PORT_START("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x00, "Number of last chance" )
PORT_DIPSETTING( 0x03, "0" )
PORT_DIPSETTING( 0x02, "1" )
@@ -143,7 +143,7 @@ static INPUT_PORTS_START( pastelg )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWC") /* (2) DIPSW-C */
+ PORT_START("DSWC") /* (2) DIPSW-C */
PORT_DIPNAME( 0x03, 0x03, "Change Rate" )
PORT_DIPSETTING( 0x03, "Type-A" )
PORT_DIPSETTING( 0x02, "Type-B" )
@@ -167,7 +167,7 @@ static INPUT_PORTS_START( pastelg )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* (3) PORT 0 */
+ PORT_START("SYSTEM") /* (3) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
diff --git a/src/mame/drivers/pbaction.c b/src/mame/drivers/pbaction.c
index 605fb1c29c1..ad77131e8b1 100644
--- a/src/mame/drivers/pbaction.c
+++ b/src/mame/drivers/pbaction.c
@@ -117,7 +117,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( pbaction )
- PORT_START /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON3 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON4 )
@@ -127,7 +127,7 @@ static INPUT_PORTS_START( pbaction )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_COCKTAIL
@@ -137,7 +137,7 @@ static INPUT_PORTS_START( pbaction )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN2 */
+ PORT_START("SYSTEM") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -147,7 +147,7 @@ static INPUT_PORTS_START( pbaction )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* DSW0 */
+ PORT_START("DSW1") /* DSW0 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) )
@@ -170,7 +170,7 @@ static INPUT_PORTS_START( pbaction )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW1 */
+ PORT_START("DSW2") /* DSW1 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x01, "70K 200K 1000K" )
PORT_DIPSETTING( 0x00, "70K 200K" )
diff --git a/src/mame/drivers/pcktgal.c b/src/mame/drivers/pcktgal.c
index f371dc91c1b..bc6ba2d7068 100644
--- a/src/mame/drivers/pcktgal.c
+++ b/src/mame/drivers/pcktgal.c
@@ -121,7 +121,7 @@ ADDRESS_MAP_END
/***************************************************************************/
static INPUT_PORTS_START( pcktgal )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -131,7 +131,7 @@ static INPUT_PORTS_START( pcktgal )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -141,7 +141,7 @@ static INPUT_PORTS_START( pcktgal )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START /* Dip switch */
+ PORT_START("DSW") /* Dip switch */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
diff --git a/src/mame/drivers/pengo.c b/src/mame/drivers/pengo.c
index 4bd7005fffc..41cc7ac3aed 100644
--- a/src/mame/drivers/pengo.c
+++ b/src/mame/drivers/pengo.c
@@ -149,7 +149,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( pengo )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
@@ -165,7 +165,7 @@ static INPUT_PORTS_START( pengo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
@@ -175,7 +175,7 @@ static INPUT_PORTS_START( pengo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x00, "30000" )
PORT_DIPSETTING( 0x01, "50000" )
@@ -199,7 +199,7 @@ static INPUT_PORTS_START( pengo )
PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0c, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -238,7 +238,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( jrpacmbl )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
@@ -248,7 +248,7 @@ static INPUT_PORTS_START( jrpacmbl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
@@ -258,7 +258,7 @@ static INPUT_PORTS_START( jrpacmbl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c
index 2394be86ff8..7aac038bc9e 100644
--- a/src/mame/drivers/peplus.c
+++ b/src/mame/drivers/peplus.c
@@ -790,14 +790,14 @@ static CUSTOM_INPUT( peplus_input_r )
static INPUT_PORTS_START( peplus )
/* IN0 has to be defined for each kind of game */
- PORT_START_TAG("DOOR")
+ PORT_START("DOOR")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Upper Door") PORT_CODE(KEYCODE_O) PORT_TOGGLE
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Lower Door") PORT_CODE(KEYCODE_I)
- PORT_START_TAG("SENSOR")
+ PORT_START("SENSOR")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("Coin In") PORT_IMPULSE(1)
- PORT_START_TAG("SW1")
+ PORT_START("SW1")
PORT_DIPNAME( 0x01, 0x01, "Line Frequency" )
PORT_DIPSETTING( 0x01, "60HZ" )
PORT_DIPSETTING( 0x00, "50HZ" )
@@ -812,7 +812,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( peplus_schip )
PORT_INCLUDE(peplus)
- PORT_START_TAG("IN_BANK1")
+ PORT_START("IN_BANK1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Jackpot Reset") PORT_CODE(KEYCODE_L)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Self Test") PORT_CODE(KEYCODE_K)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -821,7 +821,7 @@ static INPUT_PORTS_START( peplus_schip )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN_BANK2")
+ PORT_START("IN_BANK2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON9 ) PORT_NAME("Deal-Spin-Start") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -830,7 +830,7 @@ static INPUT_PORTS_START( peplus_schip )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x07, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(peplus_input_r, "IN_BANK1")
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(peplus_input_r, "IN_BANK2")
@@ -840,7 +840,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( peplus_poker )
PORT_INCLUDE(peplus)
- PORT_START_TAG("IN_BANK1")
+ PORT_START("IN_BANK1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Jackpot Reset") PORT_CODE(KEYCODE_L)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Self Test") PORT_CODE(KEYCODE_K)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Hold 1") PORT_CODE(KEYCODE_Z)
@@ -849,7 +849,7 @@ static INPUT_PORTS_START( peplus_poker )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("Hold 4") PORT_CODE(KEYCODE_V)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON7 ) PORT_NAME("Hold 5") PORT_CODE(KEYCODE_B)
- PORT_START_TAG("IN_BANK2")
+ PORT_START("IN_BANK2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON9 ) PORT_NAME("Deal-Spin-Start") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON10 ) PORT_NAME("Max Bet") PORT_CODE(KEYCODE_W)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -858,7 +858,7 @@ static INPUT_PORTS_START( peplus_poker )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON14 ) PORT_NAME("Change Request") PORT_CODE(KEYCODE_Y)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON15 ) PORT_NAME("Bill Acceptor") PORT_CODE(KEYCODE_U)
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x07, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(peplus_input_r, "IN_BANK1")
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(peplus_input_r, "IN_BANK2")
@@ -868,7 +868,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( peplus_bjack )
PORT_INCLUDE(peplus)
- PORT_START_TAG("IN_BANK1")
+ PORT_START("IN_BANK1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Jackpot Reset") PORT_CODE(KEYCODE_L)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Self Test") PORT_CODE(KEYCODE_K)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Surrender") PORT_CODE(KEYCODE_Z)
@@ -877,7 +877,7 @@ static INPUT_PORTS_START( peplus_bjack )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("Double Down") PORT_CODE(KEYCODE_V)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON7 ) PORT_NAME("Split") PORT_CODE(KEYCODE_B)
- PORT_START_TAG("IN_BANK2")
+ PORT_START("IN_BANK2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON9 ) PORT_NAME("Deal-Spin-Start") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON10 ) PORT_NAME("Max Bet") PORT_CODE(KEYCODE_W)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -886,7 +886,7 @@ static INPUT_PORTS_START( peplus_bjack )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON14 ) PORT_NAME("Change Request") PORT_CODE(KEYCODE_Y)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON15 ) PORT_NAME("Bill Acceptor") PORT_CODE(KEYCODE_U)
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x07, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(peplus_input_r, "IN_BANK1")
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(peplus_input_r, "IN_BANK2")
@@ -896,7 +896,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( peplus_keno )
PORT_INCLUDE(peplus)
- PORT_START_TAG("IN_BANK1")
+ PORT_START("IN_BANK1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Jackpot Reset") PORT_CODE(KEYCODE_L)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Self Test") PORT_CODE(KEYCODE_K)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -905,7 +905,7 @@ static INPUT_PORTS_START( peplus_keno )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON7 ) PORT_NAME("Erase") PORT_CODE(KEYCODE_B)
- PORT_START_TAG("IN_BANK2")
+ PORT_START("IN_BANK2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON9 ) PORT_NAME("Deal-Spin-Start") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON10 ) PORT_NAME("Max Bet") PORT_CODE(KEYCODE_W)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -914,12 +914,12 @@ static INPUT_PORTS_START( peplus_keno )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON14 ) PORT_NAME("Change Request") PORT_CODE(KEYCODE_Y)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON15 ) PORT_NAME("Bill Acceptor") PORT_CODE(KEYCODE_U)
- PORT_START_TAG("TOUCH_X")
+ PORT_START("TOUCH_X")
PORT_BIT( 0xff, 0x08, IPT_LIGHTGUN_X ) PORT_MINMAX(0x00, 0x28) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(13)
- PORT_START_TAG("TOUCH_Y")
+ PORT_START("TOUCH_Y")
PORT_BIT( 0xff, 0x08, IPT_LIGHTGUN_Y ) PORT_MINMAX(0x00, 0x19) PORT_CROSSHAIR(Y, -1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(13)
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x07, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(peplus_input_r, "IN_BANK1")
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_NAME("Light Pen") PORT_CODE(KEYCODE_A)
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(peplus_input_r, "IN_BANK2")
@@ -929,7 +929,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( peplus_slots )
PORT_INCLUDE(peplus)
- PORT_START_TAG("IN_BANK1")
+ PORT_START("IN_BANK1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Jackpot Reset") PORT_CODE(KEYCODE_L)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Self Test") PORT_CODE(KEYCODE_K)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -938,7 +938,7 @@ static INPUT_PORTS_START( peplus_slots )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN_BANK2")
+ PORT_START("IN_BANK2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON9 ) PORT_NAME("Deal-Spin-Start") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON10 ) PORT_NAME("Max Bet") PORT_CODE(KEYCODE_W)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -947,7 +947,7 @@ static INPUT_PORTS_START( peplus_slots )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON14 ) PORT_NAME("Change Request") PORT_CODE(KEYCODE_Y)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON15 ) PORT_NAME("Bill Acceptor") PORT_CODE(KEYCODE_U)
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x07, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(peplus_input_r, "IN_BANK1")
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(peplus_input_r, "IN_BANK2")
@@ -959,7 +959,7 @@ static INPUT_PORTS_START( peplus_pokah )
PORT_INCLUDE(peplus_poker)
/* If you change this option, you'll have to delete the .nv file next time you launch the game ! */
- PORT_START_TAG("AUTOHOLD")
+ PORT_START("AUTOHOLD")
PORT_CONFNAME( 0x01, 0x00, "Enable Autohold Feature" )
PORT_CONFSETTING( 0x00, DEF_STR( No ) )
PORT_CONFSETTING( 0x01, DEF_STR( Yes ) )
diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c
index 84566cf021e..a8d8c9907ae 100644
--- a/src/mame/drivers/pgm.c
+++ b/src/mame/drivers/pgm.c
@@ -818,7 +818,7 @@ ADDRESS_MAP_END
/* enough for 4 players, the basic dips mapped are listed in the test mode */
static INPUT_PORTS_START( pgm )
- PORT_START_TAG("P1P2") /* P1P2 */
+ PORT_START("P1P2") /* P1P2 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -836,7 +836,7 @@ static INPUT_PORTS_START( pgm )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_START_TAG("P3P4") /* P3P4 */
+ PORT_START("P3P4") /* P3P4 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3)
@@ -854,7 +854,7 @@ static INPUT_PORTS_START( pgm )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
- PORT_START_TAG("Service") /* Service */
+ PORT_START("Service") /* Service */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -874,7 +874,7 @@ static INPUT_PORTS_START( pgm )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
- PORT_START_TAG("DSW") /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0002, 0x0002, "Music" )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -898,7 +898,7 @@ static INPUT_PORTS_START( pgm )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("Region") /* Region */
+ PORT_START("Region") /* Region */
PORT_DIPNAME( 0x0003, 0x0000, DEF_STR( Region ) )
PORT_DIPSETTING( 0x0000, DEF_STR( World ) )
// PORT_DIPSETTING( 0x0001, DEF_STR( World ) ) // again?
@@ -916,7 +916,7 @@ static INPUT_PORTS_START( orld105k )
INPUT_PORTS_END
static INPUT_PORTS_START( sango )
- PORT_START_TAG("P1P2") /* DSW */
+ PORT_START("P1P2") /* DSW */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -934,7 +934,7 @@ static INPUT_PORTS_START( sango )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_START_TAG("P3P4") /* DSW */
+ PORT_START("P3P4") /* DSW */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3)
@@ -952,7 +952,7 @@ static INPUT_PORTS_START( sango )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
- PORT_START_TAG("Service") /* DSW */
+ PORT_START("Service") /* DSW */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -972,7 +972,7 @@ static INPUT_PORTS_START( sango )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // uused?
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // uused?
- PORT_START_TAG("DSW") /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0002, 0x0002, "Music" )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -996,7 +996,7 @@ static INPUT_PORTS_START( sango )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("Region") /* Region - supplied by protection device */
+ PORT_START("Region") /* Region - supplied by protection device */
PORT_DIPNAME( 0x000f, 0x0005, DEF_STR( Region ) )
PORT_DIPSETTING( 0x0000, "China" )
PORT_DIPSETTING( 0x0001, "Taiwan" )
@@ -1007,7 +1007,7 @@ static INPUT_PORTS_START( sango )
INPUT_PORTS_END
static INPUT_PORTS_START( olds )
- PORT_START_TAG("P1P2") /* DSW */
+ PORT_START("P1P2") /* DSW */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -1025,7 +1025,7 @@ static INPUT_PORTS_START( olds )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_START_TAG("P3P4") /* DSW */
+ PORT_START("P3P4") /* DSW */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3)
@@ -1043,7 +1043,7 @@ static INPUT_PORTS_START( olds )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
- PORT_START_TAG("Service") /* DSW */
+ PORT_START("Service") /* DSW */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -1063,7 +1063,7 @@ static INPUT_PORTS_START( olds )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // uused?
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // uused?
- PORT_START_TAG("DSW") /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0002, 0x0002, "Music" )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -1087,7 +1087,7 @@ static INPUT_PORTS_START( olds )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("Region") /* Region - supplied by protection device */
+ PORT_START("Region") /* Region - supplied by protection device */
PORT_DIPNAME( 0x000f, 0x0006, DEF_STR( Region ) )
// includes region 1 = taiwan , 2 = china, 3 = japan (title = orlegend special), 4 = korea, 5 = hongkong, 6 = world
PORT_DIPSETTING( 0x0001, "Taiwan" )
@@ -1099,7 +1099,7 @@ static INPUT_PORTS_START( olds )
INPUT_PORTS_END
static INPUT_PORTS_START( killbld )
- PORT_START_TAG("P1P2") /* DSW */
+ PORT_START("P1P2") /* DSW */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -1117,7 +1117,7 @@ static INPUT_PORTS_START( killbld )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_START_TAG("P3P4") /* DSW */
+ PORT_START("P3P4") /* DSW */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3)
@@ -1135,7 +1135,7 @@ static INPUT_PORTS_START( killbld )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
- PORT_START_TAG("Service") /* DSW */
+ PORT_START("Service") /* DSW */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -1155,7 +1155,7 @@ static INPUT_PORTS_START( killbld )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // uused?
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // uused?
- PORT_START_TAG("DSW") /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0002, 0x0002, "Music" )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -1179,7 +1179,7 @@ static INPUT_PORTS_START( killbld )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("Region") /* Region - supplied by protection device */
+ PORT_START("Region") /* Region - supplied by protection device */
PORT_DIPNAME( 0x00ff, 0x0021, DEF_STR( Region ) )
PORT_DIPSETTING( 0x0016, "Taiwan" )
PORT_DIPSETTING( 0x0017, "China" )
@@ -1196,7 +1196,7 @@ static INPUT_PORTS_START( killbld )
INPUT_PORTS_END
static INPUT_PORTS_START( photoy2k )
- PORT_START_TAG("P1P2") /* DSW */
+ PORT_START("P1P2") /* DSW */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -1214,7 +1214,7 @@ static INPUT_PORTS_START( photoy2k )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_START_TAG("P3P4") /* DSW */
+ PORT_START("P3P4") /* DSW */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3)
@@ -1232,7 +1232,7 @@ static INPUT_PORTS_START( photoy2k )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
- PORT_START_TAG("Service") /* DSW */
+ PORT_START("Service") /* DSW */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -1252,7 +1252,7 @@ static INPUT_PORTS_START( photoy2k )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // uused?
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // uused?
- PORT_START_TAG("DSW") /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0002, 0x0002, "Music" )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -1276,7 +1276,7 @@ static INPUT_PORTS_START( photoy2k )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("Region") /* Region - supplied by protection device */
+ PORT_START("Region") /* Region - supplied by protection device */
PORT_DIPNAME( 0x000f, 0x0003, DEF_STR( Region ) )
PORT_DIPSETTING( 0x0000, "Taiwan" )
PORT_DIPSETTING( 0x0001, "China" )
@@ -1287,7 +1287,7 @@ static INPUT_PORTS_START( photoy2k )
INPUT_PORTS_END
static INPUT_PORTS_START( ddp2 )
- PORT_START_TAG("P1P2") /* P1 */
+ PORT_START("P1P2") /* P1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -1305,7 +1305,7 @@ static INPUT_PORTS_START( ddp2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_START_TAG("P3P4") /* P2 */
+ PORT_START("P3P4") /* P2 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3)
@@ -1323,7 +1323,7 @@ static INPUT_PORTS_START( ddp2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
- PORT_START_TAG("Service") /* DSW */
+ PORT_START("Service") /* DSW */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -1343,7 +1343,7 @@ static INPUT_PORTS_START( ddp2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // uused?
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // uused?
- PORT_START_TAG("DSW") /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0002, 0x0002, "Music" )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -1368,7 +1368,7 @@ static INPUT_PORTS_START( ddp2 )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
/* probably not dsw related anyway
- PORT_START_TAG("UNK0")
+ PORT_START("UNK0")
PORT_DIPNAME( 0x0001, 0x0001, "4" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1418,7 +1418,7 @@ static INPUT_PORTS_START( ddp2 )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("UNK1")
+ PORT_START("UNK1")
PORT_DIPNAME( 0x0001, 0x0001, "5" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1468,7 +1468,7 @@ static INPUT_PORTS_START( ddp2 )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
*/
- PORT_START_TAG("Region") /* Region - supplied by protection device */
+ PORT_START("Region") /* Region - supplied by protection device */
PORT_DIPNAME( 0x000f, 0x0005, DEF_STR( Region ) )
PORT_DIPSETTING( 0x0000, "China" )
PORT_DIPSETTING( 0x0001, "Taiwan" )
diff --git a/src/mame/drivers/phoenix.c b/src/mame/drivers/phoenix.c
index 26ce097c2cc..91d0d76b523 100644
--- a/src/mame/drivers/phoenix.c
+++ b/src/mame/drivers/phoenix.c
@@ -73,14 +73,14 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( phoenix )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(player_input_r, 0)
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION( "SW1:1,2" )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -102,12 +102,12 @@ static INPUT_PORTS_START( phoenix )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("CAB") /* fake port for non-memory mapped dip switch */
+ PORT_START("CAB") /* fake port for non-memory mapped dip switch */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION( "SW1:!8" )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
- PORT_START_TAG("CTRL") /* fake port for multiplexed controls */
+ PORT_START("CTRL") /* fake port for multiplexed controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
@@ -156,14 +156,14 @@ static INPUT_PORTS_START( phoenix3 )
INPUT_PORTS_END
static INPUT_PORTS_START( condor )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(player_input_r, 0)
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION( "SW1:1,2" )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "3" )
@@ -185,7 +185,7 @@ static INPUT_PORTS_START( condor )
PORT_DIPSETTING( 0x70, "Fastest" )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_B ) ) PORT_DIPLOCATION( "SW2:1,2,3,4" )
PORT_DIPSETTING( 0x08, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x09, DEF_STR( 2C_2C ) )
@@ -221,12 +221,12 @@ static INPUT_PORTS_START( condor )
PORT_DIPSETTING( 0x60, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x70, DEF_STR( 1C_8C ) )
- PORT_START_TAG("CAB") /* fake port for non-memory mapped dip switch */
+ PORT_START("CAB") /* fake port for non-memory mapped dip switch */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION( "SW1:!8" )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
- PORT_START_TAG("CTRL") /* fake port for multiplexed controls */
+ PORT_START("CTRL") /* fake port for multiplexed controls */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
@@ -321,7 +321,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( survival )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
@@ -331,7 +331,7 @@ static INPUT_PORTS_START( survival )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x07, IP_ACTIVE_LOW, IPT_SPECIAL ) /* comes from IN0 0-2 */
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_COCKTAIL
@@ -339,7 +339,7 @@ static INPUT_PORTS_START( survival )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_COCKTAIL
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -360,7 +360,7 @@ static INPUT_PORTS_START( survival )
PORT_DIPSETTING( 0x60, DEF_STR( 1C_1C ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("CAB") /* fake port for non-memory mapped dip switch */
+ PORT_START("CAB") /* fake port for non-memory mapped dip switch */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
diff --git a/src/mame/drivers/pingpong.c b/src/mame/drivers/pingpong.c
index 9999c077dde..3bcdc3df738 100644
--- a/src/mame/drivers/pingpong.c
+++ b/src/mame/drivers/pingpong.c
@@ -131,7 +131,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( pingpong )
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE( 0x04, IP_ACTIVE_LOW )
@@ -141,7 +141,7 @@ static INPUT_PORTS_START( pingpong )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START /* IN1 */
+ PORT_START("INPUTS") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
@@ -151,7 +151,7 @@ static INPUT_PORTS_START( pingpong )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x0F, 0x0F, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0A, DEF_STR( 3C_1C ) )
@@ -187,7 +187,7 @@ static INPUT_PORTS_START( pingpong )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
- PORT_START /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -204,7 +204,7 @@ static INPUT_PORTS_START( pingpong )
INPUT_PORTS_END
static INPUT_PORTS_START( merlinmm )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_DIPNAME( 0x01, 0x01, "Bank 3-3")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -230,7 +230,7 @@ static INPUT_PORTS_START( merlinmm )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -246,7 +246,7 @@ static INPUT_PORTS_START( merlinmm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x02, "Stake" )
PORT_DIPSETTING( 0x02, "10p" )
@@ -270,7 +270,7 @@ static INPUT_PORTS_START( merlinmm )
PORT_DIPSETTING( 0x80, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_DIPNAME( 0x01, 0x01, "Bank 2-8")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -296,7 +296,7 @@ static INPUT_PORTS_START( merlinmm )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_DIPNAME( 0x01, 0x01, "10P Level" )//Most likely to be optos, rather than DIPs.
PORT_DIPSETTING( 0x01, DEF_STR( Low ) )
PORT_DIPSETTING( 0x00, DEF_STR( High ) )
@@ -316,7 +316,7 @@ static INPUT_PORTS_START( merlinmm )
INPUT_PORTS_END
static INPUT_PORTS_START( cashquiz )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -336,7 +336,7 @@ static INPUT_PORTS_START( cashquiz )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("P1 - A")
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Select")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("P1 - B")
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
@@ -348,7 +348,7 @@ static INPUT_PORTS_START( cashquiz )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 - B")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("P2 - C")
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -374,7 +374,7 @@ static INPUT_PORTS_START( cashquiz )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -400,7 +400,7 @@ static INPUT_PORTS_START( cashquiz )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c
index 5e0ded90869..c8427f747ea 100644
--- a/src/mame/drivers/pipedrm.c
+++ b/src/mame/drivers/pipedrm.c
@@ -293,7 +293,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( pipedrm )
- PORT_START /* $20 */
+ PORT_START("P1") /* $20 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -303,7 +303,7 @@ static INPUT_PORTS_START( pipedrm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* $21 */
+ PORT_START("P2") /* $21 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -313,7 +313,7 @@ static INPUT_PORTS_START( pipedrm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* $22 */
+ PORT_START("DSW1") /* $22 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ))
PORT_DIPSETTING( 0x06, DEF_STR( 5C_1C ))
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ))
@@ -349,7 +349,7 @@ static INPUT_PORTS_START( pipedrm )
PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ))
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ))
- PORT_START /* $23 */
+ PORT_START("DSW2") /* $23 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ))
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -371,7 +371,7 @@ static INPUT_PORTS_START( pipedrm )
PORT_DIPSETTING( 0x40, DEF_STR( On ))
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START /* $24 */
+ PORT_START("SYSTEM") /* $24 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -384,7 +384,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( hatris )
- PORT_START /* $20 */
+ PORT_START("P1") /* $20 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -394,7 +394,7 @@ static INPUT_PORTS_START( hatris )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* $21 */
+ PORT_START("P2") /* $21 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -404,7 +404,7 @@ static INPUT_PORTS_START( hatris )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* $22 */
+ PORT_START("DSW1") /* $22 */
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ))
PORT_DIPSETTING( 0x09, DEF_STR( 5C_1C ))
PORT_DIPSETTING( 0x08, DEF_STR( 4C_1C ))
@@ -440,7 +440,7 @@ static INPUT_PORTS_START( hatris )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_5C ))
PORT_DIPSETTING( 0x50, DEF_STR( 1C_6C ))
- PORT_START /* $23 */
+ PORT_START("DSW2") /* $23 */
PORT_DIPNAME( 0x03, 0x00, "Difficulty 1" )
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x00, DEF_STR( Normal ) )
@@ -460,7 +460,7 @@ static INPUT_PORTS_START( hatris )
PORT_DIPSETTING( 0x00, DEF_STR( On ))
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* $24 */
+ PORT_START("SYSTEM") /* $24 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c
index ab14e67d2c3..7fb11cfa70d 100644
--- a/src/mame/drivers/pipeline.c
+++ b/src/mame/drivers/pipeline.c
@@ -104,7 +104,7 @@ static VIDEO_UPDATE ( pipeline)
static INPUT_PORTS_START( pipeline )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -114,7 +114,7 @@ static INPUT_PORTS_START( pipeline )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -140,7 +140,7 @@ static INPUT_PORTS_START( pipeline )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c
index 7cc987bd873..13b45ccf664 100644
--- a/src/mame/drivers/pirates.c
+++ b/src/mame/drivers/pirates.c
@@ -210,7 +210,7 @@ ADDRESS_MAP_END
/* Input Ports */
static INPUT_PORTS_START( pirates )
- PORT_START_TAG("IN0") /* IN0 - 0x300000.w */
+ PORT_START("IN0") /* IN0 - 0x300000.w */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -228,7 +228,7 @@ static INPUT_PORTS_START( pirates )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1") /* IN1 - 0x400000.w */
+ PORT_START("IN1") /* IN1 - 0x400000.w */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
diff --git a/src/mame/drivers/pitnrun.c b/src/mame/drivers/pitnrun.c
index f8985ddc7d4..5b89a22ae8b 100644
--- a/src/mame/drivers/pitnrun.c
+++ b/src/mame/drivers/pitnrun.c
@@ -174,7 +174,7 @@ static ADDRESS_MAP_START( mcu_writemem, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( pitnrun )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -184,7 +184,7 @@ static INPUT_PORTS_START( pitnrun )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x07, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -206,7 +206,7 @@ static INPUT_PORTS_START( pitnrun )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c
index 6ece67a4b04..0b661592846 100644
--- a/src/mame/drivers/pkscram.c
+++ b/src/mame/drivers/pkscram.c
@@ -118,7 +118,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( pkscramble )
- PORT_START /* Dips */
+ PORT_START("DSW") /* Dips */
PORT_DIPNAME( 0x0007, 0x0003, "Level" )
PORT_DIPSETTING( 0x0000, "0" )
PORT_DIPSETTING( 0x0001, "1" )
@@ -166,7 +166,7 @@ static INPUT_PORTS_START( pkscramble )
PORT_DIPSETTING( 0x4000, DEF_STR( On ) )
PORT_SERVICE( 0x8000, IP_ACTIVE_HIGH )
- PORT_START /* 16bit */
+ PORT_START("INPUTS") /* 16bit */
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_BUTTON1 ) // Kick
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_BUTTON2 ) // Left
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_BUTTON3 ) // Center
diff --git a/src/mame/drivers/pktgaldx.c b/src/mame/drivers/pktgaldx.c
index 29e91f8b5cd..2f27377b7db 100644
--- a/src/mame/drivers/pktgaldx.c
+++ b/src/mame/drivers/pktgaldx.c
@@ -205,7 +205,7 @@ ADDRESS_MAP_END
/**********************************************************************************/
static INPUT_PORTS_START( pktgaldx )
- PORT_START_TAG("IN0") /* 16bit */
+ PORT_START("IN0") /* 16bit */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -216,7 +216,7 @@ static INPUT_PORTS_START( pktgaldx )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") /* 16bit */
+ PORT_START("DSW") /* 16bit */
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) )
@@ -264,7 +264,7 @@ static INPUT_PORTS_START( pktgaldx )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN1") /* 16bit */
+ PORT_START("IN1") /* 16bit */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
diff --git a/src/mame/drivers/playch10.c b/src/mame/drivers/playch10.c
index c9ac14d06b8..307a25a5ff0 100644
--- a/src/mame/drivers/playch10.c
+++ b/src/mame/drivers/playch10.c
@@ -419,7 +419,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( playch10 )
- PORT_START_TAG("BIOS")
+ PORT_START("BIOS")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Channel Select") PORT_CODE(KEYCODE_0)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Enter") PORT_CODE(KEYCODE_MINUS)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Reset") PORT_CODE(KEYCODE_EQUALS)
@@ -436,7 +436,7 @@ static INPUT_PORTS_START( playch10 )
implementation in MAME.
- PORT_START_TAG("SW1")
+ PORT_START("SW1")
PORT_DIPNAME( 0x3f, 0x09, "Prime Time Bonus" )
// STANDARD TIME (no bonus)
PORT_DIPSETTING( 0x00, "0%" ) PORT_CONDITION("SW2", 0xc0, PORTCOND_EQUALS, 0xc0 )
@@ -472,7 +472,7 @@ static INPUT_PORTS_START( playch10 )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_HIGH )
- PORT_START_TAG("SW2")
+ PORT_START("SW2")
PORT_DIPNAME( 0x3f, 0x28, "Play Time/Coin" )
// STANDARD TIME (no bonus)
PORT_DIPSETTING( 0x3f, DEF_STR( Free_Play ) ) PORT_CONDITION("SW2", 0xc0, PORTCOND_EQUALS, 0x80 )
@@ -528,7 +528,7 @@ static INPUT_PORTS_START( playch10 )
PORT_DIPSETTING( 0x80, "Prime Time for 2 Coins" )
PORT_DIPSETTING( 0x00, "Prime Time for 4 Coins" )
*/
- PORT_START_TAG("SW1")
+ PORT_START("SW1")
PORT_DIPNAME( 0x3f, 0x00, "Units of time (coin A/coin B)" )
PORT_DIPSETTING( 0x00, "300/0" )
PORT_DIPSETTING( 0x01, "300/100" )
@@ -599,7 +599,7 @@ static INPUT_PORTS_START( playch10 )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_HIGH )
- PORT_START_TAG("SW2")
+ PORT_START("SW2")
PORT_DIPNAME( 0x40, 0x00, "Coin Mode" )
PORT_DIPSETTING( 0x00, "Mode 1" )
PORT_DIPSETTING( 0x40, "Mode 2" )
@@ -618,7 +618,7 @@ static INPUT_PORTS_START( playch10 )
PORT_DIPSETTING( 0x00, "1 unit every 4 seconds" )
PORT_DIPSETTING( 0x80, DEF_STR( Free_Play ) )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("P1 Button B")
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("P1 Button A")
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START2 ) PORT_NAME("Game Select")
@@ -628,7 +628,7 @@ static INPUT_PORTS_START( playch10 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("P2 Button A") PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("P2 Button B") PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED ) // wired to 1p select button
@@ -643,10 +643,10 @@ INPUT_PORTS_END
static INPUT_PORTS_START( playc10g )
PORT_INCLUDE(playch10)
- PORT_START_TAG("GUNX") /* IN2 - FAKE - Gun X pos */
+ PORT_START("GUNX") /* IN2 - FAKE - Gun X pos */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(30)
- PORT_START_TAG("GUNY") /* IN3 - FAKE - Gun Y pos */
+ PORT_START("GUNY") /* IN3 - FAKE - Gun Y pos */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(30)
INPUT_PORTS_END
diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c
index 65f786bb4ba..bc772daf650 100644
--- a/src/mame/drivers/playmark.c
+++ b/src/mame/drivers/playmark.c
@@ -395,7 +395,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( bigtwin )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -405,7 +405,7 @@ static INPUT_PORTS_START( bigtwin )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -415,7 +415,7 @@ static INPUT_PORTS_START( bigtwin )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -425,7 +425,7 @@ static INPUT_PORTS_START( bigtwin )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Language ) )
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
PORT_DIPSETTING( 0x01, DEF_STR( Italian ) )
@@ -451,7 +451,7 @@ static INPUT_PORTS_START( bigtwin )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, "Coin Mode" )
PORT_DIPSETTING( 0x01, "Mode 1" )
PORT_DIPSETTING( 0x00, "Mode 2" )
@@ -494,7 +494,7 @@ static INPUT_PORTS_START( bigtwin )
INPUT_PORTS_END
static INPUT_PORTS_START( wbeachvl )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -504,7 +504,7 @@ static INPUT_PORTS_START( wbeachvl )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* ?? see code at 746a. sound status? */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -514,7 +514,7 @@ static INPUT_PORTS_START( wbeachvl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -524,7 +524,7 @@ static INPUT_PORTS_START( wbeachvl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -534,7 +534,7 @@ static INPUT_PORTS_START( wbeachvl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START_TAG("P4")
+ PORT_START("P4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
@@ -546,7 +546,7 @@ static INPUT_PORTS_START( wbeachvl )
INPUT_PORTS_END
static INPUT_PORTS_START( excelsr )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -556,7 +556,7 @@ static INPUT_PORTS_START( excelsr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -566,7 +566,7 @@ static INPUT_PORTS_START( excelsr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -576,7 +576,7 @@ static INPUT_PORTS_START( excelsr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -599,7 +599,7 @@ static INPUT_PORTS_START( excelsr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, "Coin Mode" )
PORT_DIPSETTING( 0x01, "Mode 1" )
PORT_DIPSETTING( 0x00, "Mode 2" )
@@ -640,7 +640,7 @@ static INPUT_PORTS_START( excelsr )
INPUT_PORTS_END
static INPUT_PORTS_START( hotmind )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -650,7 +650,7 @@ static INPUT_PORTS_START( hotmind )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -660,7 +660,7 @@ static INPUT_PORTS_START( hotmind )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -670,7 +670,7 @@ static INPUT_PORTS_START( hotmind )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM data */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x00, "Very Hard 5" )
PORT_DIPSETTING( 0x01, "Very Hard 4" )
@@ -694,7 +694,7 @@ static INPUT_PORTS_START( hotmind )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, "Coin Mode" )
PORT_DIPSETTING( 0x01, "Mode 1" )
PORT_DIPSETTING( 0x00, "Mode 2" )
@@ -737,7 +737,7 @@ static INPUT_PORTS_START( hotmind )
INPUT_PORTS_END
static INPUT_PORTS_START( hrdtimes )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -747,7 +747,7 @@ static INPUT_PORTS_START( hrdtimes )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -757,7 +757,7 @@ static INPUT_PORTS_START( hrdtimes )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -767,7 +767,7 @@ static INPUT_PORTS_START( hrdtimes )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -790,7 +790,7 @@ static INPUT_PORTS_START( hrdtimes )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, "Coin Mode" )
PORT_DIPSETTING( 0x01, "Mode 1" )
PORT_DIPSETTING( 0x00, "Mode 2" )
diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c
index 5ad5f1e47b1..fcb0d781fa4 100644
--- a/src/mame/drivers/plygonet.c
+++ b/src/mame/drivers/plygonet.c
@@ -512,7 +512,7 @@ static MACHINE_DRIVER_START( plygonet )
MACHINE_DRIVER_END
static INPUT_PORTS_START( polygonet )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1)
PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2)
@@ -522,7 +522,7 @@ static INPUT_PORTS_START( polygonet )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -532,7 +532,7 @@ static INPUT_PORTS_START( polygonet )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM ready (always 1) */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -544,7 +544,7 @@ static INPUT_PORTS_START( polygonet )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -554,7 +554,7 @@ static INPUT_PORTS_START( polygonet )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/pmpoker.c b/src/mame/drivers/pmpoker.c
index cad77a8d4fa..7e8ede90f89 100644
--- a/src/mame/drivers/pmpoker.c
+++ b/src/mame/drivers/pmpoker.c
@@ -496,7 +496,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( pmpoker )
/* Multiplexed - 4x5bits */
- PORT_START_TAG("IN0-0")
+ PORT_START("IN0-0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Meters") PORT_CODE(KEYCODE_9)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -506,7 +506,7 @@ static INPUT_PORTS_START( pmpoker )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0-1")
+ PORT_START("IN0-1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_IMPULSE(3) PORT_NAME("Out (Manual Collect)") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Payout") PORT_CODE(KEYCODE_W)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -516,7 +516,7 @@ static INPUT_PORTS_START( pmpoker )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0-2")
+ PORT_START("IN0-2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Hold1 / Take Score (Kasse)") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Hold2 / Small (Tief)") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Hold3 / Bet (Setze)") PORT_CODE(KEYCODE_C)
@@ -526,7 +526,7 @@ static INPUT_PORTS_START( pmpoker )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0-3")
+ PORT_START("IN0-3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Settings") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(3) PORT_NAME("Note 1 In")
@@ -536,7 +536,7 @@ static INPUT_PORTS_START( pmpoker )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SW1")
+ PORT_START("SW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -565,7 +565,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( goldnpkr )
/* Multiplexed - 4x5bits */
- PORT_START_TAG("IN0-0")
+ PORT_START("IN0-0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Bet") PORT_CODE(KEYCODE_1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Meters") PORT_CODE(KEYCODE_9)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_NAME("Double Up") PORT_CODE(KEYCODE_3)
@@ -575,7 +575,7 @@ static INPUT_PORTS_START( goldnpkr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0-1")
+ PORT_START("IN0-1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON13 ) PORT_IMPULSE(3) PORT_NAME("Out (Manual Collect)") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON14 ) PORT_NAME("Off (Payout)") PORT_CODE(KEYCODE_W)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON10 ) PORT_NAME("Take") PORT_CODE(KEYCODE_4)
@@ -585,7 +585,7 @@ static INPUT_PORTS_START( goldnpkr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0-2")
+ PORT_START("IN0-2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Hold1") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Hold2") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Hold3") PORT_CODE(KEYCODE_C)
@@ -595,7 +595,7 @@ static INPUT_PORTS_START( goldnpkr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0-3")
+ PORT_START("IN0-3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Learn Mode") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("D-31") PORT_CODE(KEYCODE_E) /* O.A.R? (D-31 in schematics) */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_NAME("Coupon (Note In)")
@@ -605,7 +605,7 @@ static INPUT_PORTS_START( goldnpkr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SW1")
+ PORT_START("SW1")
/* only bits 4-7 are connected here and were routed to SW1 1-4 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -627,7 +627,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( goldnpkc )
/* Multiplexed - 4x5bits */
- PORT_START_TAG("IN0-0")
+ PORT_START("IN0-0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Bet") PORT_CODE(KEYCODE_1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Meters") PORT_CODE(KEYCODE_9)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -637,7 +637,7 @@ static INPUT_PORTS_START( goldnpkc )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0-1")
+ PORT_START("IN0-1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_IMPULSE(3) PORT_NAME("Out (Manual Collect)") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON10 ) PORT_NAME("Off (Payout)") PORT_CODE(KEYCODE_W)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -647,7 +647,7 @@ static INPUT_PORTS_START( goldnpkc )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0-2")
+ PORT_START("IN0-2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Hold1") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Hold2") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Hold3") PORT_CODE(KEYCODE_C)
@@ -657,7 +657,7 @@ static INPUT_PORTS_START( goldnpkc )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0-3")
+ PORT_START("IN0-3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Learn Mode") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_NAME("Coupon (Note In)")
@@ -667,7 +667,7 @@ static INPUT_PORTS_START( goldnpkc )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SW1")
+ PORT_START("SW1")
/* only bits 4-7 are connected here and were routed to SW1 1-4 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
@@ -697,7 +697,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( jokerpkr )
/* Multiplexed - 4x5bits */
- PORT_START_TAG("IN0-0")
+ PORT_START("IN0-0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(3) PORT_NAME("Coin 1")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Meters") PORT_CODE(KEYCODE_9)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -707,7 +707,7 @@ static INPUT_PORTS_START( jokerpkr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0-1")
+ PORT_START("IN0-1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_IMPULSE(3) PORT_NAME("Out (Manual Collect)") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON10 ) PORT_NAME("Off (Payout)") PORT_CODE(KEYCODE_W)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -717,7 +717,7 @@ static INPUT_PORTS_START( jokerpkr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0-2")
+ PORT_START("IN0-2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Hold1") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Hold2") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Hold3") PORT_CODE(KEYCODE_C)
@@ -727,7 +727,7 @@ static INPUT_PORTS_START( jokerpkr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0-3")
+ PORT_START("IN0-3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Settings") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_NAME("Note in")
@@ -737,7 +737,7 @@ static INPUT_PORTS_START( jokerpkr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SW1")
+ PORT_START("SW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -766,7 +766,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( pottnpkr )
/* Multiplexed - 4x5bits */
- PORT_START_TAG("IN0-0")
+ PORT_START("IN0-0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(3) PORT_NAME("Coin 1")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Meters") PORT_CODE(KEYCODE_9)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -776,7 +776,7 @@ static INPUT_PORTS_START( pottnpkr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0-1")
+ PORT_START("IN0-1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_IMPULSE(3) PORT_NAME("Out (Manual Collect)") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON10 ) PORT_NAME("Off (Payout)") PORT_CODE(KEYCODE_W)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -786,7 +786,7 @@ static INPUT_PORTS_START( pottnpkr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0-2")
+ PORT_START("IN0-2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Hold1") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Hold2") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Hold3") PORT_CODE(KEYCODE_C)
@@ -796,7 +796,7 @@ static INPUT_PORTS_START( pottnpkr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0-3")
+ PORT_START("IN0-3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Settings") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_NAME("Note in")
@@ -806,7 +806,7 @@ static INPUT_PORTS_START( pottnpkr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SW1")
+ PORT_START("SW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c
index 87373c3c85b..717a19cf067 100644
--- a/src/mame/drivers/pntnpuzl.c
+++ b/src/mame/drivers/pntnpuzl.c
@@ -420,7 +420,7 @@ static INTERRUPT_GEN( pntnpuzl_irq )
}
static INPUT_PORTS_START( pntnpuzl )
- PORT_START_TAG("IN0") /* fake inputs */
+ PORT_START("IN0") /* fake inputs */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_HIGH ) PORT_IMPULSE(1)
@@ -428,17 +428,17 @@ static INPUT_PORTS_START( pntnpuzl )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 )
/* game uses a touch screen */
- PORT_START_TAG("TOUCHX")
+ PORT_START("TOUCHX")
PORT_BIT( 0x7f, 0x40, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX(0,0x7f) PORT_SENSITIVITY(25) PORT_KEYDELTA(13)
- PORT_START_TAG("TOUCHY")
+ PORT_START("TOUCHY")
PORT_BIT( 0x7f, 0x40, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(Y, -1.0, 0.0, 0) PORT_MINMAX(0,0x7f) PORT_SENSITIVITY(25) PORT_KEYDELTA(13)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_S)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_A)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_B)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_V)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_C)
diff --git a/src/mame/drivers/pokechmp.c b/src/mame/drivers/pokechmp.c
index 1b974eaa619..93ecfc324b4 100644
--- a/src/mame/drivers/pokechmp.c
+++ b/src/mame/drivers/pokechmp.c
@@ -166,7 +166,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( pokechmp )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -176,7 +176,7 @@ static INPUT_PORTS_START( pokechmp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -186,7 +186,7 @@ static INPUT_PORTS_START( pokechmp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START /* Dip switch */
+ PORT_START("DSW") /* Dip switch */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c
index 713a2f87d95..79f16b283c6 100644
--- a/src/mame/drivers/polepos.c
+++ b/src/mame/drivers/polepos.c
@@ -443,7 +443,7 @@ ADDRESS_MAP_END
*********************************************************************/
static INPUT_PORTS_START( polepos )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Gear Change") PORT_CODE(KEYCODE_SPACE) POLEPOS_TOGGLE /* Gear */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) // start 1, program controlled
@@ -453,7 +453,7 @@ static INPUT_PORTS_START( polepos )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
@@ -477,7 +477,7 @@ static INPUT_PORTS_START( polepos )
PORT_DIPSETTING( 0x80, "3" )
PORT_DIPSETTING( 0x00, "4" )
- PORT_START_TAG("DSWB") /* DSW B */
+ PORT_START("DSWB") /* DSW B */
PORT_DIPNAME( 0x07, 0x07, "Extended Rank" )
PORT_DIPSETTING( 0x07, "A" )
PORT_DIPSETTING( 0x03, "B" )
@@ -503,19 +503,19 @@ static INPUT_PORTS_START( polepos )
PORT_DIPSETTING( 0x80, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("BRAKE") /* IN1 - Brake */
+ PORT_START("BRAKE") /* IN1 - Brake */
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0,0x90) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
- PORT_START_TAG("ACCEL") /* IN2 - Accel */
+ PORT_START("ACCEL") /* IN2 - Accel */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0,0x90) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
- PORT_START_TAG("STEER") /* IN3 - Steering */
+ PORT_START("STEER") /* IN3 - Steering */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(4)
INPUT_PORTS_END
static INPUT_PORTS_START( poleposa )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Gear Change") PORT_CODE(KEYCODE_SPACE) POLEPOS_TOGGLE /* Gear */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) // start 1, program controlled
@@ -525,7 +525,7 @@ static INPUT_PORTS_START( poleposa )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0xe0, 0xe0, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0xc0, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x20, DEF_STR( 2C_1C ) )
@@ -549,7 +549,7 @@ static INPUT_PORTS_START( poleposa )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "4" )
- PORT_START_TAG("DSWB") /* DSW B */
+ PORT_START("DSWB") /* DSW B */
PORT_DIPNAME( 0xe0, 0xe0, "Practice Rank" )
PORT_DIPSETTING( 0xe0, "A" )
PORT_DIPSETTING( 0x60, "B" )
@@ -575,20 +575,20 @@ static INPUT_PORTS_START( poleposa )
PORT_DIPSETTING( 0x01, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("BRAKE") /* IN1 - Brake */
+ PORT_START("BRAKE") /* IN1 - Brake */
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0,0x90) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
- PORT_START_TAG("ACCEL") /* IN2 - Accel */
+ PORT_START("ACCEL") /* IN2 - Accel */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0,0x90) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
- PORT_START_TAG("STEER") /* IN3 - Steering */
+ PORT_START("STEER") /* IN3 - Steering */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(4)
INPUT_PORTS_END
static INPUT_PORTS_START( topracra )
// no coins ?!
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) // start 1, program controlled
@@ -597,7 +597,7 @@ static INPUT_PORTS_START( topracra )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
@@ -621,7 +621,7 @@ static INPUT_PORTS_START( topracra )
PORT_DIPSETTING( 0x80, "3" )
PORT_DIPSETTING( 0x00, "4" )
- PORT_START_TAG("DSWB") /* DSW B */
+ PORT_START("DSWB") /* DSW B */
PORT_DIPNAME( 0x07, 0x07, "Extended Rank" )
PORT_DIPSETTING( 0x07, "A" )
PORT_DIPSETTING( 0x03, "B" )
@@ -647,19 +647,19 @@ static INPUT_PORTS_START( topracra )
PORT_DIPSETTING( 0x80, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("BRAKE") /* IN1 - Brake */
+ PORT_START("BRAKE") /* IN1 - Brake */
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0,0x90) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
- PORT_START_TAG("ACCEL") /* IN2 - Accel */
+ PORT_START("ACCEL") /* IN2 - Accel */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0,0x90) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
- PORT_START_TAG("STEER") /* IN3 - Steering */
+ PORT_START("STEER") /* IN3 - Steering */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(4)
INPUT_PORTS_END
static INPUT_PORTS_START( polepos2 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Gear Change") PORT_CODE(KEYCODE_SPACE) POLEPOS_TOGGLE /* Gear */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) // start 1, program controlled
@@ -669,7 +669,7 @@ static INPUT_PORTS_START( polepos2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0xe0, 0xe0, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0xc0, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x20, DEF_STR( 2C_1C ) )
@@ -694,7 +694,7 @@ static INPUT_PORTS_START( polepos2 )
PORT_DIPSETTING( 0x01, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* DSW B */
+ PORT_START("DSWB") /* DSW B */
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Game_Time ) )
PORT_DIPSETTING( 0x80, "90 secs." )
PORT_DIPSETTING( 0x00, "120 secs." )
@@ -717,13 +717,13 @@ static INPUT_PORTS_START( polepos2 )
PORT_DIPSETTING( 0x01, "Average" )
PORT_DIPSETTING( 0x00, DEF_STR( High ) )
- PORT_START_TAG("BRAKE") /* IN1 - Brake */
+ PORT_START("BRAKE") /* IN1 - Brake */
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0,0x90) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
- PORT_START_TAG("ACCEL") /* IN2 - Accel */
+ PORT_START("ACCEL") /* IN2 - Accel */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0,0x90) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
- PORT_START_TAG("STEER") /* IN3 - Steering */
+ PORT_START("STEER") /* IN3 - Steering */
PORT_BIT ( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(4)
INPUT_PORTS_END
diff --git a/src/mame/drivers/policetr.c b/src/mame/drivers/policetr.c
index 5df6183cbba..8a6c7867b76 100644
--- a/src/mame/drivers/policetr.c
+++ b/src/mame/drivers/policetr.c
@@ -346,7 +346,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( policetr )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -364,7 +364,7 @@ static INPUT_PORTS_START( policetr )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -382,7 +382,7 @@ static INPUT_PORTS_START( policetr )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW1:1" )
PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "SW1:2" )
PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "SW1:3" )
@@ -397,16 +397,16 @@ static INPUT_PORTS_START( policetr )
PORT_DIPSETTING( 0x80, DEF_STR( On )) /* Will invert the Y axis of guns */
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("GUNX1") /* fake analog X */
+ PORT_START("GUNX1") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.012, 0.008, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("GUNY1") /* fake analog Y */
+ PORT_START("GUNY1") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.05, 0.002, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10)
- PORT_START_TAG("GUNX2") /* fake analog X */
+ PORT_START("GUNX2") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.012, 0.008, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("GUNY2") /* fake analog Y */
+ PORT_START("GUNY2") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.05, 0.002, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) PORT_PLAYER(2)
INPUT_PORTS_END
diff --git a/src/mame/drivers/polyplay.c b/src/mame/drivers/polyplay.c
index da4e12e4c1a..8f9b2a92477 100644
--- a/src/mame/drivers/polyplay.c
+++ b/src/mame/drivers/polyplay.c
@@ -181,7 +181,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( polyplay )
- PORT_START_TAG("INPUT") /* IN0 */
+ PORT_START("INPUT") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
diff --git a/src/mame/drivers/poolshrk.c b/src/mame/drivers/poolshrk.c
index 9f50356e6fd..9c4261d61cf 100644
--- a/src/mame/drivers/poolshrk.c
+++ b/src/mame/drivers/poolshrk.c
@@ -117,16 +117,16 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( poolshrk )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0C, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0C, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_DIPNAME( 0x80, 0x00, "Extended Play" )
PORT_DIPSETTING( 0x80, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ))
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x03, 0x02, "Racks Per Game" )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -136,7 +136,7 @@ static INPUT_PORTS_START( poolshrk )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ))
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ))
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ))
@@ -147,16 +147,16 @@ static INPUT_PORTS_START( poolshrk )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("AN0")
+ PORT_START("AN0")
PORT_BIT( 15, 8, IPT_AD_STICK_X ) PORT_MINMAX(0,15) PORT_SENSITIVITY(25) PORT_KEYDELTA(1) PORT_PLAYER(1)
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 15, 8, IPT_AD_STICK_X ) PORT_MINMAX(0,15) PORT_SENSITIVITY(25) PORT_KEYDELTA(1) PORT_PLAYER(2)
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 15, 8, IPT_AD_STICK_Y ) PORT_MINMAX(0,15) PORT_SENSITIVITY(25) PORT_KEYDELTA(1) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("AN3")
+ PORT_START("AN3")
PORT_BIT( 15, 8, IPT_AD_STICK_Y ) PORT_MINMAX(0,15) PORT_SENSITIVITY(25) PORT_KEYDELTA(1) PORT_REVERSE PORT_PLAYER(2)
INPUT_PORTS_END
diff --git a/src/mame/drivers/pooyan.c b/src/mame/drivers/pooyan.c
index 8bf5f5ba23e..dc5eddae2a2 100644
--- a/src/mame/drivers/pooyan.c
+++ b/src/mame/drivers/pooyan.c
@@ -83,7 +83,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( pooyan )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -91,21 +91,21 @@ static INPUT_PORTS_START( pooyan )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x03, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_2WAY
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_2WAY
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x03, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -140,7 +140,7 @@ static INPUT_PORTS_START( pooyan )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
diff --git a/src/mame/drivers/popeye.c b/src/mame/drivers/popeye.c
index f337072c82d..5ce3f5773e4 100644
--- a/src/mame/drivers/popeye.c
+++ b/src/mame/drivers/popeye.c
@@ -163,7 +163,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( skyskipr )
- PORT_START_TAG("P1") /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -173,7 +173,7 @@ static INPUT_PORTS_START( skyskipr )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON2 )
- PORT_START_TAG("P2") /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -183,7 +183,7 @@ static INPUT_PORTS_START( skyskipr )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_START_TAG("IN0") /* IN2 */
+ PORT_START("IN0") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -193,7 +193,7 @@ static INPUT_PORTS_START( skyskipr )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, "A 3/1 B 1/2" )
PORT_DIPSETTING( 0x0e, DEF_STR( 2C_1C ) )
@@ -222,7 +222,7 @@ static INPUT_PORTS_START( skyskipr )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* scans DSW1 one bit at a time */
- PORT_START_TAG("DSW1") /* DSW1 (FAKE - appears as bit 7 of DSW0, see code below) */
+ PORT_START("DSW1") /* DSW1 (FAKE - appears as bit 7 of DSW0, see code below) */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -248,7 +248,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( popeye )
- PORT_START_TAG("P1") /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -258,7 +258,7 @@ static INPUT_PORTS_START( popeye )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("P2") /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
@@ -268,7 +268,7 @@ static INPUT_PORTS_START( popeye )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("IN0") /* IN2 */
+ PORT_START("IN0") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -278,7 +278,7 @@ static INPUT_PORTS_START( popeye )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, "A 3/1 B 1/2" )
PORT_DIPSETTING( 0x0e, DEF_STR( 2C_1C ) )
@@ -306,7 +306,7 @@ static INPUT_PORTS_START( popeye )
// PORT_DIPSETTING( 0x00, "Nintendo of America" )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* scans DSW1 one bit at a time */
- PORT_START_TAG("DSW1") /* DSW1 (FAKE - appears as bit 7 of DSW0, see code below) */
+ PORT_START("DSW1") /* DSW1 (FAKE - appears as bit 7 of DSW0, see code below) */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -332,7 +332,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( popeyef )
- PORT_START_TAG("P1") /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -342,7 +342,7 @@ static INPUT_PORTS_START( popeyef )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("P2") /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
@@ -352,7 +352,7 @@ static INPUT_PORTS_START( popeyef )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("IN0") /* IN2 */
+ PORT_START("IN0") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -362,7 +362,7 @@ static INPUT_PORTS_START( popeyef )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, "A 3/1 B 1/2" )
PORT_DIPSETTING( 0x0e, DEF_STR( 2C_1C ) )
@@ -390,7 +390,7 @@ static INPUT_PORTS_START( popeyef )
// PORT_DIPSETTING( 0x00, "Nintendo of America" )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* scans DSW1 one bit at a time */
- PORT_START_TAG("DSW1") /* DSW1 (FAKE - appears as bit 7 of DSW0, see code below) */
+ PORT_START("DSW1") /* DSW1 (FAKE - appears as bit 7 of DSW0, see code below) */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
diff --git a/src/mame/drivers/popper.c b/src/mame/drivers/popper.c
index 8f569f47b4c..71f8ef24870 100644
--- a/src/mame/drivers/popper.c
+++ b/src/mame/drivers/popper.c
@@ -208,30 +208,30 @@ static ADDRESS_MAP_START( popper_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( popper )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 ) //ignored if held for 12 or more frames
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SERVICE1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN2 ) //ignored if held for 12 or more frames
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("DSW1") /* FAKE DSW1 */
+ PORT_START("DSW1") /* FAKE DSW1 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) ) //SW1:1-2
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -253,7 +253,7 @@ static INPUT_PORTS_START( popper )
PORT_DIPSETTING( 0x80, "40k, then every 70k" )
PORT_DIPSETTING( 0xc0, "50k, then every 70k" )
- PORT_START_TAG("DSW2") /* FAKE DSW2 */
+ PORT_START("DSW2") /* FAKE DSW2 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Demo_Sounds ) ) //SW2:1
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
diff --git a/src/mame/drivers/portrait.c b/src/mame/drivers/portrait.c
index 5f5f7159404..74d7cb1440d 100644
--- a/src/mame/drivers/portrait.c
+++ b/src/mame/drivers/portrait.c
@@ -148,7 +148,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( portrait )
- PORT_START /* DSW 1 */
+ PORT_START("DSW1") /* DSW 1 */
PORT_DIPNAME( 0x0f, 0x08, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x08, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x09, DEF_STR( 1C_2C ) )
@@ -179,7 +179,7 @@ static INPUT_PORTS_START( portrait )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
- PORT_START /* DSW 2 */
+ PORT_START("DSW2") /* DSW 2 */
PORT_DIPNAME( 0x01, 0x00, "Game Play" )
PORT_DIPSETTING( 0x00, "Normal Play" )
PORT_DIPSETTING( 0x01, "Freeplay (255 Cameras)" )
@@ -203,7 +203,7 @@ static INPUT_PORTS_START( portrait )
PORT_DIPSETTING( 0x80, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
- PORT_START /* IN 0 */
+ PORT_START("SYSTEM") /* IN 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_IMPULSE(2)
@@ -215,7 +215,7 @@ static INPUT_PORTS_START( portrait )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN 1 */
+ PORT_START("INPUTS") /* IN 1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c
index 57a270421e3..85f222ac6c4 100644
--- a/src/mame/drivers/powerbal.c
+++ b/src/mame/drivers/powerbal.c
@@ -147,7 +147,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( powerbal )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -157,7 +157,7 @@ static INPUT_PORTS_START( powerbal )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -167,7 +167,7 @@ static INPUT_PORTS_START( powerbal )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -177,7 +177,7 @@ static INPUT_PORTS_START( powerbal )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Free_Play ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -203,7 +203,7 @@ static INPUT_PORTS_START( powerbal )
PORT_DIPSETTING( 0x60, DEF_STR( 1C_5C ) )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_6C ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -229,7 +229,7 @@ static INPUT_PORTS_START( powerbal )
INPUT_PORTS_END
static INPUT_PORTS_START( magicstk )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -239,7 +239,7 @@ static INPUT_PORTS_START( magicstk )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -249,7 +249,7 @@ static INPUT_PORTS_START( magicstk )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM data */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -259,7 +259,7 @@ static INPUT_PORTS_START( magicstk )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "Coin Mode" )
PORT_DIPSETTING( 0x01, "Mode 1" )
PORT_DIPSETTING( 0x00, "Mode 2" )
@@ -300,7 +300,7 @@ static INPUT_PORTS_START( magicstk )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, "Clear Counters" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/powerins.c b/src/mame/drivers/powerins.c
index 26c7449bfae..8ea9b9633c8 100644
--- a/src/mame/drivers/powerins.c
+++ b/src/mame/drivers/powerins.c
@@ -157,7 +157,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( powerins )
- PORT_START // IN0 - $100000 - Coins
+ PORT_START("SYSTEM") // IN0 - $100000 - Coins
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -167,7 +167,7 @@ static INPUT_PORTS_START( powerins )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START // IN1 - $100002 - Player 1 & 2
+ PORT_START("P1_P2") // IN1 - $100002 - Player 1 & 2
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -186,7 +186,7 @@ static INPUT_PORTS_START( powerins )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_START_TAG("DSW1") // IN2 - $100008 - DSW 1
+ PORT_START("DSW1") // IN2 - $100008 - DSW 1
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -212,7 +212,7 @@ static INPUT_PORTS_START( powerins )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("DSW2") // IN3 - $10000a - DSW 2
+ PORT_START("DSW2") // IN3 - $10000a - DSW 2
PORT_DIPNAME( 0x0001, 0x0001, "Coin Chutes" ) PORT_DIPLOCATION("SW2:8")
PORT_DIPSETTING( 0x0001, "1 Chute" )
PORT_DIPSETTING( 0x0000, "2 Chutes" )
diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c
index d584745c1e5..64dbb9ce099 100644
--- a/src/mame/drivers/ppmast93.c
+++ b/src/mame/drivers/ppmast93.c
@@ -202,7 +202,7 @@ static ADDRESS_MAP_START( ppmast93_cpu2_io, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( ppmast93 )
- PORT_START /* 8bit */
+ PORT_START("P1") /* 8bit */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
@@ -212,7 +212,7 @@ static INPUT_PORTS_START( ppmast93 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) // nothing?
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START /* 8bit */
+ PORT_START("P2") /* 8bit */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
@@ -222,7 +222,7 @@ static INPUT_PORTS_START( ppmast93 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) // nothing?
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START /* 8bit */
+ PORT_START("SYSTEM") /* 8bit */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -232,7 +232,7 @@ static INPUT_PORTS_START( ppmast93 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) // or it always goes to test mode
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x01, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
@@ -268,7 +268,7 @@ static INPUT_PORTS_START( ppmast93 )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ) )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x00, DEF_STR( Very_Hard ) )
PORT_DIPSETTING( 0x01, DEF_STR( Hard ) )
diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c
index 6e963388ad7..04600a3f7a4 100644
--- a/src/mame/drivers/prehisle.c
+++ b/src/mame/drivers/prehisle.c
@@ -92,7 +92,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( prehisle )
- PORT_START_TAG("P1") /* Player 1 controls */
+ PORT_START("P1") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -102,7 +102,7 @@ static INPUT_PORTS_START( prehisle )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 controls */
+ PORT_START("P2") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -112,7 +112,7 @@ static INPUT_PORTS_START( prehisle )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("COIN") /* coin */
+ PORT_START("COIN") /* coin */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -120,7 +120,7 @@ static INPUT_PORTS_START( prehisle )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW0") /* Dip switches */
+ PORT_START("DSW0") /* Dip switches */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -144,7 +144,7 @@ static INPUT_PORTS_START( prehisle )
PORT_DIPSETTING( 0x40, "4" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Standard ) )
diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c
index a94a9b2cee5..fb24d52c619 100644
--- a/src/mame/drivers/progolf.c
+++ b/src/mame/drivers/progolf.c
@@ -85,7 +85,7 @@ ADDRESS_MAP_END
#endif
static INPUT_PORTS_START( progolf )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -95,10 +95,10 @@ static INPUT_PORTS_START( progolf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
/* */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c
index 0e7e885df9a..5bcd91fd116 100644
--- a/src/mame/drivers/psikyo.c
+++ b/src/mame/drivers/psikyo.c
@@ -542,12 +542,12 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( samuraia )
- PORT_START_TAG("IN0") // IN0 - c00000&1
+ PORT_START("IN0") // IN0 - c00000&1
PSIKYO_PORT_PLAYER2
PSIKYO_PORT_PLAYER1
- PORT_START_TAG("COIN") // IN1 - c00008&9
+ PORT_START("COIN") // IN1 - c00008&9
PSIKYO_PORT_COIN
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
@@ -559,7 +559,7 @@ static INPUT_PORTS_START( samuraia )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") // IN2 - c00004&5
+ PORT_START("DSW1") // IN2 - c00004&5
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -606,7 +606,7 @@ static INPUT_PORTS_START( samuraia )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, "On [Free Play]" ) // Forces 1C_1C
- PORT_START_TAG("DSW2") // IN3 - c00002&3
+ PORT_START("DSW2") // IN3 - c00002&3
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_VBLANK ) // vblank
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -625,7 +625,7 @@ static INPUT_PORTS_START( samuraia )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW3") // IN4 - c00006&7
+ PORT_START("DSW3") // IN4 - c00006&7
/***********************************************
@@ -661,12 +661,12 @@ INPUT_PORTS_END
static INPUT_PORTS_START( sngkace )
- PORT_START_TAG("IN0") // IN0 - c00000&1
+ PORT_START("IN0") // IN0 - c00000&1
PSIKYO_PORT_PLAYER2
PSIKYO_PORT_PLAYER1
- PORT_START_TAG("COIN") // IN1 - c00008&9
+ PORT_START("COIN") // IN1 - c00008&9
PSIKYO_PORT_COIN
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
@@ -678,7 +678,7 @@ static INPUT_PORTS_START( sngkace )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") // IN2 - c00004&5
+ PORT_START("DSW1") // IN2 - c00004&5
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -725,7 +725,7 @@ static INPUT_PORTS_START( sngkace )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, "On [Free Play]" ) // Forces 1C_1C
- PORT_START_TAG("DSW2") // IN3 - c00002&3
+ PORT_START("DSW2") // IN3 - c00002&3
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_VBLANK ) // vblank
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -744,7 +744,7 @@ static INPUT_PORTS_START( sngkace )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW3") // IN4 - c00006&7
+ PORT_START("DSW3") // IN4 - c00006&7
/***********************************************
@@ -786,12 +786,12 @@ INPUT_PORTS_END
static INPUT_PORTS_START( btlkroad )
- PORT_START_TAG("IN0") // IN0 - c00000&1
+ PORT_START("IN0") // IN0 - c00000&1
PSIKYO_PORT_PLAYER2
PSIKYO_PORT_PLAYER1
- PORT_START_TAG("COIN") // IN1 - c00002&3
+ PORT_START("COIN") // IN1 - c00002&3
PSIKYO_PORT_COIN
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -803,7 +803,7 @@ static INPUT_PORTS_START( btlkroad )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
- PORT_START_TAG("DSW1") // IN2 - c00004&5
+ PORT_START("DSW1") // IN2 - c00004&5
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -864,7 +864,7 @@ static INPUT_PORTS_START( btlkroad )
************************************************/
- PORT_START_TAG("DSW2") // IN3 - c00006&7
+ PORT_START("DSW2") // IN3 - c00006&7
PORT_DIPNAME( 0x000f, 0x0000, "Copyright (Country)" )
PORT_DIPSETTING( 0x000f, "Psikyo (Japan)" )
PORT_DIPSETTING( 0x000e, "Jaleco+Psikyo (USA & Canada)" )
@@ -913,12 +913,12 @@ INPUT_PORTS_END
static INPUT_PORTS_START( gunbird )
- PORT_START_TAG("IN0") // IN0 - c00000&1
+ PORT_START("IN0") // IN0 - c00000&1
PSIKYO_PORT_PLAYER2
PSIKYO_PORT_PLAYER1
- PORT_START_TAG("COIN") // IN1 - c00002&3
+ PORT_START("COIN") // IN1 - c00002&3
PSIKYO_PORT_COIN
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -930,7 +930,7 @@ static INPUT_PORTS_START( gunbird )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") // IN2 - c00004&5
+ PORT_START("DSW1") // IN2 - c00004&5
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -977,7 +977,7 @@ static INPUT_PORTS_START( gunbird )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, "On [Free Play]" ) // Forces 1C_1C
- PORT_START_TAG("DSW2") // IN3 - c00006&7
+ PORT_START("DSW2") // IN3 - c00006&7
/***********************************************
@@ -1023,12 +1023,12 @@ INPUT_PORTS_END
static INPUT_PORTS_START( gunbirdj )
- PORT_START_TAG("IN0") // IN0 - c00000&1
+ PORT_START("IN0") // IN0 - c00000&1
PSIKYO_PORT_PLAYER2
PSIKYO_PORT_PLAYER1
- PORT_START_TAG("COIN") // IN1 - c00002&3
+ PORT_START("COIN") // IN1 - c00002&3
PSIKYO_PORT_COIN
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1040,7 +1040,7 @@ static INPUT_PORTS_START( gunbirdj )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") // IN2 - c00004&5
+ PORT_START("DSW1") // IN2 - c00004&5
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1087,7 +1087,7 @@ static INPUT_PORTS_START( gunbirdj )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, "On [Free Play]" ) // Forces 1C_1C
- PORT_START_TAG("DSW2") // IN3 - c00006&7
+ PORT_START("DSW2") // IN3 - c00006&7
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1116,12 +1116,12 @@ INPUT_PORTS_END
static INPUT_PORTS_START( s1945 )
- PORT_START_TAG("IN0") // IN0 - c00000&1
+ PORT_START("IN0") // IN0 - c00000&1
PSIKYO_PORT_PLAYER2
PSIKYO_PORT_PLAYER1
- PORT_START_TAG("COIN") // IN1 - c00002&3
+ PORT_START("COIN") // IN1 - c00002&3
PSIKYO_PORT_COIN
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1133,7 +1133,7 @@ static INPUT_PORTS_START( s1945 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") // IN2 - c00004&5
+ PORT_START("DSW1") // IN2 - c00004&5
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1180,7 +1180,7 @@ static INPUT_PORTS_START( s1945 )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) // Forces 1C_1C
- PORT_START_TAG("DSW2") // IN3 - c00006&7
+ PORT_START("DSW2") // IN3 - c00006&7
/***********************************************
@@ -1227,12 +1227,12 @@ INPUT_PORTS_END
static INPUT_PORTS_START( s1945a )
- PORT_START_TAG("IN0") // IN0 - c00000&1
+ PORT_START("IN0") // IN0 - c00000&1
PSIKYO_PORT_PLAYER2
PSIKYO_PORT_PLAYER1
- PORT_START_TAG("COIN") // IN1 - c00002&3
+ PORT_START("COIN") // IN1 - c00002&3
PSIKYO_PORT_COIN
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1244,7 +1244,7 @@ static INPUT_PORTS_START( s1945a )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") // IN2 - c00004&5
+ PORT_START("DSW1") // IN2 - c00004&5
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1291,7 +1291,7 @@ static INPUT_PORTS_START( s1945a )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) // Forces 1C_1C
- PORT_START_TAG("DSW2") // IN3 - c00006&7
+ PORT_START("DSW2") // IN3 - c00006&7
/***********************************************
@@ -1322,12 +1322,12 @@ INPUT_PORTS_END
static INPUT_PORTS_START( s1945j )
- PORT_START_TAG("IN0") // IN0 - c00000&1
+ PORT_START("IN0") // IN0 - c00000&1
PSIKYO_PORT_PLAYER2
PSIKYO_PORT_PLAYER1
- PORT_START_TAG("COIN") // IN1 - c00002&3
+ PORT_START("COIN") // IN1 - c00002&3
PSIKYO_PORT_COIN
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1339,7 +1339,7 @@ static INPUT_PORTS_START( s1945j )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") // IN2 - c00004&5
+ PORT_START("DSW1") // IN2 - c00004&5
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1386,7 +1386,7 @@ static INPUT_PORTS_START( s1945j )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) // Forces 1C_1C
- PORT_START_TAG("DSW2") // IN3 - c00006&7
+ PORT_START("DSW2") // IN3 - c00006&7
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1415,12 +1415,12 @@ INPUT_PORTS_END
static INPUT_PORTS_START( tengai )
- PORT_START_TAG("IN0") // IN0 - c00000&1
+ PORT_START("IN0") // IN0 - c00000&1
PSIKYO_PORT_PLAYER2
PSIKYO_PORT_PLAYER1
- PORT_START_TAG("COIN") // IN1PORT_START_TAG("DSW1") // IN2 - c00002&3
+ PORT_START("COIN") // IN1PORT_START_TAG("DSW1") // IN2 - c00002&3
PSIKYO_PORT_COIN
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1432,7 +1432,7 @@ static INPUT_PORTS_START( tengai )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") // IN2 - c00004&5
+ PORT_START("DSW1") // IN2 - c00004&5
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1479,7 +1479,7 @@ static INPUT_PORTS_START( tengai )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, "On [Free Play]" ) // Forces 1C_1C
- PORT_START_TAG("DSW2") // IN3 - c00006&7
+ PORT_START("DSW2") // IN3 - c00006&7
/***********************************************
diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c
index 02d5dda64ef..278585eacfc 100644
--- a/src/mame/drivers/psikyo4.c
+++ b/src/mame/drivers/psikyo4.c
@@ -550,7 +550,7 @@ MACHINE_DRIVER_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
static INPUT_PORTS_START( hotgmck )
- PORT_START_TAG("KEY0") /* fake player 1 controls 1st bank */
+ PORT_START("KEY0") /* fake player 1 controls 1st bank */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
@@ -560,7 +560,7 @@ static INPUT_PORTS_START( hotgmck )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY1") /* fake player 1 controls 2nd bank */
+ PORT_START("KEY1") /* fake player 1 controls 2nd bank */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
@@ -570,7 +570,7 @@ static INPUT_PORTS_START( hotgmck )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY2") /* fake player 1 controls 3rd bank */
+ PORT_START("KEY2") /* fake player 1 controls 3rd bank */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
@@ -580,7 +580,7 @@ static INPUT_PORTS_START( hotgmck )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3") /* fake player 1 controls 4th bank */
+ PORT_START("KEY3") /* fake player 1 controls 4th bank */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
@@ -590,7 +590,7 @@ static INPUT_PORTS_START( hotgmck )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY4") /* fake player 2 controls 1st bank */
+ PORT_START("KEY4") /* fake player 2 controls 1st bank */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_PLAYER(2)
@@ -600,7 +600,7 @@ static INPUT_PORTS_START( hotgmck )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY5") /* fake player 2 controls 2nd bank */
+ PORT_START("KEY5") /* fake player 2 controls 2nd bank */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_PLAYER(2)
@@ -610,7 +610,7 @@ static INPUT_PORTS_START( hotgmck )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY6") /* fake player 2 controls 3rd bank */
+ PORT_START("KEY6") /* fake player 2 controls 3rd bank */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) PORT_PLAYER(2)
@@ -620,7 +620,7 @@ static INPUT_PORTS_START( hotgmck )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY7") /* fake player 2 controls 4th bank */
+ PORT_START("KEY7") /* fake player 2 controls 4th bank */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_PLAYER(2)
@@ -630,7 +630,7 @@ static INPUT_PORTS_START( hotgmck )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM") /* system inputs */
+ PORT_START("SYSTEM") /* system inputs */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) // Screen 1
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 ) // Screen 2
@@ -646,12 +646,12 @@ static INPUT_PORTS_START( hotgmck )
#endif
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE2 ) // Screen 2
- PORT_START_TAG("JP4")/* jumper pads 'JP4' on the PCB */
+ PORT_START("JP4")/* jumper pads 'JP4' on the PCB */
UNUSED_PORT
INPUT_PORTS_END
static INPUT_PORTS_START( loderndf )
- PORT_START_TAG("P1") /* player 1 controls */
+ PORT_START("P1") /* player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -661,7 +661,7 @@ static INPUT_PORTS_START( loderndf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) // Can be used as Retry button
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* player 2 controls */
+ PORT_START("P2") /* player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -671,10 +671,10 @@ static INPUT_PORTS_START( loderndf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) // Can be used as Retry button
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("UNUSED0")
+ PORT_START("UNUSED0")
UNUSED_PORT /* unused? */
- PORT_START_TAG("SYSTEM") /* system inputs */
+ PORT_START("SYSTEM") /* system inputs */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) // Screen 1
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) // Screen 1 - 2nd slot
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) // Screen 2
@@ -690,7 +690,7 @@ static INPUT_PORTS_START( loderndf )
#endif
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE2 ) // Screen 2
- PORT_START_TAG("P3") /* player 1 controls on second screen */
+ PORT_START("P3") /* player 1 controls on second screen */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(3)
@@ -700,7 +700,7 @@ static INPUT_PORTS_START( loderndf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3) // Can be used as Retry button
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START_TAG("P4") /* player 2 controls on second screen */
+ PORT_START("P4") /* player 2 controls on second screen */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(4)
@@ -710,13 +710,13 @@ static INPUT_PORTS_START( loderndf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4) // Can be used as Retry button
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4 )
- PORT_START_TAG("UNUSED1")
+ PORT_START("UNUSED1")
UNUSED_PORT
- PORT_START_TAG("UNUSED2")
+ PORT_START("UNUSED2")
UNUSED_PORT
- PORT_START_TAG("JP4")/* jumper pads 'JP4' on the PCB */
+ PORT_START("JP4")/* jumper pads 'JP4' on the PCB */
// 1-ON,2-ON,3-ON,4-ON --> Japanese
// 1-ON,2-ON,3-ON,4-OFF --> English
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Region ) )
@@ -726,7 +726,7 @@ INPUT_PORTS_END
/* unused inputs also act as duplicate buttons */
static INPUT_PORTS_START( hotdebut )
- PORT_START_TAG("P1") /* player 1 controls */
+ PORT_START("P1") /* player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -736,7 +736,7 @@ static INPUT_PORTS_START( hotdebut )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* player 2 controls */
+ PORT_START("P2") /* player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
@@ -746,10 +746,10 @@ static INPUT_PORTS_START( hotdebut )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("UNUSED0")
+ PORT_START("UNUSED0")
UNUSED_PORT
- PORT_START_TAG("SYSTEM") /* system inputs */
+ PORT_START("SYSTEM") /* system inputs */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) // Screen 1
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) // Screen 1 - 2nd slot
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) // Screen 2
@@ -765,7 +765,7 @@ static INPUT_PORTS_START( hotdebut )
#endif
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE2 ) // Screen 2
- PORT_START_TAG("P3") /* player 1 controls on second screen */
+ PORT_START("P3") /* player 1 controls on second screen */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
@@ -775,7 +775,7 @@ static INPUT_PORTS_START( hotdebut )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START_TAG("P4") /* player 2 controls on second screen */
+ PORT_START("P4") /* player 2 controls on second screen */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
@@ -785,13 +785,13 @@ static INPUT_PORTS_START( hotdebut )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4 )
- PORT_START_TAG("UNUSED1")
+ PORT_START("UNUSED1")
UNUSED_PORT
- PORT_START_TAG("UNUSED2")
+ PORT_START("UNUSED2")
UNUSED_PORT
- PORT_START_TAG("JP4")/* jumper pads 'JP4' on the PCB */
+ PORT_START("JP4")/* jumper pads 'JP4' on the PCB */
UNUSED_PORT
INPUT_PORTS_END
diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c
index d9dc3b3726a..ba00d2cb236 100644
--- a/src/mame/drivers/psikyosh.c
+++ b/src/mame/drivers/psikyosh.c
@@ -650,7 +650,7 @@ MACHINE_DRIVER_END
#define UNUSED_PORT \
- PORT_START_TAG("IN2")/* not read? */ \
+ PORT_START("IN2")/* not read? */ \
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
@@ -661,7 +661,7 @@ MACHINE_DRIVER_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
#define PORT_COIN( debug ) \
- PORT_START_TAG("IN3") /* System inputs */ \
+ PORT_START("IN3") /* System inputs */ \
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) \
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) \
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
@@ -684,42 +684,42 @@ MACHINE_DRIVER_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(player)
static INPUT_PORTS_START( s1945ii )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PSIKYOSH_PORT_PLAYER( 1, IPT_START1, IPT_BUTTON1, IPT_BUTTON2, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PSIKYOSH_PORT_PLAYER( 2, IPT_START2, IPT_BUTTON1, IPT_BUTTON2, IPT_UNKNOWN )
UNUSED_PORT
PORT_COIN( 0x40 )
- PORT_START_TAG("IN4") /* jumper pads on the PCB */
+ PORT_START("IN4") /* jumper pads on the PCB */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Region ) )
PORT_DIPSETTING( 0x00, DEF_STR( Japan ) )
PORT_DIPSETTING( 0x01, DEF_STR( World ) )
INPUT_PORTS_END
static INPUT_PORTS_START( soldivid )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PSIKYOSH_PORT_PLAYER( 1, IPT_START1, IPT_BUTTON1, IPT_BUTTON2, IPT_BUTTON3 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PSIKYOSH_PORT_PLAYER( 2, IPT_START2, IPT_BUTTON1, IPT_BUTTON2, IPT_BUTTON3 )
UNUSED_PORT
PORT_COIN( 0x40 )
- PORT_START_TAG("IN4") /* jumper pads on the PCB */
+ PORT_START("IN4") /* jumper pads on the PCB */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Region ) )
PORT_DIPSETTING( 0x00, DEF_STR( Japan ) )
PORT_DIPSETTING( 0x01, DEF_STR( World ) )
INPUT_PORTS_END
static INPUT_PORTS_START( daraku )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PSIKYOSH_PORT_PLAYER( 1, IPT_START1, IPT_BUTTON1, IPT_BUTTON2, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PSIKYOSH_PORT_PLAYER( 2, IPT_START2, IPT_BUTTON1, IPT_BUTTON2, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* more controls */
+ PORT_START("IN2") /* more controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
@@ -731,37 +731,37 @@ static INPUT_PORTS_START( daraku )
PORT_COIN( 0x40 )
- PORT_START_TAG("IN4") /* jumper pads on the PCB */
+ PORT_START("IN4") /* jumper pads on the PCB */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Region ) )
PORT_DIPSETTING( 0x00, DEF_STR( Japan ) )
PORT_DIPSETTING( 0x01, DEF_STR( World ) ) /* Title screen is different, English is default now */
INPUT_PORTS_END
static INPUT_PORTS_START( sbomberb )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PSIKYOSH_PORT_PLAYER( 1, IPT_START1, IPT_BUTTON1, IPT_BUTTON2, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PSIKYOSH_PORT_PLAYER( 2, IPT_START2, IPT_BUTTON1, IPT_BUTTON2, IPT_UNKNOWN )
UNUSED_PORT
PORT_COIN( 0x40 ) /* If HIGH then you can perform rom test, but EEPROM resets? */
- PORT_START_TAG("IN4") /* jumper pads on the PCB */
+ PORT_START("IN4") /* jumper pads on the PCB */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Region ) )
PORT_DIPSETTING( 0x00, DEF_STR( Japan ) )
PORT_DIPSETTING( 0x01, DEF_STR( World ) )
INPUT_PORTS_END
static INPUT_PORTS_START( gunbird2 ) /* Different Region */
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PSIKYOSH_PORT_PLAYER( 1, IPT_START1, IPT_BUTTON1, IPT_BUTTON2, IPT_BUTTON3 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PSIKYOSH_PORT_PLAYER( 2, IPT_START2, IPT_BUTTON1, IPT_BUTTON2, IPT_BUTTON3 )
UNUSED_PORT
PORT_COIN( 0x40 ) /* If HIGH then you can perform rom test, but EEPROM resets */
- PORT_START_TAG("IN4") /* jumper pads on the PCB */
+ PORT_START("IN4") /* jumper pads on the PCB */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Region ) )
PORT_DIPSETTING( 0x00, DEF_STR( Japan ) )
PORT_DIPSETTING( 0x01, "International Ver A." )
@@ -769,15 +769,15 @@ static INPUT_PORTS_START( gunbird2 ) /* Different Region */
INPUT_PORTS_END
static INPUT_PORTS_START( s1945iii ) /* Different Region again */
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PSIKYOSH_PORT_PLAYER( 1, IPT_START1, IPT_BUTTON1, IPT_BUTTON2, IPT_BUTTON3 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PSIKYOSH_PORT_PLAYER( 2, IPT_START2, IPT_BUTTON1, IPT_BUTTON2, IPT_BUTTON3 )
UNUSED_PORT
PORT_COIN( 0x40 ) /* If HIGH then you can perform rom test, EEPROM doesn't reset */
- PORT_START_TAG("IN4") /* IN4 jumper pads on the PCB */
+ PORT_START("IN4") /* IN4 jumper pads on the PCB */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Region ) )
PORT_DIPSETTING( 0x00, DEF_STR( Japan ) )
PORT_DIPSETTING( 0x02, "International Ver A." )
@@ -785,16 +785,16 @@ static INPUT_PORTS_START( s1945iii ) /* Different Region again */
INPUT_PORTS_END
static INPUT_PORTS_START( dragnblz ) /* Security requires bit high */
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PSIKYOSH_PORT_PLAYER( 1, IPT_START1, IPT_BUTTON1, IPT_BUTTON2, IPT_BUTTON3 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PSIKYOSH_PORT_PLAYER( 2, IPT_START2, IPT_BUTTON1, IPT_BUTTON2, IPT_BUTTON3 )
UNUSED_PORT
PORT_COIN( 0 ) /* Must be HIGH (Or Security Error), so can perform test */
- PORT_START_TAG("IN4") /* jumper pads on the PCB */
+ PORT_START("IN4") /* jumper pads on the PCB */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Region ) )
PORT_DIPSETTING( 0x00, DEF_STR( Japan ) )
PORT_DIPSETTING( 0x02, "International Ver A." )
@@ -802,15 +802,15 @@ static INPUT_PORTS_START( dragnblz ) /* Security requires bit high */
INPUT_PORTS_END
static INPUT_PORTS_START( gnbarich ) /* Same as S1945iii except only one button */
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PSIKYOSH_PORT_PLAYER( 1, IPT_START1, IPT_BUTTON1, IPT_BUTTON2, IPT_BUTTON3 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PSIKYOSH_PORT_PLAYER( 2, IPT_START2, IPT_BUTTON1, IPT_BUTTON2, IPT_BUTTON3 )
UNUSED_PORT
PORT_COIN( 0x40 ) /* If HIGH then you can perform rom test, but EEPROM resets? */
- PORT_START_TAG("IN4")/* jumper pads on the PCB */
+ PORT_START("IN4")/* jumper pads on the PCB */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Region ) )
PORT_DIPSETTING( 0x00, DEF_STR( Japan ) )
PORT_DIPSETTING( 0x02, "International Ver A." )
@@ -818,15 +818,15 @@ static INPUT_PORTS_START( gnbarich ) /* Same as S1945iii except only one button
INPUT_PORTS_END
static INPUT_PORTS_START( mjgtaste ) /* This will need the Mahjong inputs */
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PSIKYOSH_PORT_PLAYER( 1, IPT_START1, IPT_BUTTON1, IPT_BUTTON2, IPT_BUTTON3 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PSIKYOSH_PORT_PLAYER( 2, IPT_START2, IPT_BUTTON1, IPT_BUTTON2, IPT_BUTTON3 )
UNUSED_PORT
PORT_COIN( 0x40 )
- PORT_START_TAG("IN4") /* jumper pads on the PCB */
+ PORT_START("IN4") /* jumper pads on the PCB */
// PORT_DIPNAME( 0x03, 0x01, DEF_STR( Region ) )
// PORT_DIPSETTING( 0x00, DEF_STR( Japan ) )
// PORT_DIPSETTING( 0x02, "International Ver A." )
diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c
index 7a56393c122..d9f68c952ec 100644
--- a/src/mame/drivers/psychic5.c
+++ b/src/mame/drivers/psychic5.c
@@ -421,7 +421,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( psychic5 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -431,7 +431,7 @@ static INPUT_PORTS_START( psychic5 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("P1") /* player 1 controls */
+ PORT_START("P1") /* player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -441,7 +441,7 @@ static INPUT_PORTS_START( psychic5 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2") /* player 2 controls */
+ PORT_START("P2") /* player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -451,7 +451,7 @@ static INPUT_PORTS_START( psychic5 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -476,7 +476,7 @@ static INPUT_PORTS_START( psychic5 )
PORT_DIPSETTING( 0x40, "4" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "Invulnerability (Cheat)")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c
index 68b64b7fc93..c9fbc0ce6ce 100644
--- a/src/mame/drivers/pturn.c
+++ b/src/mame/drivers/pturn.c
@@ -352,7 +352,7 @@ static GFXDECODE_START( pturn )
GFXDECODE_END
static INPUT_PORTS_START( pturn )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -362,7 +362,7 @@ static INPUT_PORTS_START( pturn )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -372,7 +372,7 @@ static INPUT_PORTS_START( pturn )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH,IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH,IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH,IPT_SERVICE1 ) /* service coin */
@@ -380,7 +380,7 @@ static INPUT_PORTS_START( pturn )
PORT_BIT( 0x20, IP_ACTIVE_HIGH,IPT_START2 )
PORT_BIT( 0xc8, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "5" )
@@ -396,7 +396,7 @@ static INPUT_PORTS_START( pturn )
PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) )
PORT_BIT( 0xb0, IP_ACTIVE_HIGH, IPT_UNUSED ) /* marked as "NOT USED" in doc */
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x07, DEF_STR( 6C_1C ) )
PORT_DIPSETTING( 0x06, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/puckpkmn.c b/src/mame/drivers/puckpkmn.c
index 92180db4eaa..3f64d12e515 100644
--- a/src/mame/drivers/puckpkmn.c
+++ b/src/mame/drivers/puckpkmn.c
@@ -18,7 +18,7 @@ Puckman Pockimon - (c)2000 Genie? (there should be a way to show Sun Mixing copy
static UINT16* main_ram;
static INPUT_PORTS_START( puckpkmn ) /* Puckman Pockimon Input Ports */
- PORT_START_TAG("P2") /* Player 2 Controls ($700011.b) */
+ PORT_START("P2") /* Player 2 Controls ($700011.b) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
@@ -28,7 +28,7 @@ static INPUT_PORTS_START( puckpkmn ) /* Puckman Pockimon Input Ports */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START_TAG("P1") /* Player 1 Controls ($700013.b) */
+ PORT_START("P1") /* Player 1 Controls ($700013.b) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(10)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -38,9 +38,9 @@ static INPUT_PORTS_START( puckpkmn ) /* Puckman Pockimon Input Ports */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_START_TAG("IN0") /* ? ($700015.b) */
+ PORT_START("IN0") /* ? ($700015.b) */
- PORT_START_TAG("DSW1") /* DSW 1 ($700017.b) */
+ PORT_START("DSW1") /* DSW 1 ($700017.b) */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
@@ -65,7 +65,7 @@ static INPUT_PORTS_START( puckpkmn ) /* Puckman Pockimon Input Ports */
PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_START_TAG("DSW2") /* DSW 1 ($700019.b) */
+ PORT_START("DSW2") /* DSW 1 ($700019.b) */
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
diff --git a/src/mame/drivers/punchout.c b/src/mame/drivers/punchout.c
index d246187e9a0..b3b81e17d58 100644
--- a/src/mame/drivers/punchout.c
+++ b/src/mame/drivers/punchout.c
@@ -493,7 +493,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( punchout )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 )
@@ -503,7 +503,7 @@ static INPUT_PORTS_START( punchout )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -513,7 +513,7 @@ static INPUT_PORTS_START( punchout )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:!1,!2")
PORT_DIPSETTING( 0x00, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x01, DEF_STR( Medium ) )
@@ -533,7 +533,7 @@ static INPUT_PORTS_START( punchout )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x00, "SW2:!7" ) /* Listed as "Unused" */
PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_HIGH, "SW2:!8" )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:!1,!2,!3,!4")
PORT_DIPSETTING( 0x0e, DEF_STR( 5C_1C ) ) /* Not documented */
PORT_DIPSETTING( 0x0b, DEF_STR( 4C_1C ) ) /* Not documented */
diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c
index e8cfc2f1d71..1ed7a9aad75 100644
--- a/src/mame/drivers/pushman.c
+++ b/src/mame/drivers/pushman.c
@@ -230,7 +230,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( pushman )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -248,7 +248,7 @@ static INPUT_PORTS_START( pushman )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
@@ -259,7 +259,7 @@ static INPUT_PORTS_START( pushman )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x0001, 0x0001, "Debug Mode (Cheat)") /* Listed as "Screen Skip" */
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -309,7 +309,7 @@ static INPUT_PORTS_START( pushman )
INPUT_PORTS_END
static INPUT_PORTS_START( bballs )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -327,7 +327,7 @@ static INPUT_PORTS_START( bballs )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // BUTTON3 in "test mode"
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
@@ -338,7 +338,7 @@ static INPUT_PORTS_START( bballs )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) )
diff --git a/src/mame/drivers/qdrmfgp.c b/src/mame/drivers/qdrmfgp.c
index cddcc5c6a9c..dc7b8f4d3ef 100644
--- a/src/mame/drivers/qdrmfgp.c
+++ b/src/mame/drivers/qdrmfgp.c
@@ -420,7 +420,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( qdrmfgp )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) /* 1P STOP */
@@ -441,7 +441,7 @@ static INPUT_PORTS_START( qdrmfgp )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT( 0x0003, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0004, 0x0004, "Extended Service Menu" ) /* and skipped initial checks. */
PORT_DIPSETTING( 0x0004, DEF_STR( Off ) )
@@ -492,7 +492,7 @@ static INPUT_PORTS_START( qdrmfgp )
PORT_DIPSETTING( 0x8000, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Very_Hard ) )
- PORT_START_TAG("SENSOR")
+ PORT_START("SENSOR")
PORT_BIT( 0x0003, IP_ACTIVE_LOW, IPT_SPECIAL ) /* battery power sensor */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE2 )
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SERVICE3 )
@@ -500,7 +500,7 @@ static INPUT_PORTS_START( qdrmfgp )
INPUT_PORTS_END
static INPUT_PORTS_START( qdrmfgp2 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) /* 1P STOP */
@@ -521,7 +521,7 @@ static INPUT_PORTS_START( qdrmfgp2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT( 0x0003, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0004, 0x0004, "Extended Service Menu & None Sounds Mode" ) /* and skipped initial checks. */
PORT_DIPSETTING( 0x0004, DEF_STR( Off ) )
@@ -572,7 +572,7 @@ static INPUT_PORTS_START( qdrmfgp2 )
PORT_DIPSETTING( 0x8000, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Very_Hard ) )
- PORT_START_TAG("SENSOR")
+ PORT_START("SENSOR")
PORT_BIT( 0x0003, IP_ACTIVE_LOW, IPT_SPECIAL ) /* battery power sensor */
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE2 )
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SERVICE3 )
diff --git a/src/mame/drivers/qix.c b/src/mame/drivers/qix.c
index 98eafe07125..5bdf1f3bae0 100644
--- a/src/mame/drivers/qix.c
+++ b/src/mame/drivers/qix.c
@@ -301,7 +301,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( qix )
- PORT_START_TAG("P1") /* PIA 0 Port A (PLAYER 1) */
+ PORT_START("P1") /* PIA 0 Port A (PLAYER 1) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
@@ -311,16 +311,16 @@ static INPUT_PORTS_START( qix )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("COIN") /* PIA 0 Port B (COIN) */
+ PORT_START("COIN") /* PIA 0 Port B (COIN) */
COIN_PORT
- PORT_START_TAG("SPARE") /* PIA 1 Port A (SPARE) */
+ PORT_START("SPARE") /* PIA 1 Port A (SPARE) */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0") /* PIA 1 Port B (PLAYER 1/2) */
+ PORT_START("IN0") /* PIA 1 Port B (PLAYER 1/2) */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2") /* PIA 2 Port A (PLAYER 2) */
+ PORT_START("P2") /* PIA 2 Port A (PLAYER 2) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
@@ -332,7 +332,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( sdungeon )
- PORT_START_TAG("P1") /* PIA 0 Port A (PLAYER 1) */
+ PORT_START("P1") /* PIA 0 Port A (PLAYER 1) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_8WAY
@@ -342,18 +342,18 @@ static INPUT_PORTS_START( sdungeon )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT ) PORT_8WAY
- PORT_START_TAG("COIN") /* PIA 0 Port B (COIN) */
+ PORT_START("COIN") /* PIA 0 Port B (COIN) */
COIN_PORT
- PORT_START_TAG("SPARE") /* PIA 1 Port A (SPARE) */
+ PORT_START("SPARE") /* PIA 1 Port A (SPARE) */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0") /* PIA 1 Port B (PLAYER 1/2) */
+ PORT_START("IN0") /* PIA 1 Port B (PLAYER 1/2) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2") /* PIA 2 Port A (PLAYER 2) */
+ PORT_START("P2") /* PIA 2 Port A (PLAYER 2) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -366,7 +366,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( elecyoyo )
- PORT_START_TAG("P1") /* PIA 0 Port A (PLAYER 1) */
+ PORT_START("P1") /* PIA 0 Port A (PLAYER 1) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
@@ -376,16 +376,16 @@ static INPUT_PORTS_START( elecyoyo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("COIN") /* PIA 0 Port B (COIN) */
+ PORT_START("COIN") /* PIA 0 Port B (COIN) */
COIN_PORT
- PORT_START_TAG("SPARE") /* PIA 1 Port A (SPARE) */
+ PORT_START("SPARE") /* PIA 1 Port A (SPARE) */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0") /* PIA 1 Port B (PLAYER 1/2) */
+ PORT_START("IN0") /* PIA 1 Port B (PLAYER 1/2) */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2") /* PIA 2 Port A (PLAYER 2) */
+ PORT_START("P2") /* PIA 2 Port A (PLAYER 2) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
@@ -395,7 +395,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( kram )
- PORT_START_TAG("P1") /* PIA 0 Port A (PLAYER 1) */
+ PORT_START("P1") /* PIA 0 Port A (PLAYER 1) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -405,16 +405,16 @@ static INPUT_PORTS_START( kram )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("COIN") /* PIA 0 Port B (COIN) */
+ PORT_START("COIN") /* PIA 0 Port B (COIN) */
COIN_PORT
- PORT_START_TAG("SPARE") /* PIA 1 Port A (SPARE) */
+ PORT_START("SPARE") /* PIA 1 Port A (SPARE) */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0") /* PIA 1 Port B (PLAYER 1/2) */
+ PORT_START("IN0") /* PIA 1 Port B (PLAYER 1/2) */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2") /* PIA 2 Port A (PLAYER 2) */
+ PORT_START("P2") /* PIA 2 Port A (PLAYER 2) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -426,7 +426,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( zookeep )
- PORT_START_TAG("P1") /* PIA 0 Port A (PLAYER 1) */
+ PORT_START("P1") /* PIA 0 Port A (PLAYER 1) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
@@ -436,16 +436,16 @@ static INPUT_PORTS_START( zookeep )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("COIN") /* PIA 0 Port B (COIN) */
+ PORT_START("COIN") /* PIA 0 Port B (COIN) */
COIN_PORT
- PORT_START_TAG("SPARE") /* PIA 1 Port A (SPARE) */
+ PORT_START("SPARE") /* PIA 1 Port A (SPARE) */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0") /* PIA 1 Port B (PLAYER 1/2) */
+ PORT_START("IN0") /* PIA 1 Port B (PLAYER 1/2) */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2") /* PIA 2 Port A (PLAYER 2) */
+ PORT_START("P2") /* PIA 2 Port A (PLAYER 2) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
@@ -457,14 +457,14 @@ INPUT_PORTS_END
static INPUT_PORTS_START( slither )
- PORT_START_TAG("P1") /* PIA 0 Port A (PLAYER 1) */
+ PORT_START("P1") /* PIA 0 Port A (PLAYER 1) */
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("COIN") /* PIA 0 Port B (COIN) */
+ PORT_START("COIN") /* PIA 0 Port B (COIN) */
PORT_SERVICE(0x01, IP_ACTIVE_LOW )
PORT_BIT( 0x0e, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -472,29 +472,29 @@ static INPUT_PORTS_START( slither )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_TILT )
- PORT_START_TAG("P2") /* PIA 3 Port A (PLAYER 2) */
+ PORT_START("P2") /* PIA 3 Port A (PLAYER 2) */
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) PORT_COCKTAIL
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("AN0") /* PIA 1 Port A (TRACKBALL L/R) */
+ PORT_START("AN0") /* PIA 1 Port A (TRACKBALL L/R) */
PORT_BIT( 0xff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("AN1") /* PIA 2 Port A (TRACKBALL U/D) */
+ PORT_START("AN1") /* PIA 2 Port A (TRACKBALL U/D) */
PORT_BIT( 0xff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE
- PORT_START_TAG("AN2") /* PIA 1 Port A (TRACKBALL L/R) */
+ PORT_START("AN2") /* PIA 1 Port A (TRACKBALL L/R) */
PORT_BIT( 0xff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_COCKTAIL
- PORT_START_TAG("AN3") /* PIA 2 Port A (TRACKBALL U/D) */
+ PORT_START("AN3") /* PIA 2 Port A (TRACKBALL U/D) */
PORT_BIT( 0xff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_COCKTAIL
INPUT_PORTS_END
static INPUT_PORTS_START( complexx )
- PORT_START_TAG("P1") /* PIA 0 Port A (Left Stick) */
+ PORT_START("P1") /* PIA 0 Port A (Left Stick) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_8WAY
@@ -514,16 +514,16 @@ I gotta think it's not supposed to be hooked up at all and if the
difficulty is that low, you just can't shoot, so I think it should stay
as-is. Tim Lindquist 1-17-03 */
- PORT_START_TAG("COIN") /* PIA 0 Port B (COIN) */
+ PORT_START("COIN") /* PIA 0 Port B (COIN) */
COIN_PORT
- PORT_START_TAG("SPARE") /* PIA 1 Port A (SPARE) */
+ PORT_START("SPARE") /* PIA 1 Port A (SPARE) */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0") /* PIA 1 Port B (PLAYER 1/2) */
+ PORT_START("IN0") /* PIA 1 Port B (PLAYER 1/2) */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2") /* PIA 2 Port A (Right Stick) */
+ PORT_START("P2") /* PIA 2 Port A (Right Stick) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/quantum.c b/src/mame/drivers/quantum.c
index 970ad8ec7f5..9a92aaaf7fa 100644
--- a/src/mame/drivers/quantum.c
+++ b/src/mame/drivers/quantum.c
@@ -165,7 +165,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( quantum )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
/* YHALT here MUST BE ALWAYS 0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH,IPT_SPECIAL ) /* vg YHALT */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -177,7 +177,7 @@ static INPUT_PORTS_START( quantum )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
/* first POKEY is SW2, second is SW1 -- more confusion! */
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0xc0, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -198,13 +198,13 @@ static INPUT_PORTS_START( quantum )
PORT_DIPSETTING( 0x05, "1 each 3" )
PORT_DIPSETTING( 0x06, "2 each 4" )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("TRACKX") /* IN2 */
+ PORT_START("TRACKX") /* IN2 */
PORT_BIT( 0x0f, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(10) PORT_KEYDELTA(10) PORT_REVERSE
- PORT_START_TAG("TRACKY") /* IN3 */
+ PORT_START("TRACKY") /* IN3 */
PORT_BIT( 0x0f, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(10) PORT_KEYDELTA(10)
INPUT_PORTS_END
diff --git a/src/mame/drivers/quasar.c b/src/mame/drivers/quasar.c
index cf2df4fb323..6f4b35a9be6 100644
--- a/src/mame/drivers/quasar.c
+++ b/src/mame/drivers/quasar.c
@@ -218,7 +218,7 @@ ADDRESS_MAP_END
************************************************************************/
static INPUT_PORTS_START( quasar )
- PORT_START_TAG("IN0") /* Controls 0 */
+ PORT_START("IN0") /* Controls 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -228,7 +228,7 @@ static INPUT_PORTS_START( quasar )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) /* switch collaudo */
- PORT_START_TAG("IN1") /* Controls 1 */
+ PORT_START("IN1") /* Controls 1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) /* tavalino */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
@@ -238,7 +238,7 @@ static INPUT_PORTS_START( quasar )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 ) /* count enable */
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x0c, 0x04, DEF_STR( Coin_A ) ) /* confirmed */
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 1C_1C ) )
@@ -261,7 +261,7 @@ static INPUT_PORTS_START( quasar )
PORT_DIPSETTING( 0x00, "Collisions excluded" )
PORT_DIPSETTING( 0x80, "Collisions included" )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x07, 0x01, "High Score" )
PORT_DIPSETTING( 0x00, "No H.S." ) // this option only wants bit 0 OFF
PORT_DIPSETTING( 0x01, "Normal H.S." )
@@ -282,10 +282,10 @@ static INPUT_PORTS_START( quasar )
PORT_DIPSETTING( 0x80, "Stop at edge" )
PORT_DIPSETTING( 0x00, "Wrap Around" )
- PORT_START_TAG("SENSE") /* SENSE */
+ PORT_START("SENSE") /* SENSE */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW2") /* Sound DIP switch */
+ PORT_START("DSW2") /* Sound DIP switch */
#if 0
PORT_DIPNAME( 0x0f, 0x00, "Noise to play" )
PORT_DIPSETTING( 0x00, "00" )
diff --git a/src/mame/drivers/quizdna.c b/src/mame/drivers/quizdna.c
index 522df03a34b..cc1fac0b62c 100644
--- a/src/mame/drivers/quizdna.c
+++ b/src/mame/drivers/quizdna.c
@@ -117,7 +117,7 @@ ADDRESS_MAP_END
/****************************************************************************/
static INPUT_PORTS_START( quizdna )
- PORT_START /* sw2 */
+ PORT_START("DSW2") /* sw2 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 9C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 8C_1C ) )
@@ -146,7 +146,7 @@ static INPUT_PORTS_START( quizdna )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START /* sw3 */
+ PORT_START("DSW3") /* sw3 */
PORT_DIPNAME( 0x03, 0x02, "Timer" )
PORT_DIPSETTING( 0x03, "Slow" )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -169,7 +169,7 @@ static INPUT_PORTS_START( quizdna )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 )
@@ -179,7 +179,7 @@ static INPUT_PORTS_START( quizdna )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
@@ -189,7 +189,7 @@ static INPUT_PORTS_START( quizdna )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -199,7 +199,7 @@ static INPUT_PORTS_START( quizdna )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START
+ PORT_START("SERVICE")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -211,7 +211,7 @@ static INPUT_PORTS_START( quizdna )
INPUT_PORTS_END
static INPUT_PORTS_START( gakupara )
- PORT_START /* sw2 */
+ PORT_START("DSW2") /* sw2 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, "10 Coins/1 Credit" )
PORT_DIPSETTING( 0x01, DEF_STR( 9C_1C ) )
@@ -241,7 +241,7 @@ static INPUT_PORTS_START( gakupara )
PORT_DIPSETTING( 0x40, "Fast" )
PORT_DIPSETTING( 0x00, "Very Fast" )
- PORT_START /* sw3 */
+ PORT_START("DSW3") /* sw3 */
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x02, "Unknown 3-2" )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -265,7 +265,7 @@ static INPUT_PORTS_START( gakupara )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 )
@@ -275,7 +275,7 @@ static INPUT_PORTS_START( gakupara )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
@@ -285,7 +285,7 @@ static INPUT_PORTS_START( gakupara )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -295,7 +295,7 @@ static INPUT_PORTS_START( gakupara )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START
+ PORT_START("SERVICE")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -307,7 +307,7 @@ static INPUT_PORTS_START( gakupara )
INPUT_PORTS_END
static INPUT_PORTS_START( gekiretu )
- PORT_START /* dsw2 */
+ PORT_START("DSW2") /* dsw2 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 9C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 8C_1C ) )
@@ -336,7 +336,7 @@ static INPUT_PORTS_START( gekiretu )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START /* dsw3 */
+ PORT_START("DSW3") /* dsw3 */
PORT_DIPNAME( 0x03, 0x03, "Timer" )
PORT_DIPSETTING( 0x03, "Slow" )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -360,7 +360,7 @@ static INPUT_PORTS_START( gekiretu )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 )
@@ -370,7 +370,7 @@ static INPUT_PORTS_START( gekiretu )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
@@ -380,7 +380,7 @@ static INPUT_PORTS_START( gekiretu )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -390,7 +390,7 @@ static INPUT_PORTS_START( gekiretu )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START
+ PORT_START("SERVICE")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/quizo.c b/src/mame/drivers/quizo.c
index f859725ec4b..af7b9c64335 100644
--- a/src/mame/drivers/quizo.c
+++ b/src/mame/drivers/quizo.c
@@ -135,7 +135,7 @@ static ADDRESS_MAP_START( portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( quizo )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN2 )
@@ -151,13 +151,13 @@ static INPUT_PORTS_START( quizo )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
diff --git a/src/mame/drivers/quizpani.c b/src/mame/drivers/quizpani.c
index 194b2c783a9..83882089deb 100644
--- a/src/mame/drivers/quizpani.c
+++ b/src/mame/drivers/quizpani.c
@@ -77,7 +77,7 @@ static ADDRESS_MAP_START( quizpani_writemem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
static INPUT_PORTS_START( quizpani )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -88,7 +88,7 @@ static INPUT_PORTS_START( quizpani )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("P1_P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -122,7 +122,7 @@ static INPUT_PORTS_START( quizpani )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -171,7 +171,7 @@ static INPUT_PORTS_START( quizpani )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/quizpun2.c b/src/mame/drivers/quizpun2.c
index 85ada7fa5e9..977050cc281 100644
--- a/src/mame/drivers/quizpun2.c
+++ b/src/mame/drivers/quizpun2.c
@@ -336,7 +336,7 @@ ADDRESS_MAP_END
***************************************************************************/
INPUT_PORTS_START( quizpun2 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPUNKNOWN( 0x02, 0x02 )
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Coinage ) )
@@ -355,7 +355,7 @@ INPUT_PORTS_START( quizpun2 )
PORT_DIPSETTING( 0x40, "4" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -365,7 +365,7 @@ INPUT_PORTS_START( quizpun2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
diff --git a/src/mame/drivers/r2dtank.c b/src/mame/drivers/r2dtank.c
index f5e82948df2..ed1051f3c1b 100644
--- a/src/mame/drivers/r2dtank.c
+++ b/src/mame/drivers/r2dtank.c
@@ -454,7 +454,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( r2dtank )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW)
@@ -464,7 +464,7 @@ static INPUT_PORTS_START( r2dtank )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(get_ttl74123_output, 0)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
@@ -474,7 +474,7 @@ static INPUT_PORTS_START( r2dtank )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -499,7 +499,7 @@ static INPUT_PORTS_START( r2dtank )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Free_Play ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c
index 0d06c3c505e..ce37d4ff1aa 100644
--- a/src/mame/drivers/rabbit.c
+++ b/src/mame/drivers/rabbit.c
@@ -827,7 +827,7 @@ static ADDRESS_MAP_START( tmmjprd_writemem, ADDRESS_SPACE_PROGRAM, 32 )
ADDRESS_MAP_END
static INPUT_PORTS_START( rabbit )
- PORT_START_TAG("IN0") /* 16bit */
+ PORT_START("IN0") /* 16bit */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SPECIAL ) // Eeprom
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unlabeled in input test
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -845,7 +845,7 @@ static INPUT_PORTS_START( rabbit )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1") /* 16bit */
+ PORT_START("IN1") /* 16bit */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -881,7 +881,7 @@ static INPUT_PORTS_START( rabbit )
INPUT_PORTS_END
static INPUT_PORTS_START( tmmjprd )
- PORT_START_TAG("IN0") /* 16bit */
+ PORT_START("IN0") /* 16bit */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unlabeled in input test
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -899,7 +899,7 @@ static INPUT_PORTS_START( tmmjprd )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1") /* 16bit */
+ PORT_START("IN1") /* 16bit */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/raiden.c b/src/mame/drivers/raiden.c
index 8c1e307348c..22c8cdbed9c 100644
--- a/src/mame/drivers/raiden.c
+++ b/src/mame/drivers/raiden.c
@@ -100,7 +100,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( raiden )
SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */
- PORT_START /* IN0 */
+ PORT_START("P1_P2") /* IN0 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -118,7 +118,7 @@ static INPUT_PORTS_START( raiden )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START /* Dip switch A */
+ PORT_START("DSW") /* Dip switch A */
PORT_DIPNAME( 0x0001, 0x0001, "Coin Mode" )
PORT_DIPSETTING( 0x0001, "A" )
PORT_DIPSETTING( 0x0000, "B" )
diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c
index e41208bd95e..3a89b5e043f 100644
--- a/src/mame/drivers/raiden2.c
+++ b/src/mame/drivers/raiden2.c
@@ -770,7 +770,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( raiden2 )
SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */
- PORT_START_TAG("P1") /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -780,7 +780,7 @@ static INPUT_PORTS_START( raiden2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2") /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -790,7 +790,7 @@ static INPUT_PORTS_START( raiden2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSWA") /* Dip switch A */
+ PORT_START("DSWA") /* Dip switch A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ))
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ))
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ))
@@ -816,7 +816,7 @@ static INPUT_PORTS_START( raiden2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* Dip switch B */
+ PORT_START("DSWB") /* Dip switch B */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ))
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
@@ -839,7 +839,7 @@ static INPUT_PORTS_START( raiden2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* START BUTTONS */
+ PORT_START("SYSTEM") /* START BUTTONS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -850,7 +850,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( raidendx )
SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */
- PORT_START_TAG("P1") /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -860,7 +860,7 @@ static INPUT_PORTS_START( raidendx )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2") /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -870,7 +870,7 @@ static INPUT_PORTS_START( raidendx )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSWA") /* Dip switch A */
+ PORT_START("DSWA") /* Dip switch A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ))
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ))
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ))
@@ -896,7 +896,7 @@ static INPUT_PORTS_START( raidendx )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* Dip switch B */
+ PORT_START("DSWB") /* Dip switch B */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ))
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
@@ -920,7 +920,7 @@ static INPUT_PORTS_START( raidendx )
PORT_DIPSETTING( 0x80, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM") /* START BUTTONS */
+ PORT_START("SYSTEM") /* START BUTTONS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2081,7 +2081,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( rdx_v33 )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2093,7 +2093,7 @@ static INPUT_PORTS_START( rdx_v33 )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_BIT( 0xff80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("INPUT")
+ PORT_START("INPUT")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c
index 65ba255673e..72dcf76fc60 100644
--- a/src/mame/drivers/rainbow.c
+++ b/src/mame/drivers/rainbow.c
@@ -399,7 +399,7 @@ ADDRESS_MAP_END
***********************************************************/
static INPUT_PORTS_START( rainbow_generic )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_COCKTAIL
PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) ) PORT_CONDITION("DSWB",0x80,PORTCOND_EQUALS,0x00)
@@ -420,7 +420,7 @@ static INPUT_PORTS_START( rainbow_generic )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_4C ) ) PORT_CONDITION("DSWB",0x80,PORTCOND_EQUALS,0x00)
PORT_DIPSETTING( 0x00, DEF_STR( 1C_6C ) ) PORT_CONDITION("DSWB",0x80,PORTCOND_EQUALS,0x00)
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x04, "100k 1000k" )
@@ -448,7 +448,7 @@ static INPUT_PORTS_START( rainbow )
/* 0x3b0000 -> 0x10cfc4 ($fc4,A5) : DSWB */
- PORT_START_TAG("800007")
+ PORT_START("800007")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -458,7 +458,7 @@ static INPUT_PORTS_START( rainbow )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("800009")
+ PORT_START("800009")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -468,7 +468,7 @@ static INPUT_PORTS_START( rainbow )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("80000B")
+ PORT_START("80000B")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -478,7 +478,7 @@ static INPUT_PORTS_START( rainbow )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_START_TAG("80000D")
+ PORT_START("80000D")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -501,7 +501,7 @@ static INPUT_PORTS_START( jumping )
PORT_MODIFY("DSWB")
PORT_DIPUNUSED( 0x40, IP_ACTIVE_LOW ) /* see notes */
- PORT_START_TAG("401001")
+ PORT_START("401001")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -511,7 +511,7 @@ static INPUT_PORTS_START( jumping )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("401003")
+ PORT_START("401003")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
diff --git a/src/mame/drivers/rallyx.c b/src/mame/drivers/rallyx.c
index 5656bce4c07..dfc8cb4b6ce 100644
--- a/src/mame/drivers/rallyx.c
+++ b/src/mame/drivers/rallyx.c
@@ -350,7 +350,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( rallyx )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
@@ -360,7 +360,7 @@ static INPUT_PORTS_START( rallyx )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -372,7 +372,7 @@ static INPUT_PORTS_START( rallyx )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) )
@@ -417,7 +417,7 @@ static INPUT_PORTS_START( rallyx )
INPUT_PORTS_END
static INPUT_PORTS_START( nrallyx )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
@@ -427,7 +427,7 @@ static INPUT_PORTS_START( nrallyx )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -439,7 +439,7 @@ static INPUT_PORTS_START( nrallyx )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) )
@@ -465,7 +465,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( jungler )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -475,7 +475,7 @@ static INPUT_PORTS_START( jungler )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -485,11 +485,11 @@ static INPUT_PORTS_START( jungler )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("DSW0") /* Sound board */
+ PORT_START("DSW0") /* Sound board */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1") /* CPU board */
+ PORT_START("DSW1") /* CPU board */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
@@ -518,7 +518,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( locomotn )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -528,7 +528,7 @@ static INPUT_PORTS_START( locomotn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -538,7 +538,7 @@ static INPUT_PORTS_START( locomotn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("DSW0") /* Sound board */
+ PORT_START("DSW0") /* Sound board */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x30, 0x30, DEF_STR( Lives ) )
@@ -559,7 +559,7 @@ static INPUT_PORTS_START( locomotn )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* CPU board */
+ PORT_START("DSW1") /* CPU board */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0a, DEF_STR( 3C_1C ) )
@@ -598,7 +598,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( tactcian )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -608,7 +608,7 @@ static INPUT_PORTS_START( tactcian )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -618,7 +618,7 @@ static INPUT_PORTS_START( tactcian )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("DSW0") /* Sound board */
+ PORT_START("DSW0") /* Sound board */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x30, 0x00, DEF_STR( Lives ) )
@@ -645,7 +645,7 @@ static INPUT_PORTS_START( tactcian )
PORT_DIPSETTING( 0x00, "10k, 80k then every 100k" )
PORT_DIPSETTING( 0x01, "20k, 80k then every 100k" )
- PORT_START_TAG("DSW1") /* CPU board */
+ PORT_START("DSW1") /* CPU board */
PORT_DIPNAME( 0x01, 0x00, "Coin Mode" )
PORT_DIPSETTING( 0x00, "Mode 1" )
PORT_DIPSETTING( 0x01, "Mode 2" )
@@ -674,7 +674,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( commsega )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -684,7 +684,7 @@ static INPUT_PORTS_START( commsega )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -694,7 +694,7 @@ static INPUT_PORTS_START( commsega )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("DSW0") /* (sound board) */
+ PORT_START("DSW0") /* (sound board) */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unused ) )
@@ -716,7 +716,7 @@ static INPUT_PORTS_START( commsega )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
- PORT_START_TAG("DSW1") /* (CPU board) */
+ PORT_START("DSW1") /* (CPU board) */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -980,6 +980,9 @@ ROM_START( rallyxm )
ROM_LOAD( "1k", 0x3000, 0x1000, CRC(473ab447) SHA1(f0a37ccc48c97c53672f754ca2ac37dc0dc91a9f) )
ROM_REGION( 0x1000, "gfx1", ROMREGION_DISPOSE )
+ ROM_LOAD( "8e", 0x0000, 0x1000, CRC(277c1de5) SHA1(30bc57263e8dad870c501c76bce6f42d69ab9e00) )
+
+ ROM_REGION( 0x0100, "gfx2", ROMREGION_DISPOSE )
ROM_LOAD( "rx-6.8m", 0x0000, 0x0100, CRC(3c16f62c) SHA1(7a3800be410e306cf85753b9953ffc5575afbcd6) ) /* Prom type: IM5623 - dots */
ROM_REGION( 0x0160, "proms", 0 )
diff --git a/src/mame/drivers/rampart.c b/src/mame/drivers/rampart.c
index e17e1f52bef..2407d07f3f8 100644
--- a/src/mame/drivers/rampart.c
+++ b/src/mame/drivers/rampart.c
@@ -205,7 +205,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( rampart )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3) // alternate button1
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -217,7 +217,7 @@ static INPUT_PORTS_START( rampart )
PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -228,26 +228,26 @@ static INPUT_PORTS_START( rampart )
PORT_SERVICE( 0x0800, IP_ACTIVE_LOW )
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("TRACK0")
PORT_BIT( 0x00ff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_REVERSE PORT_PLAYER(2)
PORT_BIT( 0xff00, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_REVERSE PORT_PLAYER(3)
- PORT_START
+ PORT_START("TRACK1")
PORT_BIT( 0x00ff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_REVERSE PORT_PLAYER(2)
PORT_BIT( 0xff00, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_REVERSE PORT_PLAYER(3)
- PORT_START
+ PORT_START("TRACK2")
PORT_BIT( 0x00ff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_REVERSE PORT_PLAYER(1)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("TRACK3")
PORT_BIT( 0x00ff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_REVERSE PORT_PLAYER(1)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( ramprt2p )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3) // alternate button1
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Players ) )
@@ -261,7 +261,7 @@ static INPUT_PORTS_START( ramprt2p )
PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -272,7 +272,7 @@ static INPUT_PORTS_START( ramprt2p )
PORT_SERVICE( 0x0800, IP_ACTIVE_LOW )
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("TRACK0")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
@@ -287,19 +287,19 @@ static INPUT_PORTS_START( ramprt2p )
PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3)
PORT_BIT( 0xf000, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START
+ PORT_START("TRACK1")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("TRACK2")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("TRACK3")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( rampartj )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -311,7 +311,7 @@ static INPUT_PORTS_START( rampartj )
PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -322,7 +322,7 @@ static INPUT_PORTS_START( rampartj )
PORT_SERVICE( 0x0800, IP_ACTIVE_LOW )
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("TRACK0")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
@@ -337,13 +337,13 @@ static INPUT_PORTS_START( rampartj )
PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0xf000, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START
+ PORT_START("TRACK1")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("TRACK2")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("TRACK3")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c
index 27063dd41c0..4b5faf1d361 100644
--- a/src/mame/drivers/rastan.c
+++ b/src/mame/drivers/rastan.c
@@ -258,13 +258,13 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( rastan )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS( 2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -274,7 +274,7 @@ static INPUT_PORTS_START( rastan )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) // from PC050 (above 2 bits not checked when 0)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT )
@@ -285,7 +285,7 @@ static INPUT_PORTS_START( rastan )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
/* 0x390008 -> 0x10c018 ($18,A5) */
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -297,7 +297,7 @@ static INPUT_PORTS_START( rastan )
TAITO_COINAGE_WORLD
/* 0x39000a -> 0x10c01c ($1c,A5) */
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) /* table at 0x059f2e */
PORT_DIPSETTING( 0x0c, "100k 200k 400k 600k 800k" )
diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c
index fca87e0906c..dbb0c5f9679 100644
--- a/src/mame/drivers/rbmk.c
+++ b/src/mame/drivers/rbmk.c
@@ -123,7 +123,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( rbmk )
- PORT_START_TAG("IN0") /* 16bit */
+ PORT_START("IN0") /* 16bit */
PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Controls ) )
PORT_DIPSETTING( 0x0080, DEF_STR( Joystick ) )
PORT_DIPSETTING( 0x0000, "Keyboard" )
@@ -177,7 +177,7 @@ static INPUT_PORTS_START( rbmk )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN1") /* 16bit */
+ PORT_START("IN1") /* 16bit */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -211,7 +211,7 @@ static INPUT_PORTS_START( rbmk )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN2") /* 16bit */
+ PORT_START("IN2") /* 16bit */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -262,7 +262,7 @@ static INPUT_PORTS_START( rbmk )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN3") /* 16bit */
+ PORT_START("IN3") /* 16bit */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -312,7 +312,7 @@ static INPUT_PORTS_START( rbmk )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN4") /* 16bit */
+ PORT_START("IN4") /* 16bit */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -362,7 +362,7 @@ static INPUT_PORTS_START( rbmk )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN5") /* 16bit */
+ PORT_START("IN5") /* 16bit */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/rcasino.c b/src/mame/drivers/rcasino.c
index fd7a934cc95..a4a532e8032 100644
--- a/src/mame/drivers/rcasino.c
+++ b/src/mame/drivers/rcasino.c
@@ -188,7 +188,7 @@ static ADDRESS_MAP_START( rcasino_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( rcasino )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_CODE(KEYCODE_A) // SW1
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_CODE(KEYCODE_S) // SW2
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_CODE(KEYCODE_D) // SW3
@@ -196,7 +196,7 @@ static INPUT_PORTS_START( rcasino )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_CODE(KEYCODE_G) // SW5
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) // Coin
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_NAME("Note Acceptor")// Note
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_4) PORT_NAME("Payout")// Pay Out
@@ -205,7 +205,7 @@ static INPUT_PORTS_START( rcasino )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) // 2P FlipFlop
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "Poker available?" )
PORT_DIPSETTING( 0x01, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
@@ -231,7 +231,7 @@ static INPUT_PORTS_START( rcasino )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, "Enable Hopper Payout" ) // enables Payout button
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/rcorsair.c b/src/mame/drivers/rcorsair.c
index 0580ca05674..2cc3dc9d7f3 100644
--- a/src/mame/drivers/rcorsair.c
+++ b/src/mame/drivers/rcorsair.c
@@ -62,7 +62,7 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( inports )
- PORT_START
+ PORT_START("IN0")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/realbrk.c b/src/mame/drivers/realbrk.c
index 6e75458a251..2402b69dad6 100644
--- a/src/mame/drivers/realbrk.c
+++ b/src/mame/drivers/realbrk.c
@@ -220,7 +220,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( realbrk )
- PORT_START_TAG("IN0") // IN0 - $c00000.w
+ PORT_START("IN0") // IN0 - $c00000.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -238,7 +238,7 @@ static INPUT_PORTS_START( realbrk )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED ) // BUTTON3 in test mode
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1") // IN1 - $c00002.w
+ PORT_START("IN1") // IN1 - $c00002.w
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -249,7 +249,7 @@ static INPUT_PORTS_START( realbrk )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // the vblank routine wants these 2 bits high
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("SW1") // IN2 - $c00004.w (DSW1)
+ PORT_START("SW1") // IN2 - $c00004.w (DSW1)
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) )
@@ -279,7 +279,7 @@ static INPUT_PORTS_START( realbrk )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_SERVICE_DIPLOC( 0x0200, IP_ACTIVE_LOW, "SW1:10" )
- PORT_START_TAG("SW2") // IN3 - $c00004.w (DSW2)
+ PORT_START("SW2") // IN3 - $c00004.w (DSW2)
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x0000, "4" )
PORT_DIPSETTING( 0x0001, "5" )
@@ -304,15 +304,15 @@ static INPUT_PORTS_START( realbrk )
PORT_DIPUNUSED_DIPLOC( 0x0100, 0x0100, "SW2:9" ) /* Manual doesn't even show switches 9 & 10 */
PORT_DIPUNUSED_DIPLOC( 0x0200, 0x0200, "SW2:10" )
- PORT_START_TAG("SW3") // IN4 - $c00004.w (DSW3) - Unused
+ PORT_START("SW3") // IN4 - $c00004.w (DSW3) - Unused
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SW4") // IN5 - $c00004.w (DSW4) - Unused
+ PORT_START("SW4") // IN5 - $c00004.w (DSW4) - Unused
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( pkgnsh )
- PORT_START_TAG("IN0") // IN0 - $c00002.w
+ PORT_START("IN0") // IN0 - $c00002.w
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -323,7 +323,7 @@ static INPUT_PORTS_START( pkgnsh )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // the vblank routine wants these 2 bits high
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("SW1")
+ PORT_START("SW1")
PORT_BIT( 0x003f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x00c0, IP_ACTIVE_HIGH, IPT_UNUSED )/*pkgnsh wants these two bits to be 0*/
PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Unknown ) )
@@ -351,7 +351,7 @@ static INPUT_PORTS_START( pkgnsh )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("SW2") // IN3 - $c00004.w (DSW2)
+ PORT_START("SW2") // IN3 - $c00004.w (DSW2)
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0100, DEF_STR( Off ) )
@@ -383,7 +383,7 @@ static INPUT_PORTS_START( pkgnsh )
// PORT_DIPSETTING( 0xa000, "100 Balls" ) /* Duplicate Setting for 100 balls */
// PORT_DIPSETTING( 0xb000, "100 Balls" ) /* Duplicate Setting for 100 balls */
- PORT_START_TAG("SW3")
+ PORT_START("SW3")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -399,11 +399,11 @@ static INPUT_PORTS_START( pkgnsh )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("PADDLE1")
+ PORT_START("PADDLE1")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xff00, 0x0000, IPT_PADDLE ) PORT_PLAYER(1) PORT_MINMAX(0,0x6400) PORT_SENSITIVITY(15) PORT_KEYDELTA(15) PORT_CENTERDELTA(0) //PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M)
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -411,11 +411,11 @@ static INPUT_PORTS_START( pkgnsh )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) //Stop
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("PADDLE2")
+ PORT_START("PADDLE2")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xff00, 0x0000, IPT_PADDLE ) PORT_PLAYER(2) PORT_MINMAX(0,0x6400) PORT_SENSITIVITY(15) PORT_KEYDELTA(15) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M)
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )/*There's the Pay Out SW here IIRC*/
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -425,7 +425,7 @@ static INPUT_PORTS_START( pkgnsh )
INPUT_PORTS_END
static INPUT_PORTS_START( pkgnshdx )
- PORT_START_TAG("IN0") // IN0 - $c00002.w
+ PORT_START("IN0") // IN0 - $c00002.w
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -436,7 +436,7 @@ static INPUT_PORTS_START( pkgnshdx )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // the vblank routine wants these 2 bits high
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("SW1") // IN1
+ PORT_START("SW1") // IN1
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -473,7 +473,7 @@ static INPUT_PORTS_START( pkgnshdx )
PORT_DIPSETTING( 0x0200, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("SW2") //IN2
+ PORT_START("SW2") //IN2
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -505,7 +505,7 @@ static INPUT_PORTS_START( pkgnshdx )
PORT_DIPSETTING( 0x0200, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("SW3") //IN3
+ PORT_START("SW3") //IN3
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -537,7 +537,7 @@ static INPUT_PORTS_START( pkgnshdx )
PORT_DIPSETTING( 0x0200, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("SW4") //IN4
+ PORT_START("SW4") //IN4
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -569,7 +569,7 @@ static INPUT_PORTS_START( pkgnshdx )
PORT_DIPSETTING( 0x0200, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("P1") //IN5
+ PORT_START("P1") //IN5
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_DIPNAME( 0x0002, 0x0002, "Pay-Out SW" )//Not a real DIP-Switch
PORT_DIPSETTING( 0x0002, DEF_STR( Off ) )
@@ -584,7 +584,7 @@ static INPUT_PORTS_START( pkgnshdx )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xff00, 0x0000, IPT_PADDLE ) PORT_PLAYER(1) PORT_MINMAX(0,0x6400) PORT_SENSITIVITY(15) PORT_KEYDELTA(15) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M)
- PORT_START_TAG("P2") //IN6
+ PORT_START("P2") //IN6
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED ) //Again Pay-Out SW in test mode,but it doesn't work,maybe it is for Player-2?
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED ) //F/F
diff --git a/src/mame/drivers/redalert.c b/src/mame/drivers/redalert.c
index 0b6a2c9b3c0..ce46c9f7820 100644
--- a/src/mame/drivers/redalert.c
+++ b/src/mame/drivers/redalert.c
@@ -159,7 +159,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( redalert )
- PORT_START_TAG("C000")
+ PORT_START("C000")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW:1,2")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -181,7 +181,7 @@ static INPUT_PORTS_START( redalert )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_HIGH, "SW:8" )
- PORT_START_TAG("C010")
+ PORT_START("C010")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 )
@@ -191,7 +191,7 @@ static INPUT_PORTS_START( redalert )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Meter */
- PORT_START_TAG("C020")
+ PORT_START("C020")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Meter */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -201,7 +201,7 @@ static INPUT_PORTS_START( redalert )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Meter */
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_IMPULSE(1)
@@ -210,7 +210,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( demoneye )
- PORT_START_TAG("C000")
+ PORT_START("C000")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -234,7 +234,7 @@ static INPUT_PORTS_START( demoneye )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("C010")
+ PORT_START("C010")
PORT_BIT ( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT ( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 )
@@ -244,7 +244,7 @@ static INPUT_PORTS_START( demoneye )
PORT_BIT ( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
PORT_BIT ( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Meter */
- PORT_START_TAG("C020")
+ PORT_START("C020")
PORT_BIT ( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Meter */
PORT_BIT ( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -254,7 +254,7 @@ static INPUT_PORTS_START( demoneye )
PORT_BIT ( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
PORT_BIT ( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Meter */
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_IMPULSE(1)
diff --git a/src/mame/drivers/redclash.c b/src/mame/drivers/redclash.c
index 84dde10416f..01d64c306ea 100644
--- a/src/mame/drivers/redclash.c
+++ b/src/mame/drivers/redclash.c
@@ -112,7 +112,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( redclash )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
@@ -122,7 +122,7 @@ static INPUT_PORTS_START( redclash )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
@@ -134,7 +134,7 @@ static INPUT_PORTS_START( redclash )
/* them this way is enough to get the game running. */
PORT_BIT( 0xc0, 0x40, IPT_VBLANK )
- PORT_START_TAG("DSW1") /* DSW0 */
+ PORT_START("DSW1") /* DSW0 */
PORT_DIPNAME( 0x03, 0x03, "Difficulty?" )
PORT_DIPSETTING( 0x03, "Easy?" )
PORT_DIPSETTING( 0x02, "Medium?" )
@@ -158,7 +158,7 @@ static INPUT_PORTS_START( redclash )
PORT_DIPSETTING( 0x80, "5" )
PORT_DIPSETTING( 0x40, "7" )
- PORT_START_TAG("DSW2") /* DSW1 */
+ PORT_START("DSW2") /* DSW1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x04, DEF_STR( 6C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 5C_1C ) )
@@ -194,7 +194,7 @@ static INPUT_PORTS_START( redclash )
PORT_DIPSETTING( 0x10, DEF_STR( 1C_8C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_9C ) )
- PORT_START_TAG("FAKE") /* FAKE */
+ PORT_START("FAKE") /* FAKE */
/* The coin slots are not memory mapped. Coin Left causes a NMI, */
/* Coin Right an IRQ. This fake input port is used by the interrupt */
/* handler to be notified of coin insertions. We use IMPULSE to */
@@ -205,7 +205,7 @@ static INPUT_PORTS_START( redclash )
INPUT_PORTS_END
static INPUT_PORTS_START( zerohour )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
@@ -215,7 +215,7 @@ static INPUT_PORTS_START( zerohour )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
@@ -227,7 +227,7 @@ static INPUT_PORTS_START( zerohour )
/* them this way is enough to get the game running. */
PORT_BIT( 0xc0, 0x40, IPT_VBLANK )
- PORT_START_TAG("DSW1") /* DSW0 */
+ PORT_START("DSW1") /* DSW0 */
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW1:8" ) /* Switches 6-8 are not used */
PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "SW1:7" )
PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "SW1:6" )
@@ -245,7 +245,7 @@ static INPUT_PORTS_START( zerohour )
PORT_DIPSETTING( 0x80, "4" )
PORT_DIPSETTING( 0x40, "5" )
- PORT_START_TAG("DSW2") /* DSW1 */
+ PORT_START("DSW2") /* DSW1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:4,3,2,1")
PORT_DIPSETTING( 0x06, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -269,7 +269,7 @@ static INPUT_PORTS_START( zerohour )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ) )
- PORT_START_TAG("FAKE") /* FAKE */
+ PORT_START("FAKE") /* FAKE */
/* The coin slots are not memory mapped. Coin Left causes a NMI, */
/* Coin Right an IRQ. This fake input port is used by the interrupt */
/* handler to be notified of coin insertions. We use IMPULSE to */
diff --git a/src/mame/drivers/relief.c b/src/mame/drivers/relief.c
index a45e4ee759f..9ca6feb9fed 100644
--- a/src/mame/drivers/relief.c
+++ b/src/mame/drivers/relief.c
@@ -226,7 +226,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( relief )
- PORT_START_TAG("260000") /* 260000 */
+ PORT_START("260000") /* 260000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Button D0") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Button D1") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Button D2") PORT_CODE(KEYCODE_C)
@@ -253,7 +253,7 @@ static INPUT_PORTS_START( relief )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_START_TAG("260002") /* 260002 */
+ PORT_START("260002") /* 260002 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("White") PORT_CODE(KEYCODE_COMMA)
PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Off ) )
@@ -278,14 +278,14 @@ static INPUT_PORTS_START( relief )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
- PORT_START_TAG("260010") /* 260010 */
+ PORT_START("260010") /* 260010 */
PORT_BIT( 0x001f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNUSED ) /* tested before writing to 260040 */
PORT_SERVICE( 0x0040, IP_ACTIVE_LOW )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("260012") /* 260012 */
+ PORT_START("260012") /* 260012 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x000c, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c
index eb44346faa9..30a668cdc38 100644
--- a/src/mame/drivers/renegade.c
+++ b/src/mame/drivers/renegade.c
@@ -573,7 +573,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( renegade )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -583,7 +583,7 @@ static INPUT_PORTS_START( renegade )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -593,7 +593,7 @@ static INPUT_PORTS_START( renegade )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("DSW2") /* DIP2 */
+ PORT_START("DSW2") /* DIP2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -607,7 +607,7 @@ static INPUT_PORTS_START( renegade )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("DSW1") /* DIP1 */
+ PORT_START("DSW1") /* DIP1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
diff --git a/src/mame/drivers/retofinv.c b/src/mame/drivers/retofinv.c
index 14ea393d0d0..2df9c4eb8db 100644
--- a/src/mame/drivers/retofinv.c
+++ b/src/mame/drivers/retofinv.c
@@ -162,7 +162,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( retofinv )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT )
@@ -172,7 +172,7 @@ static INPUT_PORTS_START( retofinv )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -182,7 +182,7 @@ static INPUT_PORTS_START( retofinv )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -192,7 +192,7 @@ static INPUT_PORTS_START( retofinv )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x03, "30k, 80k & every 80k" )
PORT_DIPSETTING( 0x02, "30k, 80k" )
@@ -216,7 +216,7 @@ static INPUT_PORTS_START( retofinv )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0f, DEF_STR( 9C_1C ) )
PORT_DIPSETTING( 0x0e, DEF_STR( 8C_1C ) )
@@ -252,7 +252,7 @@ static INPUT_PORTS_START( retofinv )
PORT_DIPSETTING( 0x60, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x70, DEF_STR( 1C_8C ) )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, "Push Start to Skip Stage (Cheat)")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c
index 5ac107b8f86..cad65feffa1 100644
--- a/src/mame/drivers/rmhaihai.c
+++ b/src/mame/drivers/rmhaihai.c
@@ -232,7 +232,7 @@ static ADDRESS_MAP_START( themj_writeport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( mjctrl )
- PORT_START_TAG("KEY0") // fake, handled by keyboard_r()
+ PORT_START("KEY0") // fake, handled by keyboard_r()
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_MAHJONG_SMALL )
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_MAHJONG_DOUBLE_UP )
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_MAHJONG_BIG )
@@ -250,7 +250,7 @@ static INPUT_PORTS_START( mjctrl )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_MAHJONG_H )
- PORT_START_TAG("KEY1") // fake, handled by keyboard_r()
+ PORT_START("KEY1") // fake, handled by keyboard_r()
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_MAHJONG_PON )
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_MAHJONG_D )
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_START1 )
@@ -268,7 +268,7 @@ static INPUT_PORTS_START( mjctrl )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
- PORT_START_TAG("KEY2") // fake, handled by keyboard_r()
+ PORT_START("KEY2") // fake, handled by keyboard_r()
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_MAHJONG_SMALL ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_MAHJONG_DOUBLE_UP ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_MAHJONG_BIG ) PORT_PLAYER(2)
@@ -287,7 +287,7 @@ static INPUT_PORTS_START( mjctrl )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_MAHJONG_H ) PORT_PLAYER(2)
- PORT_START_TAG("KEY3") // fake, handled by keyboard_r()
+ PORT_START("KEY3") // fake, handled by keyboard_r()
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_MAHJONG_PON ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_MAHJONG_D ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_START2 )
@@ -307,7 +307,7 @@ static INPUT_PORTS_START( mjctrl )
INPUT_PORTS_END
static INPUT_PORTS_START( rmhaihai )
- PORT_START_TAG("DSW2") /* dsw2 */
+ PORT_START("DSW2") /* dsw2 */
PORT_DIPNAME( 0x01, 0x01, "Unknown 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -321,7 +321,7 @@ static INPUT_PORTS_START( rmhaihai )
PORT_DIPSETTING( 0xfa, "7" )
PORT_DIPSETTING( 0xfc, "8 (Difficult)" )
- PORT_START_TAG("DSW1") /* dsw1 */
+ PORT_START("DSW1") /* dsw1 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Free_Play ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -348,7 +348,7 @@ static INPUT_PORTS_START( rmhaihai )
INPUT_PORTS_END
static INPUT_PORTS_START( rmhaihib )
- PORT_START_TAG("DSW2") /* dsw2 */
+ PORT_START("DSW2") /* dsw2 */
PORT_DIPNAME( 0x01, 0x01, "Unknown 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -373,7 +373,7 @@ static INPUT_PORTS_START( rmhaihib )
PORT_DIPSETTING( 0x20, "30%" )
PORT_DIPSETTING( 0x00, "20%" )
- PORT_START_TAG("DSW1") /* dsw1 */
+ PORT_START("DSW1") /* dsw1 */
PORT_DIPNAME( 0x03, 0x03, "Bet Max" )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x00, "2" )
@@ -399,7 +399,7 @@ static INPUT_PORTS_START( rmhaihib )
PORT_INCLUDE( mjctrl )
-// PORT_START_TAG("EXTRA") // 11
+// PORT_START("EXTRA") // 11
// PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Pay Out") PORT_CODE(KEYCODE_3)
// PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE4 ) /* RAM clear */
// PORT_SERVICE( 0x04, IP_ACTIVE_LOW )
diff --git a/src/mame/drivers/rockola.c b/src/mame/drivers/rockola.c
index b7138121d4d..fa80290755a 100644
--- a/src/mame/drivers/rockola.c
+++ b/src/mame/drivers/rockola.c
@@ -453,7 +453,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( rockola_generic_joy8way )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -463,7 +463,7 @@ static INPUT_PORTS_START( rockola_generic_joy8way )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -473,7 +473,7 @@ static INPUT_PORTS_START( rockola_generic_joy8way )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -483,7 +483,7 @@ static INPUT_PORTS_START( rockola_generic_joy8way )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:!1")
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -508,7 +508,7 @@ static INPUT_PORTS_START( rockola_generic_joy8way )
INPUT_PORTS_END
static INPUT_PORTS_START( satansat )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 )
@@ -518,18 +518,18 @@ static INPUT_PORTS_START( satansat )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x7c, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(rockola_music0_r, NULL) /* music0 playing */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_BIT( 0x0e, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* NC */
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(sasuke_count_r, NULL) /* connected to a binary counter */
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:!1")
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c
index a61e31fe08d..74176eeb615 100644
--- a/src/mame/drivers/rockrage.c
+++ b/src/mame/drivers/rockrage.c
@@ -154,7 +154,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( rockrage )
- PORT_START /* DSW #1 */
+ PORT_START("DSW1") /* DSW #1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -190,7 +190,7 @@ static INPUT_PORTS_START( rockrage )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START /* DSW #2 */
+ PORT_START("DSW2") /* DSW #2 */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -214,7 +214,7 @@ static INPUT_PORTS_START( rockrage )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* COINSW */
+ PORT_START("SYSTEM") /* COINSW */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 )
@@ -228,7 +228,7 @@ static INPUT_PORTS_START( rockrage )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START /* PLAYER 1 INPUTS */
+ PORT_START("P1") /* PLAYER 1 INPUTS */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -238,7 +238,7 @@ static INPUT_PORTS_START( rockrage )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* PLAYER 2 INPUTS */
+ PORT_START("P2") /* PLAYER 2 INPUTS */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/rocnrope.c b/src/mame/drivers/rocnrope.c
index 2b51dda6cf6..4cb7344c04c 100644
--- a/src/mame/drivers/rocnrope.c
+++ b/src/mame/drivers/rocnrope.c
@@ -61,7 +61,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( rocnrope )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -71,7 +71,7 @@ static INPUT_PORTS_START( rocnrope )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -81,7 +81,7 @@ static INPUT_PORTS_START( rocnrope )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
@@ -91,7 +91,7 @@ static INPUT_PORTS_START( rocnrope )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -129,7 +129,7 @@ static INPUT_PORTS_START( rocnrope )
/* 0x00 disables Coin 2. It still accepts coins and makes the sound, but
it doesn't give you any credit */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -159,7 +159,7 @@ static INPUT_PORTS_START( rocnrope )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x07, 0x07, "First Bonus" )
PORT_DIPSETTING( 0x07, "20000" )
PORT_DIPSETTING( 0x05, "30000" )
diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c
index 5aebf2fec7d..71f792b4cd1 100644
--- a/src/mame/drivers/rohga.c
+++ b/src/mame/drivers/rohga.c
@@ -349,7 +349,7 @@ ADDRESS_MAP_END
/**********************************************************************************/
static INPUT_PORTS_START( rohga )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -367,13 +367,13 @@ static INPUT_PORTS_START( rohga )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW1_2") /* Dip switch bank 1/2 */
+ PORT_START("DSW1_2") /* Dip switch bank 1/2 */
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) )
@@ -422,7 +422,7 @@ static INPUT_PORTS_START( rohga )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* Dip switch bank 3 */
+ PORT_START("DSW3") /* Dip switch bank 3 */
PORT_DIPNAME( 0x0001, 0x0001, "Stage Clear Bonus" ) /* Life Recovery At stage clear */
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -447,7 +447,7 @@ static INPUT_PORTS_START( rohga )
INPUT_PORTS_END
static INPUT_PORTS_START( wizdfire )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -465,13 +465,13 @@ static INPUT_PORTS_START( wizdfire )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW1_2") /* Dip switch bank 1/2 */
+ PORT_START("DSW1_2") /* Dip switch bank 1/2 */
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) )
@@ -520,7 +520,7 @@ static INPUT_PORTS_START( wizdfire )
INPUT_PORTS_END
static INPUT_PORTS_START( nitrobal )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -538,13 +538,13 @@ static INPUT_PORTS_START( nitrobal )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW1_2") /* Dip switch bank 1/2 */
+ PORT_START("DSW1_2") /* Dip switch bank 1/2 */
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) )
@@ -592,7 +592,7 @@ static INPUT_PORTS_START( nitrobal )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* Not really a DSW, but this way it's easier to read by tag */
+ PORT_START("DSW3") /* Not really a DSW, but this way it's easier to read by tag */
PORT_BIT( 0x1, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x2, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x4, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -604,7 +604,7 @@ static INPUT_PORTS_START( nitrobal )
INPUT_PORTS_END
static INPUT_PORTS_START( schmeisr )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -622,13 +622,13 @@ static INPUT_PORTS_START( schmeisr )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW1_2") /* Dip switch bank 1/2 */
+ PORT_START("DSW1_2") /* Dip switch bank 1/2 */
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) )
@@ -676,7 +676,7 @@ static INPUT_PORTS_START( schmeisr )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* Dip switch bank 3 - This bank of switches are _NOT_ shown in the test mode screen */
+ PORT_START("DSW3") /* Dip switch bank 3 - This bank of switches are _NOT_ shown in the test mode screen */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c
index 6b5d241d61b..488fc89fb8e 100644
--- a/src/mame/drivers/rollerg.c
+++ b/src/mame/drivers/rollerg.c
@@ -133,7 +133,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( rollerg )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
@@ -143,7 +143,7 @@ static INPUT_PORTS_START( rollerg )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
@@ -153,7 +153,7 @@ static INPUT_PORTS_START( rollerg )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -189,7 +189,7 @@ static INPUT_PORTS_START( rollerg )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Disabled" )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -212,7 +212,7 @@ static INPUT_PORTS_START( rollerg )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/rollrace.c b/src/mame/drivers/rollrace.c
index 0985a474480..381bbd771a8 100644
--- a/src/mame/drivers/rollrace.c
+++ b/src/mame/drivers/rollrace.c
@@ -92,7 +92,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( rollrace )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -102,7 +102,7 @@ static INPUT_PORTS_START( rollrace )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -112,7 +112,7 @@ static INPUT_PORTS_START( rollrace )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_HIGH,IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH,IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH,IPT_SERVICE1 )
@@ -126,7 +126,7 @@ static INPUT_PORTS_START( rollrace )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x07, DEF_STR( 6C_1C ) )
PORT_DIPSETTING( 0x06, DEF_STR( 3C_1C ) )
@@ -156,7 +156,7 @@ static INPUT_PORTS_START( rollrace )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) /* test mode, you are invulnerable */
PORT_DIPSETTING( 0x80, DEF_STR( On ) ) /* to 'static' objects */
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "3" )
diff --git a/src/mame/drivers/rotaryf.c b/src/mame/drivers/rotaryf.c
index f53d9423f9c..610aca0bd10 100644
--- a/src/mame/drivers/rotaryf.c
+++ b/src/mame/drivers/rotaryf.c
@@ -88,7 +88,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( rotaryf )
- PORT_START /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -98,10 +98,10 @@ static INPUT_PORTS_START( rotaryf )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
- PORT_START
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
@@ -111,7 +111,7 @@ static INPUT_PORTS_START( rotaryf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START /* DSW0 */
+ PORT_START("DSW") /* DSW0 */
PORT_DIPNAME( 0x81, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x81, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -139,7 +139,7 @@ static INPUT_PORTS_START( rotaryf )
// PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
// PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
- PORT_START /* Dummy port for cocktail mode */
+ PORT_START("COCKTAIL") /* Dummy port for cocktail mode */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
diff --git a/src/mame/drivers/route16.c b/src/mame/drivers/route16.c
index dd0e382f03b..3ca25c5fdc3 100644
--- a/src/mame/drivers/route16.c
+++ b/src/mame/drivers/route16.c
@@ -303,7 +303,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( route16 )
- PORT_START_TAG("DSW") /* DSW 1 */
+ PORT_START("DSW") /* DSW 1 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "5" )
@@ -328,7 +328,7 @@ static INPUT_PORTS_START( route16 )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("P1") /* Input Port 1 */
+ PORT_START("P1") /* Input Port 1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -338,7 +338,7 @@ static INPUT_PORTS_START( route16 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("P2") /* Input Port 2 */
+ PORT_START("P2") /* Input Port 2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
@@ -351,7 +351,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( stratvox )
- PORT_START_TAG("DSW") /* IN0 */
+ PORT_START("DSW") /* IN0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "5" )
@@ -376,7 +376,7 @@ static INPUT_PORTS_START( stratvox )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("P1") /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -385,7 +385,7 @@ static INPUT_PORTS_START( stratvox )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("P2") /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -397,7 +397,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( speakres )
- PORT_START_TAG("DSW") /* IN0 */
+ PORT_START("DSW") /* IN0 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -421,7 +421,7 @@ static INPUT_PORTS_START( speakres )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("P1") /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -430,7 +430,7 @@ static INPUT_PORTS_START( speakres )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("P2") /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -442,7 +442,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( spacecho )
- PORT_START_TAG("DSW") /* IN0 */
+ PORT_START("DSW") /* IN0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "5" )
@@ -467,7 +467,7 @@ static INPUT_PORTS_START( spacecho )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("P1") /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -476,7 +476,7 @@ static INPUT_PORTS_START( spacecho )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("P2") /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -488,7 +488,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( ttmahjng )
- PORT_START_TAG("DSW") /* IN0 */
+ PORT_START("DSW") /* IN0 */
PORT_DIPNAME( 0x01, 0x00, "Unknown 01" )
PORT_DIPSETTING( 0x00, "00" )
PORT_DIPSETTING( 0x01, "01" )
@@ -514,7 +514,7 @@ static INPUT_PORTS_START( ttmahjng )
PORT_DIPSETTING( 0x00, "00" )
PORT_DIPSETTING( 0x80, "80" )
- PORT_START_TAG("IN0") /* IN1 */
+ PORT_START("IN0") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -524,7 +524,7 @@ static INPUT_PORTS_START( ttmahjng )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("KEY0") /* IN2 */
+ PORT_START("KEY0") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
@@ -534,7 +534,7 @@ static INPUT_PORTS_START( ttmahjng )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY1") /* IN3 */
+ PORT_START("KEY1") /* IN3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
@@ -544,7 +544,7 @@ static INPUT_PORTS_START( ttmahjng )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY2") /* IN4 */
+ PORT_START("KEY2") /* IN4 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
@@ -554,7 +554,7 @@ static INPUT_PORTS_START( ttmahjng )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3") /* IN5 */
+ PORT_START("KEY3") /* IN5 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c
index 2615dd3eac1..cb04c96d707 100644
--- a/src/mame/drivers/royalmah.c
+++ b/src/mame/drivers/royalmah.c
@@ -846,7 +846,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mjctrl1 )
- PORT_START_TAG("KEY0") /* P1 IN0 */
+ PORT_START("KEY0") /* P1 IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
@@ -856,7 +856,7 @@ static INPUT_PORTS_START( mjctrl1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Credit Clear") PORT_CODE(KEYCODE_7)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Credit Clear") PORT_CODE(KEYCODE_8)
- PORT_START_TAG("KEY1") /* P1 IN1 */
+ PORT_START("KEY1") /* P1 IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
@@ -865,7 +865,7 @@ static INPUT_PORTS_START( mjctrl1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY2") /* P1 IN2 */
+ PORT_START("KEY2") /* P1 IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
@@ -873,14 +873,14 @@ static INPUT_PORTS_START( mjctrl1 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY3") /* P1 IN3 */
+ PORT_START("KEY3") /* P1 IN3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY4") /* P1 IN4 */
+ PORT_START("KEY4") /* P1 IN4 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
@@ -889,7 +889,7 @@ static INPUT_PORTS_START( mjctrl1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY5") /* P2 IN0 */
+ PORT_START("KEY5") /* P2 IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_PLAYER(2)
@@ -899,7 +899,7 @@ static INPUT_PORTS_START( mjctrl1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY6") /* P2 IN1 */
+ PORT_START("KEY6") /* P2 IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_PLAYER(2)
@@ -908,7 +908,7 @@ static INPUT_PORTS_START( mjctrl1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) PORT_PLAYER(2)
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY7") /* P2 IN2 */
+ PORT_START("KEY7") /* P2 IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) PORT_PLAYER(2)
@@ -916,14 +916,14 @@ static INPUT_PORTS_START( mjctrl1 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2)
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY8") /* P2 IN3 */
+ PORT_START("KEY8") /* P2 IN3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) PORT_PLAYER(2)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY9") /* P2 IN4 */
+ PORT_START("KEY9") /* P2 IN4 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) PORT_PLAYER(2)
@@ -932,7 +932,7 @@ static INPUT_PORTS_START( mjctrl1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) PORT_PLAYER(2)
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SYSTEM") /* IN10 */
+ PORT_START("SYSTEM") /* IN10 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
@@ -956,7 +956,7 @@ static INPUT_PORTS_START( royalmah )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // "COIN2"
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // "COIN1", but not working
- PORT_START_TAG("DSW1") /* DSW (inport $10) */
+ PORT_START("DSW1") /* DSW (inport $10) */
PORT_DIPNAME( 0x0f, 0x0f, "Pay Out Rate" )
PORT_DIPSETTING( 0x0f, "96%" )
PORT_DIPSETTING( 0x0e, "93%" )
@@ -990,7 +990,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( janyoup2 )
PORT_INCLUDE( royalmah )
- PORT_START_TAG("DSW2") /* DSW (inport $12) */
+ PORT_START("DSW2") /* DSW (inport $12) */
PORT_DIPNAME( 0x01, 0x01, "Unknown 1-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1016,7 +1016,7 @@ static INPUT_PORTS_START( janyoup2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* DSW (inport $13) */
+ PORT_START("DSW3") /* DSW (inport $13) */
PORT_DIPNAME( 0x01, 0x01, "Unknown 2-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1046,7 +1046,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( suzume )
PORT_INCLUDE( mjctrl2 )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x0f, 0x0f, "Pay Out Rate" )
PORT_DIPSETTING( 0x00, "50%" )
PORT_DIPSETTING( 0x01, "53%" )
@@ -1076,7 +1076,7 @@ static INPUT_PORTS_START( suzume )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x03, 0x03, "Winnings" )
PORT_DIPSETTING( 0x03, "50 30 15 8 5 3 2 1" )
PORT_DIPSETTING( 0x00, "50 30 20 15 8 6 3 2" )
@@ -1101,7 +1101,7 @@ static INPUT_PORTS_START( suzume )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* DSW3 */
+ PORT_START("DSW3") /* DSW3 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "4" )
@@ -1126,7 +1126,7 @@ static INPUT_PORTS_START( suzume )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW4") /* DSW4 */
+ PORT_START("DSW4") /* DSW4 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1153,7 +1153,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( tontonb )
PORT_INCLUDE( mjctrl2 )
- PORT_START_TAG("DSW1") /* DSW1 (inport $10 -> 0x73b0) */
+ PORT_START("DSW1") /* DSW1 (inport $10 -> 0x73b0) */
PORT_DIPNAME( 0x0f, 0x0f, "Pay Out Rate" )
PORT_DIPSETTING( 0x0f, "96%" )
PORT_DIPSETTING( 0x0e, "93%" )
@@ -1183,7 +1183,7 @@ static INPUT_PORTS_START( tontonb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* DSW3 (inport $47 -> 0x73b1) */
+ PORT_START("DSW3") /* DSW3 (inport $47 -> 0x73b1) */
PORT_DIPNAME( 0x03, 0x03, "Winnings" ) // check code at 0x0e6d
PORT_DIPSETTING( 0x00, "32 24 16 12 8 4 2 1" ) // table at 0x4e7d
PORT_DIPSETTING( 0x03, "50 30 15 8 5 3 2 1" ) // table at 0x4e4d
@@ -1207,7 +1207,7 @@ static INPUT_PORTS_START( tontonb )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* DSW2 (inport $46 -> 0x73b2) */
+ PORT_START("DSW2") /* DSW2 (inport $46 -> 0x73b2) */
PORT_DIPNAME( 0x01, 0x00, "Special Combinations" ) // see notes
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1237,7 +1237,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mjdiplob )
PORT_INCLUDE( mjctrl2 )
- PORT_START_TAG("DSW1") /* DSW1 (inport $10 -> 0x76fa) */
+ PORT_START("DSW1") /* DSW1 (inport $10 -> 0x76fa) */
PORT_DIPNAME( 0x0f, 0x0f, "Pay Out Rate" )
PORT_DIPSETTING( 0x0f, "96%" )
PORT_DIPSETTING( 0x0e, "93%" )
@@ -1267,7 +1267,7 @@ static INPUT_PORTS_START( mjdiplob )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* DSW2 (inport $62 -> 0x76fb) */
+ PORT_START("DSW2") /* DSW2 (inport $62 -> 0x76fb) */
PORT_DIPNAME( 0x03, 0x03, "Winnings" ) // check code at 0x09cd
PORT_DIPSETTING( 0x00, "32 24 16 12 8 4 2 1" ) // table at 0x4b82
PORT_DIPSETTING( 0x03, "50 30 15 8 5 3 2 1" ) // table at 0x4b52
@@ -1291,7 +1291,7 @@ static INPUT_PORTS_START( mjdiplob )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* DSW3 (inport $63 -> 0x76fc) */
+ PORT_START("DSW3") /* DSW3 (inport $63 -> 0x76fc) */
PORT_DIPNAME( 0x01, 0x00, "Special Combinations" ) // see notes
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1321,7 +1321,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( majs101b )
PORT_INCLUDE( mjctrl2 )
- PORT_START_TAG("DSW1") /* DSW1 (inport $10 -> 0x76fd) */
+ PORT_START("DSW1") /* DSW1 (inport $10 -> 0x76fd) */
PORT_DIPNAME( 0x0f, 0x0f, "Pay Out Rate" )
PORT_DIPSETTING( 0x0f, "96%" )
PORT_DIPSETTING( 0x0e, "93%" )
@@ -1351,7 +1351,7 @@ static INPUT_PORTS_START( majs101b )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* DSW2 (inport $00 (after out 0,$40) -> 0x76fa) */
+ PORT_START("DSW2") /* DSW2 (inport $00 (after out 0,$40) -> 0x76fa) */
PORT_DIPNAME( 0x03, 0x03, "Winnings" ) // check code at 0x14e4
PORT_DIPSETTING( 0x00, "32 24 16 12 8 4 2 1" ) // table at 0x1539
PORT_DIPSETTING( 0x03, "50 30 15 8 5 3 2 1" ) // table at 0x1509
@@ -1376,7 +1376,7 @@ static INPUT_PORTS_START( majs101b )
PORT_DIPSETTING( 0x00, "Black" )
PORT_DIPSETTING( 0x80, "Gray" )
- PORT_START_TAG("DSW3") /* DSW3 (inport $00 (after out 0,$00) -> 0x76fc) */
+ PORT_START("DSW3") /* DSW3 (inport $00 (after out 0,$00) -> 0x76fc) */
PORT_DIPNAME( 0x01, 0x00, "Special Combinations" ) // see notes
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1402,7 +1402,7 @@ static INPUT_PORTS_START( majs101b )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW4") /* DSW4 (inport $00 (after out 0,$20) -> 0x76fb) */
+ PORT_START("DSW4") /* DSW4 (inport $00 (after out 0,$20) -> 0x76fb) */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Unknown ) ) // stored at 0x702f - check code at 0x1713,
PORT_DIPSETTING( 0x00, "0" ) // 0x33d1, 0x3408, 0x3415, 0x347c, 0x3492, 0x350d,
PORT_DIPSETTING( 0x01, "1" ) // 0x4af9, 0x4b1f and 0x61f6
@@ -1429,7 +1429,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mjapinky )
PORT_INCLUDE( mjctrl2 )
- PORT_START_TAG("DSW1") /* IN11 */
+ PORT_START("DSW1") /* IN11 */
PORT_DIPNAME( 0x01, 0x01, "Unknown 1-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1454,7 +1454,7 @@ static INPUT_PORTS_START( mjapinky )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* IN12 */
+ PORT_START("DSW2") /* IN12 */
PORT_DIPNAME( 0x03, 0x03, "Unknown 2-0&1" )
PORT_DIPSETTING( 0x03, "0" )
PORT_DIPSETTING( 0x02, "1" )
@@ -1477,7 +1477,7 @@ static INPUT_PORTS_START( mjapinky )
PORT_DIPSETTING( 0x40, "2" )
PORT_DIPSETTING( 0x00, "3" )
- PORT_START_TAG("DSW3") /* IN13 */
+ PORT_START("DSW3") /* IN13 */
PORT_DIPNAME( 0x01, 0x01, "Unknown 3-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1507,7 +1507,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( janptr96 )
PORT_INCLUDE( mjctrl1 )
- PORT_START_TAG("DSW4") /* IN11 */
+ PORT_START("DSW4") /* IN11 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1533,7 +1533,7 @@ static INPUT_PORTS_START( janptr96 )
PORT_DIPSETTING( 0x80, "Start" )
PORT_DIPSETTING( 0x00, "Flip/Flop" )
- PORT_START_TAG("DSW3") /* IN12 */
+ PORT_START("DSW3") /* IN12 */
PORT_DIPNAME( 0x07, 0x07, "YAKUMAN Bonus" )
PORT_DIPSETTING( 0x07, "Cut" )
PORT_DIPSETTING( 0x06, "1 T" )
@@ -1558,7 +1558,7 @@ static INPUT_PORTS_START( janptr96 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* IN13 */
+ PORT_START("DSW2") /* IN13 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
@@ -1581,7 +1581,7 @@ static INPUT_PORTS_START( janptr96 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* IN14 */
+ PORT_START("DSW1") /* IN14 */
PORT_DIPNAME( 0x0f, 0x0f, "Pay Out Rate" )
PORT_DIPSETTING( 0x0f, "96%" )
PORT_DIPSETTING( 0x0e, "93%" )
@@ -1610,7 +1610,7 @@ static INPUT_PORTS_START( janptr96 )
PORT_DIPSETTING( 0x80, "5" )
PORT_DIPSETTING( 0xc0, "1" )
- PORT_START_TAG("DSWTOP") /* IN15 */
+ PORT_START("DSWTOP") /* IN15 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1640,7 +1640,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mjifb )
PORT_INCLUDE( mjctrl2 )
- PORT_START_TAG("PORT3_5") // IN10 - DSW1 (P3 & P5)
+ PORT_START("PORT3_5") // IN10 - DSW1 (P3 & P5)
PORT_DIPNAME( 0x0f, 0x07, "Pay Out Rate" )
PORT_DIPSETTING( 0x0f, "96%" )
PORT_DIPSETTING( 0x0e, "93%" )
@@ -1669,7 +1669,7 @@ static INPUT_PORTS_START( mjifb )
PORT_DIPSETTING( 0x40, "3" )
PORT_DIPSETTING( 0x00, "4" )
- PORT_START_TAG("PORT6_7") // IN11 - DSW2 (P6 & P7)
+ PORT_START("PORT6_7") // IN11 - DSW2 (P6 & P7)
PORT_DIPNAME( 0x03, 0x03, "Winnings" )
PORT_DIPSETTING( 0x03, "32 24 16 12 8 4 2 1" )
PORT_DIPSETTING( 0x00, "50 30 15 8 5 3 2 1" )
@@ -1694,7 +1694,7 @@ static INPUT_PORTS_START( mjifb )
PORT_DIPSETTING( 0x00, "1/4" )
PORT_DIPSETTING( 0x80, "2/4" )
- PORT_START_TAG("DSW3") // IN13 - DSW3 ($8200)
+ PORT_START("DSW3") // IN13 - DSW3 ($8200)
PORT_DIPNAME( 0x01, 0x01, "Unknown 3-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1720,7 +1720,7 @@ static INPUT_PORTS_START( mjifb )
PORT_DIPSETTING( 0x80, "Black" )
PORT_DIPSETTING( 0x00, "Blue" )
- PORT_START_TAG("DSW4") // IN14 - DSW4 ($8000)
+ PORT_START("DSW4") // IN14 - DSW4 ($8000)
PORT_DIPNAME( 0x01, 0x01, "Unknown 4-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1750,7 +1750,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mjtensin )
PORT_INCLUDE( mjctrl1 )
- PORT_START_TAG("DSW4") /* IN11 */
+ PORT_START("DSW4") /* IN11 */
PORT_DIPNAME( 0x0f, 0x0f, "Pay Out Rate" )
PORT_DIPSETTING( 0x0f, "96%" )
PORT_DIPSETTING( 0x0e, "93%" )
@@ -1779,7 +1779,7 @@ static INPUT_PORTS_START( mjtensin )
PORT_DIPSETTING( 0x40, "10" )
PORT_DIPSETTING( 0x00, "20" )
- PORT_START_TAG("DSW3") /* IN12 */
+ PORT_START("DSW3") /* IN12 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
@@ -1802,7 +1802,7 @@ static INPUT_PORTS_START( mjtensin )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* IN13 */
+ PORT_START("DSW2") /* IN13 */
PORT_DIPNAME( 0x03, 0x03, "YAKUMAN Bonus" )
PORT_DIPSETTING( 0x03, "Cut" )
PORT_DIPSETTING( 0x02, "500" )
@@ -1825,7 +1825,7 @@ static INPUT_PORTS_START( mjtensin )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* IN14 */
+ PORT_START("DSW1") /* IN14 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1851,7 +1851,7 @@ static INPUT_PORTS_START( mjtensin )
PORT_DIPSETTING( 0x80, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
- PORT_START_TAG("DSWTOP") /* IN15 */
+ PORT_START("DSWTOP") /* IN15 */
PORT_DIPNAME( 0x01, 0x01, "Credits Per Note" )
PORT_DIPSETTING( 0x01, "5" )
PORT_DIPSETTING( 0x00, "10" )
@@ -1881,7 +1881,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( cafetime )
PORT_INCLUDE( mjctrl2 )
- PORT_START_TAG("DSW1") /* IN11 */
+ PORT_START("DSW1") /* IN11 */
PORT_DIPNAME( 0x0f, 0x07, "Pay Out Rate" )
PORT_DIPSETTING( 0x0f, "96%" )
PORT_DIPSETTING( 0x0e, "93%" )
@@ -1910,7 +1910,7 @@ static INPUT_PORTS_START( cafetime )
PORT_DIPSETTING( 0x40, "3" )
PORT_DIPSETTING( 0x00, "4" )
- PORT_START_TAG("DSW2") /* IN12 */
+ PORT_START("DSW2") /* IN12 */
PORT_DIPNAME( 0x03, 0x03, "Winnings" )
PORT_DIPSETTING( 0x03, "32 24 16 12 8 4 2 1" )
PORT_DIPSETTING( 0x00, "50 30 15 8 5 3 2 1" )
@@ -1934,7 +1934,7 @@ static INPUT_PORTS_START( cafetime )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* IN13 */
+ PORT_START("DSW3") /* IN13 */
PORT_DIPNAME( 0x01, 0x01, "Unknown 3-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1960,7 +1960,7 @@ static INPUT_PORTS_START( cafetime )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW4") /* IN14 */
+ PORT_START("DSW4") /* IN14 */
PORT_DIPNAME( 0x01, 0x01, "Unknown 4-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1986,7 +1986,7 @@ static INPUT_PORTS_START( cafetime )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWTOP") /* IN15 */
+ PORT_START("DSWTOP") /* IN15 */
PORT_DIPNAME( 0x01, 0x01, "Credits Per Note" )
PORT_DIPSETTING( 0x01, "5" )
PORT_DIPSETTING( 0x00, "10" )
@@ -2020,7 +2020,7 @@ static INPUT_PORTS_START( ippatsu )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // "COIN1", but not working
- PORT_START_TAG("DSW1") /* DSW (inport $10) */
+ PORT_START("DSW1") /* DSW (inport $10) */
PORT_DIPNAME( 0x0f, 0x0f, "Pay Out Rate" )
PORT_DIPSETTING( 0x0f, "96%" )
PORT_DIPSETTING( 0x0e, "93%" )
@@ -2050,7 +2050,7 @@ static INPUT_PORTS_START( ippatsu )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START_TAG("DSW2") /* DSW (inport $12) */
+ PORT_START("DSW2") /* DSW (inport $12) */
PORT_DIPNAME( 0x03, 0x03, "Cut" )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x02, "2 Bai" )
@@ -2073,7 +2073,7 @@ static INPUT_PORTS_START( ippatsu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* DSW (inport $13) */
+ PORT_START("DSW3") /* DSW (inport $13) */
PORT_DIPNAME( 0x01, 0x01, "Unknown 2-0*" )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x01, DEF_STR( Yes ) )
@@ -2102,7 +2102,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mjdejavu )
PORT_INCLUDE( mjctrl2 )
- PORT_START_TAG("PORT3_5") // IN11 - DSW3 (P3 & P5)
+ PORT_START("PORT3_5") // IN11 - DSW3 (P3 & P5)
PORT_DIPNAME( 0x03, 0x03, "Unknown 3-0&1*" )
PORT_DIPSETTING( 0x00, "1 1" )
PORT_DIPSETTING( 0x02, "3 4" )
@@ -2127,7 +2127,7 @@ static INPUT_PORTS_START( mjdejavu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("PORT6_7") // IN12 - DSW4 (P6 & P7)
+ PORT_START("PORT6_7") // IN12 - DSW4 (P6 & P7)
PORT_DIPNAME( 0x01, 0x01, "Unknown 4-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2153,7 +2153,7 @@ static INPUT_PORTS_START( mjdejavu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1") // IN13 - DSW1 ($8001)
+ PORT_START("DSW1") // IN13 - DSW1 ($8001)
PORT_DIPNAME( 0x0f, 0x07, "Pay Out Rate" )
PORT_DIPSETTING( 0x0f, "96%" )
PORT_DIPSETTING( 0x0e, "93%" )
@@ -2183,7 +2183,7 @@ static INPUT_PORTS_START( mjdejavu )
PORT_DIPSETTING( 0x80, "Gray" )
PORT_DIPSETTING( 0x00, "Black" )
- PORT_START_TAG("DSW2") // IN14 - DSW2 ($8000)
+ PORT_START("DSW2") // IN14 - DSW2 ($8000)
PORT_DIPNAME( 0x03, 0x03, "Winnings" )
PORT_DIPSETTING( 0x00, "32 24 16 12 8 4 2 1" )
PORT_DIPSETTING( 0x03, "50 30 15 8 5 3 2 1" )
diff --git a/src/mame/drivers/rpunch.c b/src/mame/drivers/rpunch.c
index a6325743aad..4d11951d1ec 100644
--- a/src/mame/drivers/rpunch.c
+++ b/src/mame/drivers/rpunch.c
@@ -303,7 +303,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( rpunch )
- PORT_START_TAG("P1") /* c0018 lower 8 bits */
+ PORT_START("P1") /* c0018 lower 8 bits */
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -312,7 +312,7 @@ static INPUT_PORTS_START( rpunch )
PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0xffc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("P2") /* c001a lower 8 bits */
+ PORT_START("P2") /* c001a lower 8 bits */
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -321,7 +321,7 @@ static INPUT_PORTS_START( rpunch )
PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0xffc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("SERVICE") /* c0018/c001a upper 8 bits */
+ PORT_START("SERVICE") /* c0018/c001a upper 8 bits */
PORT_BIT( 0x00ff, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_SERVICE ) /* Hold F2 at bootup */
@@ -332,7 +332,7 @@ static INPUT_PORTS_START( rpunch )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW") /* c001c DIP switches */
+ PORT_START("DSW") /* c001c DIP switches */
PORT_DIPNAME( 0x000f, 0x0000, DEF_STR( Coin_A )) PORT_DIPLOCATION("SWA:1,2,3,4")
PORT_DIPSETTING( 0x000d, DEF_STR( 3C_1C ))
PORT_DIPSETTING( 0x000c, DEF_STR( 2C_1C ))
diff --git a/src/mame/drivers/runaway.c b/src/mame/drivers/runaway.c
index 75ba880e4da..7c92abd5b29 100644
--- a/src/mame/drivers/runaway.c
+++ b/src/mame/drivers/runaway.c
@@ -116,7 +116,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( qwak )
- PORT_START_TAG("3000D7") /* 3000 D7 */
+ PORT_START("3000D7") /* 3000 D7 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -126,7 +126,7 @@ static INPUT_PORTS_START( qwak )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN3 )
- PORT_START_TAG("3000D6") /* 3000 D6 */
+ PORT_START("3000D6") /* 3000 D6 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
@@ -136,7 +136,7 @@ static INPUT_PORTS_START( qwak )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("4000") /* 4000 */
+ PORT_START("4000") /* 4000 */
PORT_DIPNAME( 0x01, 0x00, "DIP 1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ))
@@ -162,13 +162,13 @@ static INPUT_PORTS_START( qwak )
PORT_DIPSETTING( 0x80, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ))
- PORT_START_TAG("6008") /* 6008 not used */
- PORT_START_TAG("7000") /* 7000 not used */
+ PORT_START("6008") /* 6008 not used */
+ PORT_START("7000") /* 7000 not used */
INPUT_PORTS_END
static INPUT_PORTS_START( runaway )
- PORT_START_TAG("3000D7") /* 3000 D7 */
+ PORT_START("3000D7") /* 3000 D7 */
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_TILT )
@@ -178,7 +178,7 @@ static INPUT_PORTS_START( runaway )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN3 )
- PORT_START_TAG("3000D6") /* 3000 D6 */
+ PORT_START("3000D6") /* 3000 D6 */
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -188,7 +188,7 @@ static INPUT_PORTS_START( runaway )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("4000") /* 4000 */
+ PORT_START("4000") /* 4000 */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ))
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ))
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ))
@@ -212,7 +212,7 @@ static INPUT_PORTS_START( runaway )
PORT_DIPSETTING( 0x80, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ))
- PORT_START_TAG("6008") /* 6008 */
+ PORT_START("6008") /* 6008 */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ))
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "3" )
@@ -236,7 +236,7 @@ static INPUT_PORTS_START( runaway )
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x80, DEF_STR( On ))
- PORT_START_TAG("7000") /* 7000 */
+ PORT_START("7000") /* 7000 */
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_TOGGLE
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c
index e07e77a9b8b..7aecc9dda7e 100644
--- a/src/mame/drivers/rungun.c
+++ b/src/mame/drivers/rungun.c
@@ -373,7 +373,7 @@ static MACHINE_DRIVER_START( rng )
MACHINE_DRIVER_END
static INPUT_PORTS_START( rng )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -389,7 +389,7 @@ static INPUT_PORTS_START( rng )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM ready (always 1) */
PORT_SERVICE_NO_TOGGLE( 0x08, IP_ACTIVE_LOW )
@@ -409,7 +409,7 @@ static INPUT_PORTS_START( rng )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -419,7 +419,7 @@ static INPUT_PORTS_START( rng )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -429,7 +429,7 @@ static INPUT_PORTS_START( rng )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
@@ -439,7 +439,7 @@ static INPUT_PORTS_START( rng )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START_TAG("P4")
+ PORT_START("P4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
diff --git a/src/mame/drivers/safarir.c b/src/mame/drivers/safarir.c
index 8af7984a152..d89331b6046 100644
--- a/src/mame/drivers/safarir.c
+++ b/src/mame/drivers/safarir.c
@@ -219,7 +219,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( safarir )
- PORT_START /* IN0 */
+ PORT_START("INPUTS") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
@@ -229,7 +229,7 @@ static INPUT_PORTS_START( safarir )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* DSW0 */
+ PORT_START("DSW") /* DSW0 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c
index f42e944bdab..ab587380481 100644
--- a/src/mame/drivers/sandscrp.c
+++ b/src/mame/drivers/sandscrp.c
@@ -284,7 +284,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( sandscrp )
- PORT_START // IN0 - $b00000.w
+ PORT_START("P1") // IN0 - $b00000.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -293,10 +293,9 @@ static INPUT_PORTS_START( sandscrp )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START // IN1 - $b00002.w
+ PORT_START("P2") // IN1 - $b00002.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -305,10 +304,9 @@ static INPUT_PORTS_START( sandscrp )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START // IN2 - $b00004.w
+ PORT_START("SYSTEM") // IN2 - $b00004.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -317,13 +315,12 @@ static INPUT_PORTS_START( sandscrp )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START // IN3 - $b00006.w
+ PORT_START("UNK") // IN3 - $b00006.w
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START // IN4 - DSW 1 read by the Z80 through the sound chip
+ PORT_START("DSW1") // IN4 - DSW 1 read by the Z80 through the sound chip
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x02, "1" )
PORT_DIPSETTING( 0x01, "2" )
@@ -345,7 +342,7 @@ static INPUT_PORTS_START( sandscrp )
PORT_DIPSETTING( 0x40, "500K, 1000K" )
PORT_DIPSETTING( 0x00, "1000K, 3000K" )
- PORT_START // IN5 - DSW 2 read by the Z80 through the sound chip
+ PORT_START("DSW2") // IN5 - DSW 2 read by the Z80 through the sound chip
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0a, DEF_STR( 6C_1C ) )
PORT_DIPSETTING( 0x0b, DEF_STR( 5C_1C ) )
diff --git a/src/mame/drivers/sangho.c b/src/mame/drivers/sangho.c
index 3e276f052c4..f2310eb20ab 100644
--- a/src/mame/drivers/sangho.c
+++ b/src/mame/drivers/sangho.c
@@ -121,7 +121,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( sangho )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -137,7 +137,7 @@ static INPUT_PORTS_START( sangho )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -153,7 +153,7 @@ static INPUT_PORTS_START( sangho )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, "DIPS" ) /* coinage etc. */
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/sauro.c b/src/mame/drivers/sauro.c
index d85ef13ee19..3ce355c36b4 100644
--- a/src/mame/drivers/sauro.c
+++ b/src/mame/drivers/sauro.c
@@ -230,7 +230,7 @@ static ADDRESS_MAP_START( trckydoc_writemem, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( tecfri )
- PORT_START /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -240,7 +240,7 @@ static INPUT_PORTS_START( tecfri )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
- PORT_START /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -250,7 +250,7 @@ static INPUT_PORTS_START( tecfri )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
- PORT_START
+ PORT_START("DSW1")
PORT_SERVICE( 0x01, IP_ACTIVE_HIGH )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -273,7 +273,7 @@ static INPUT_PORTS_START( tecfri )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/sbasketb.c b/src/mame/drivers/sbasketb.c
index 47b3f9a7331..c4247630318 100644
--- a/src/mame/drivers/sbasketb.c
+++ b/src/mame/drivers/sbasketb.c
@@ -100,7 +100,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( sbasketb )
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -110,7 +110,7 @@ static INPUT_PORTS_START( sbasketb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -120,7 +120,7 @@ static INPUT_PORTS_START( sbasketb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -130,7 +130,7 @@ static INPUT_PORTS_START( sbasketb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* DSW0 */
+ PORT_START("DSW1") /* DSW0 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Game_Time ) )
PORT_DIPSETTING( 0x03, "30" )
PORT_DIPSETTING( 0x01, "40" )
@@ -154,7 +154,7 @@ static INPUT_PORTS_START( sbasketb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW1 */
+ PORT_START("DSW2") /* DSW1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c
index 21a8b9d2149..dddb535fcb3 100644
--- a/src/mame/drivers/sbowling.c
+++ b/src/mame/drivers/sbowling.c
@@ -203,22 +203,22 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( sbowling )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_TILT )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
- PORT_START_TAG("TRACKY")
+ PORT_START("TRACKY")
PORT_BIT( 0xff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30)
- PORT_START_TAG("TRACKX")
+ PORT_START("TRACKX")
PORT_BIT( 0xff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_REVERSE
- PORT_START_TAG("DSW0") /* coin slots: A 4 LSB, B 4 MSB */
+ PORT_START("DSW0") /* coin slots: A 4 LSB, B 4 MSB */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -244,7 +244,7 @@ static INPUT_PORTS_START( sbowling )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c
index 743ca1db011..5bffc6fca1f 100644
--- a/src/mame/drivers/sbrkout.c
+++ b/src/mame/drivers/sbrkout.c
@@ -359,7 +359,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( sbrkout )
- PORT_START_TAG("DIPS")
+ PORT_START("DIPS")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Language ) )
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
PORT_DIPSETTING( 0x01, DEF_STR( German ) )
@@ -400,29 +400,29 @@ static INPUT_PORTS_START( sbrkout )
PORT_DIPSETTING( 0x80, "3" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN2 )
- PORT_START_TAG("START")
+ PORT_START("START")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_TILT )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("SERVE")
+ PORT_START("SERVE")
PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 )
- PORT_START_TAG("PADDLE")
+ PORT_START("PADDLE")
PORT_BIT( 0xff, 0x00, IPT_PADDLE ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_CENTERDELTA(0)
- PORT_START_TAG("SELECT") /* IN6 - fake port, used to set the game select dial */
+ PORT_START("SELECT") /* IN6 - fake port, used to set the game select dial */
PORT_CONFNAME( 0x03, 0x00, "Game Select" )
PORT_CONFSETTING( 0x00, "Progressive" )
PORT_CONFSETTING( 0x02, "Double" )
diff --git a/src/mame/drivers/sbugger.c b/src/mame/drivers/sbugger.c
index acfb1d04e1e..14e7ee9f64a 100644
--- a/src/mame/drivers/sbugger.c
+++ b/src/mame/drivers/sbugger.c
@@ -163,7 +163,7 @@ GFXDECODE_END
/* input ports */
static INPUT_PORTS_START( sbugger )
- PORT_START /* 8-bit */
+ PORT_START("INPUTS") /* 8-bit */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_2WAY
PORT_DIPNAME( 0x02, 0x02, "PA 1" )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -177,7 +177,7 @@ static INPUT_PORTS_START( sbugger )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* 8-bit */
+ PORT_START("DSW1") /* 8-bit */
PORT_DIPNAME( 0x01, 0x01, "PB 0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -201,12 +201,12 @@ static INPUT_PORTS_START( sbugger )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START /* 6-bit */
+ PORT_START("DSW2") /* 6-bit */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Difficulty ) ) //enemy speed
PORT_DIPSETTING( 0x00, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x01, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x02, DEF_STR( Hard ) )
- PORT_DIPSETTING( 0x03, DEF_STR( Hardest ) )
+ PORT_DIPSETTING( 0x03, DEF_STR( Hardest ) )
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Allow_Continue ) )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
diff --git a/src/mame/drivers/scobra.c b/src/mame/drivers/scobra.c
index 43c27be6c50..65c6ad02798 100644
--- a/src/mame/drivers/scobra.c
+++ b/src/mame/drivers/scobra.c
@@ -452,7 +452,7 @@ static ADDRESS_MAP_START( hustlerb_sound_writeport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
#define SCOBRA_IN0\
- PORT_START_TAG("IN0")\
+ PORT_START("IN0")\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )\
@@ -463,7 +463,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
#define SCOBRA_IN1\
- PORT_START_TAG("IN1")\
+ PORT_START("IN1")\
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Allow_Continue ) )\
PORT_DIPSETTING( 0x00, DEF_STR( No ) )\
PORT_DIPSETTING( 0x01, DEF_STR( Yes ) )\
@@ -478,7 +478,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
#define SCOBRA_IN2\
- PORT_START_TAG("IN2")\
+ PORT_START("IN2")\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL\
PORT_DIPNAME( 0x06, 0x02, DEF_STR( Coinage ) )\
PORT_DIPSETTING( 0x04, DEF_STR( 2C_1C ) )\
@@ -503,7 +503,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( scobras )
SCOBRA_IN0
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Allow_Continue ) )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x01, DEF_STR( Yes ) )
@@ -523,7 +523,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( stratgyx )
SCOBRA_IN0
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -536,7 +536,7 @@ SCOBRA_IN0
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x06, IP_ACTIVE_LOW, IPT_SPECIAL ) /* lower 2 coinage DIPs */
PORT_DIPNAME( 0x08, 0x00, DEF_STR( Cabinet ) )
@@ -547,7 +547,7 @@ SCOBRA_IN0
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x03, IP_ACTIVE_LOW, IPT_SPECIAL ) /* upper 2 coinage DIPs */
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) /* none of these appear to be used */
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -568,7 +568,7 @@ SCOBRA_IN0
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN4") /* fake coinage DIPs. read via IN2 and IN3 */
+ PORT_START("IN4") /* fake coinage DIPs. read via IN2 and IN3 */
PORT_DIPNAME( 0x0f, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0a, "A 2/1 B 1/3" )
/*PORT_DIPSETTING( 0x02, "A 2/1 B 1/3" )*/
@@ -592,7 +592,7 @@ INPUT_PORTS_END
/* cocktail mode is N/A */
static INPUT_PORTS_START( darkplnt )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) // and START1
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) // and START2
@@ -602,7 +602,7 @@ static INPUT_PORTS_START( darkplnt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, "Bonus Occurrence" )
PORT_DIPSETTING( 0x01, "Once" )
PORT_DIPSETTING( 0x00, "Every" )
@@ -611,7 +611,7 @@ static INPUT_PORTS_START( darkplnt )
PORT_DIPSETTING( 0x02, "5" )
PORT_BIT( 0xfc, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) /* scrambled dial */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x06, 0x02, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) )
@@ -628,7 +628,7 @@ static INPUT_PORTS_START( darkplnt )
INPUT_PORTS_END
static INPUT_PORTS_START( tazmania )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -638,7 +638,7 @@ static INPUT_PORTS_START( tazmania )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
@@ -652,7 +652,7 @@ static INPUT_PORTS_START( tazmania )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_DIPNAME( 0x06, 0x02, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) )
@@ -677,7 +677,7 @@ INPUT_PORTS_END
/* cocktail mode not working due to bug in game code */
static INPUT_PORTS_START( anteater )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -687,7 +687,7 @@ static INPUT_PORTS_START( anteater )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
@@ -701,7 +701,7 @@ static INPUT_PORTS_START( anteater )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_DIPNAME( 0x06, 0x02, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) )
@@ -724,7 +724,7 @@ static INPUT_PORTS_START( anteater )
INPUT_PORTS_END
static INPUT_PORTS_START( anteatg )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, "Coin A 1/1 Coin B 1/5" )
@@ -743,7 +743,7 @@ static INPUT_PORTS_START( anteatg )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -759,7 +759,7 @@ static INPUT_PORTS_START( anteatg )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -775,7 +775,7 @@ static INPUT_PORTS_START( anteatg )
INPUT_PORTS_END
static INPUT_PORTS_START( anteatgb )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -789,7 +789,7 @@ static INPUT_PORTS_START( anteatgb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -805,7 +805,7 @@ static INPUT_PORTS_START( anteatgb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, "Coin A 1/1 Coin B 1/5" )
@@ -827,7 +827,7 @@ INPUT_PORTS_END
/* cocktail mode is N/A */
static INPUT_PORTS_START( rescue )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_DIPNAME( 0x02, 0x02, "Starting Level" )
PORT_DIPSETTING( 0x02, "1" )
@@ -839,7 +839,7 @@ static INPUT_PORTS_START( rescue )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
@@ -857,7 +857,7 @@ static INPUT_PORTS_START( rescue )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_DIPNAME( 0x06, 0x02, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) )
@@ -881,7 +881,7 @@ INPUT_PORTS_END
/* cocktail mode is N/A */
static INPUT_PORTS_START( minefld )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_DIPNAME( 0x02, 0x02, "Starting Level" )
PORT_DIPSETTING( 0x02, "1" )
@@ -893,7 +893,7 @@ static INPUT_PORTS_START( minefld )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
@@ -911,7 +911,7 @@ static INPUT_PORTS_START( minefld )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) )
@@ -935,7 +935,7 @@ INPUT_PORTS_END
/* cocktail mode is N/A */
static INPUT_PORTS_START( losttomb )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_8WAY
@@ -945,7 +945,7 @@ static INPUT_PORTS_START( losttomb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x02, "5" )
@@ -960,7 +960,7 @@ static INPUT_PORTS_START( losttomb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -988,7 +988,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( hustler )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -998,7 +998,7 @@ static INPUT_PORTS_START( hustler )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x01, "2" )
@@ -1012,7 +1012,7 @@ static INPUT_PORTS_START( hustler )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_DIPNAME( 0x06, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x04, DEF_STR( 3C_1C ) )
@@ -1029,7 +1029,7 @@ static INPUT_PORTS_START( hustler )
INPUT_PORTS_END
#define MM_COMMON1\
- PORT_START_TAG("IN0")\
+ PORT_START("IN0")\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )\
@@ -1040,7 +1040,7 @@ INPUT_PORTS_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
#define MM_COMMON2\
- PORT_START_TAG("IN2")\
+ PORT_START("IN2")\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)\
PORT_DIPNAME( 0x06, 0x00, DEF_STR( Coinage ) )\
PORT_DIPSETTING( 0x06, DEF_STR( 3C_1C ) )\
@@ -1062,7 +1062,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mimonkey )
MM_COMMON1
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -1083,7 +1083,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mimonsco )
MM_COMMON1
- PORT_START /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x01, "2" )
diff --git a/src/mame/drivers/scotrsht.c b/src/mame/drivers/scotrsht.c
index 9090ac34182..9930e588b30 100644
--- a/src/mame/drivers/scotrsht.c
+++ b/src/mame/drivers/scotrsht.c
@@ -77,7 +77,7 @@ static ADDRESS_MAP_START( scotrsht_sound_port, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( scotrsht )
- PORT_START /* IN0 - $3300 */
+ PORT_START("SYSTEM") /* IN0 - $3300 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -85,7 +85,7 @@ static INPUT_PORTS_START( scotrsht )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN1 - $3301 */
+ PORT_START("P1") /* IN1 - $3301 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -94,7 +94,7 @@ static INPUT_PORTS_START( scotrsht )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN2 - $3302 */
+ PORT_START("P2") /* IN2 - $3302 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -103,7 +103,7 @@ static INPUT_PORTS_START( scotrsht )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* DSW0 - $3303 */
+ PORT_START("DSW1") /* DSW0 - $3303 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -139,7 +139,7 @@ static INPUT_PORTS_START( scotrsht )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START /* DSW1 - $3100 */
+ PORT_START("DSW2") /* DSW1 - $3100 */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -163,7 +163,7 @@ static INPUT_PORTS_START( scotrsht )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW2 - $3200 */
+ PORT_START("DSW3") /* DSW2 - $3200 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/scramble.c b/src/mame/drivers/scramble.c
index 53f8008e151..cf7962a13c6 100644
--- a/src/mame/drivers/scramble.c
+++ b/src/mame/drivers/scramble.c
@@ -475,7 +475,7 @@ static ADDRESS_MAP_START( hunchbks_readport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( scramble )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -485,7 +485,7 @@ static INPUT_PORTS_START( scramble )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:2,1")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -498,7 +498,7 @@ static INPUT_PORTS_START( scramble )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_DIPNAME( 0x06, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:5,4")
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -515,7 +515,7 @@ static INPUT_PORTS_START( scramble )
INPUT_PORTS_END
static INPUT_PORTS_START( 800fath )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -525,7 +525,7 @@ static INPUT_PORTS_START( 800fath )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:5,6")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -538,7 +538,7 @@ static INPUT_PORTS_START( 800fath )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_DIPNAME( 0x06, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:2,3")
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -555,7 +555,7 @@ static INPUT_PORTS_START( 800fath )
INPUT_PORTS_END
static INPUT_PORTS_START( explorer )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -565,7 +565,7 @@ static INPUT_PORTS_START( explorer )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -585,7 +585,7 @@ static INPUT_PORTS_START( explorer )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x08, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x09, DEF_STR( 2C_2C ) )
@@ -621,7 +621,7 @@ static INPUT_PORTS_START( explorer )
PORT_DIPSETTING( 0x60, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x70, DEF_STR( 1C_8C ) )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "3" )
@@ -646,7 +646,7 @@ static INPUT_PORTS_START( explorer )
INPUT_PORTS_END
static INPUT_PORTS_START( strfbomb )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -656,7 +656,7 @@ static INPUT_PORTS_START( strfbomb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -669,7 +669,7 @@ static INPUT_PORTS_START( strfbomb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_DIPNAME( 0x06, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, "A 1/2 B 4/1 C 1/2" )
@@ -686,7 +686,7 @@ static INPUT_PORTS_START( strfbomb )
INPUT_PORTS_END
static INPUT_PORTS_START( atlantis )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
@@ -696,7 +696,7 @@ static INPUT_PORTS_START( atlantis )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -710,7 +710,7 @@ static INPUT_PORTS_START( atlantis )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_DIPNAME( 0x0e, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, "A 1/3 B 2/1" )
@@ -724,7 +724,7 @@ static INPUT_PORTS_START( atlantis )
INPUT_PORTS_END
static INPUT_PORTS_START( theend )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -734,7 +734,7 @@ static INPUT_PORTS_START( theend )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -747,7 +747,7 @@ static INPUT_PORTS_START( theend )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x06, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x04, DEF_STR( 3C_1C ) )
@@ -761,7 +761,7 @@ static INPUT_PORTS_START( theend )
INPUT_PORTS_END
static INPUT_PORTS_START( froggers )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* 1P shoot2 - unused */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -771,7 +771,7 @@ static INPUT_PORTS_START( froggers )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "5" )
@@ -784,7 +784,7 @@ static INPUT_PORTS_START( froggers )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_DIPNAME( 0x06, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, "A 2/1 B 2/1 C 2/1" )
@@ -801,7 +801,7 @@ static INPUT_PORTS_START( froggers )
INPUT_PORTS_END
static INPUT_PORTS_START( amidars )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* 1P shoot2 - unused */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -811,7 +811,7 @@ static INPUT_PORTS_START( amidars )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -824,7 +824,7 @@ static INPUT_PORTS_START( amidars )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, "A 1/1 B 1/6" )
@@ -848,7 +848,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( turpins )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably space for button 2 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -858,7 +858,7 @@ static INPUT_PORTS_START( turpins )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -871,7 +871,7 @@ static INPUT_PORTS_START( turpins )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_DIPNAME( 0x06, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, "A 1/1 B 2/1 C 1/1" )
@@ -892,7 +892,7 @@ static INPUT_PORTS_START( turpins )
INPUT_PORTS_END
static INPUT_PORTS_START( triplep )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -902,7 +902,7 @@ static INPUT_PORTS_START( triplep )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -915,7 +915,7 @@ static INPUT_PORTS_START( triplep )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_DIPNAME( 0x06, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, "A 1/2 B 1/1 C 1/2" )
@@ -934,7 +934,7 @@ static INPUT_PORTS_START( triplep )
INPUT_PORTS_END
static INPUT_PORTS_START( ckongs )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
@@ -944,7 +944,7 @@ static INPUT_PORTS_START( ckongs )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
/* the coinage dip switch is spread across bits 0/1 of port 1 and bit 3 of port 2. */
/* To handle that, we swap bits 0/1 of port 1 and bits 1/2 of port 2 - this is handled */
/* by ckongs_input_port_N_r() */
@@ -961,7 +961,7 @@ static INPUT_PORTS_START( ckongs )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
/* the coinage dip switch is spread across bits 0/1 of port 1 and bit 3 of port 2. */
/* To handle that, we swap bits 0/1 of port 1 and bits 1/2 of port 2 - this is handled */
/* by ckongs_input_port_N_r() */
@@ -982,7 +982,7 @@ static INPUT_PORTS_START( ckongs )
INPUT_PORTS_END
static INPUT_PORTS_START( mars )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_8WAY
@@ -992,7 +992,7 @@ static INPUT_PORTS_START( mars )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_5C ) )
@@ -1006,7 +1006,7 @@ static INPUT_PORTS_START( mars )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_8WAY PORT_PLAYER(2) /* this also control cocktail mode */
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
@@ -1022,7 +1022,7 @@ static INPUT_PORTS_START( mars )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_UP ) PORT_8WAY
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x1f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1030,7 +1030,7 @@ static INPUT_PORTS_START( mars )
INPUT_PORTS_END
static INPUT_PORTS_START( devilfsh )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1040,7 +1040,7 @@ static INPUT_PORTS_START( devilfsh )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x00, "10000" )
PORT_DIPSETTING( 0x01, "15000" )
@@ -1054,7 +1054,7 @@ static INPUT_PORTS_START( devilfsh )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "4" )
@@ -1072,7 +1072,7 @@ static INPUT_PORTS_START( devilfsh )
INPUT_PORTS_END
static INPUT_PORTS_START( newsin7 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1082,7 +1082,7 @@ static INPUT_PORTS_START( newsin7 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, " A 1C/1C B 2C/1C" )
PORT_DIPSETTING( 0x01, " A 1C/3C B 3C/1C" )
@@ -1095,7 +1095,7 @@ static INPUT_PORTS_START( newsin7 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x02, DEF_STR( Upright ) )
@@ -1113,7 +1113,7 @@ static INPUT_PORTS_START( newsin7 )
INPUT_PORTS_END
static INPUT_PORTS_START( mrkougar )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x03, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -1122,7 +1122,7 @@ static INPUT_PORTS_START( mrkougar )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_5C ) )
@@ -1136,7 +1136,7 @@ static INPUT_PORTS_START( mrkougar )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
@@ -1151,7 +1151,7 @@ static INPUT_PORTS_START( mrkougar )
INPUT_PORTS_END
static INPUT_PORTS_START( hotshock )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 )
@@ -1159,7 +1159,7 @@ static INPUT_PORTS_START( hotshock )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -1169,7 +1169,7 @@ static INPUT_PORTS_START( hotshock )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x08, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x09, DEF_STR( 2C_2C ) )
@@ -1205,7 +1205,7 @@ static INPUT_PORTS_START( hotshock )
PORT_DIPSETTING( 0x60, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x70, DEF_STR( 1C_8C ) )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "3" )
@@ -1231,7 +1231,7 @@ static INPUT_PORTS_START( hotshock )
INPUT_PORTS_END
static INPUT_PORTS_START( hunchbks )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1241,7 +1241,7 @@ static INPUT_PORTS_START( hunchbks )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
@@ -1255,7 +1255,7 @@ static INPUT_PORTS_START( hunchbks )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_DIPNAME( 0x06, 0x00, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x00, "10000" )
@@ -1270,12 +1270,12 @@ static INPUT_PORTS_START( hunchbks )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* protection check? */
- PORT_START_TAG("SENSE")
+ PORT_START("SENSE")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
INPUT_PORTS_END
static INPUT_PORTS_START( hncholms )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1285,7 +1285,7 @@ static INPUT_PORTS_START( hncholms )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
@@ -1299,7 +1299,7 @@ static INPUT_PORTS_START( hncholms )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_DIPNAME( 0x06, 0x00, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x00, "10000" )
@@ -1314,12 +1314,12 @@ static INPUT_PORTS_START( hncholms )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* protection check? */
- PORT_START_TAG("SENSE")
+ PORT_START("SENSE")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
INPUT_PORTS_END
static INPUT_PORTS_START( cavelon )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* force UR controls in CK mode? */
@@ -1329,7 +1329,7 @@ static INPUT_PORTS_START( cavelon )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -1343,7 +1343,7 @@ static INPUT_PORTS_START( cavelon )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_DIPNAME( 0x06, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "5" )
@@ -1360,7 +1360,7 @@ static INPUT_PORTS_START( cavelon )
INPUT_PORTS_END
static INPUT_PORTS_START( sfx )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) // "Fire" left
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1370,7 +1370,7 @@ static INPUT_PORTS_START( sfx )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x02, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -1383,7 +1383,7 @@ static INPUT_PORTS_START( sfx )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_DIPNAME( 0x06, 0x06, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
@@ -1401,7 +1401,7 @@ INPUT_PORTS_END
/* Same as 'mimonkey' (scobra.c driver) */
static INPUT_PORTS_START( mimonscr )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1411,7 +1411,7 @@ static INPUT_PORTS_START( mimonscr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -1424,7 +1424,7 @@ static INPUT_PORTS_START( mimonscr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_DIPNAME( 0x06, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x06, DEF_STR( 3C_1C ) )
@@ -1445,7 +1445,7 @@ static INPUT_PORTS_START( mimonscr )
INPUT_PORTS_END
static INPUT_PORTS_START( scorpion )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1455,7 +1455,7 @@ static INPUT_PORTS_START( scorpion )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3")
PORT_DIPSETTING( 0x02, "4" )
@@ -1468,7 +1468,7 @@ static INPUT_PORTS_START( scorpion )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x02, DEF_STR( Upright ) )
@@ -1494,7 +1494,7 @@ static INPUT_PORTS_START( ad2083 )
* 400F in turn is only read just before Player 2 turn. If 400F=1 then flip line
* is set. That is all. If there is a dedicated player 2 input,
* it must be multiplexed by flip line. */
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
@@ -1504,7 +1504,7 @@ static INPUT_PORTS_START( ad2083 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN2 )
@@ -1514,7 +1514,7 @@ static INPUT_PORTS_START( ad2083 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START
+ PORT_START("IN2")
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x08, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x09, DEF_STR( 2C_2C ) )
@@ -1550,7 +1550,7 @@ static INPUT_PORTS_START( ad2083 )
PORT_DIPSETTING( 0x60, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x70, DEF_STR( 1C_8C ) )
- PORT_START
+ PORT_START("IN3")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
diff --git a/src/mame/drivers/scregg.c b/src/mame/drivers/scregg.c
index 6e144f72bdf..c9942d0c6f5 100644
--- a/src/mame/drivers/scregg.c
+++ b/src/mame/drivers/scregg.c
@@ -126,7 +126,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( scregg )
- PORT_START /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -136,7 +136,7 @@ static INPUT_PORTS_START( scregg )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
@@ -146,7 +146,7 @@ static INPUT_PORTS_START( scregg )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -168,7 +168,7 @@ static INPUT_PORTS_START( scregg )
PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x00, "5" )
diff --git a/src/mame/drivers/sderby.c b/src/mame/drivers/sderby.c
index 1ecfbbee2b6..068720c7d47 100644
--- a/src/mame/drivers/sderby.c
+++ b/src/mame/drivers/sderby.c
@@ -165,7 +165,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( sderby )
- PORT_START_TAG("IN0") /* 0x308000.w */
+ PORT_START("IN0") /* 0x308000.w */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -185,7 +185,7 @@ static INPUT_PORTS_START( sderby )
INPUT_PORTS_END
static INPUT_PORTS_START( pmroulet )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ?
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_VBLANK ) // it must be toggled to boot anyway
PORT_SERVICE_NO_TOGGLE(0x0020, IP_ACTIVE_LOW) // seems to be ..
@@ -193,14 +193,14 @@ static INPUT_PORTS_START( pmroulet )
PORT_BIT( 0x0f00, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ?
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ?
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x000e, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ?
PORT_BIT( 0x00f0, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ?
PORT_BIT( 0x0f00, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ?
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ?
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
diff --git a/src/mame/drivers/seattle.c b/src/mame/drivers/seattle.c
index cc6211613c7..cc5fbb0f9f5 100644
--- a/src/mame/drivers/seattle.c
+++ b/src/mame/drivers/seattle.c
@@ -1756,7 +1756,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( seattle_common )
- PORT_START_TAG("DIPS")
+ PORT_START("DIPS")
PORT_DIPNAME( 0x0001, 0x0001, "Unknown0001" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
@@ -1806,7 +1806,7 @@ static INPUT_PORTS_START( seattle_common )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -1823,7 +1823,7 @@ static INPUT_PORTS_START( seattle_common )
PORT_BIT( 0x6000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BILL1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1841,7 +1841,7 @@ static INPUT_PORTS_START( seattle_common )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -1931,28 +1931,28 @@ static INPUT_PORTS_START( sfrush )
PORT_MODIFY("IN2")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN0")
+ PORT_START("AN0")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN3")
+ PORT_START("AN3")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN4")
+ PORT_START("AN4")
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(20) PORT_PLAYER(1)
- PORT_START_TAG("AN5")
+ PORT_START("AN5")
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(100) PORT_PLAYER(2)
- PORT_START_TAG("AN6")
+ PORT_START("AN6")
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(100) PORT_PLAYER(3)
- PORT_START_TAG("AN7")
+ PORT_START("AN7")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(5)
INPUT_PORTS_END
@@ -2006,28 +2006,28 @@ static INPUT_PORTS_START( calspeed )
PORT_MODIFY("IN2")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN0")
+ PORT_START("AN0")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(5)
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(20) PORT_PLAYER(1)
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(100) PORT_PLAYER(2)
- PORT_START_TAG("AN3")
+ PORT_START("AN3")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN4")
+ PORT_START("AN4")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN5")
+ PORT_START("AN5")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN6")
+ PORT_START("AN6")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN7")
+ PORT_START("AN7")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
INPUT_PORTS_END
@@ -2065,28 +2065,28 @@ static INPUT_PORTS_START( vaportrx )
PORT_MODIFY("IN2")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN0")
+ PORT_START("AN0")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN3")
+ PORT_START("AN3")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN4")
+ PORT_START("AN4")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN5")
+ PORT_START("AN5")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN6")
+ PORT_START("AN6")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN7")
+ PORT_START("AN7")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
INPUT_PORTS_END
@@ -2309,19 +2309,19 @@ static INPUT_PORTS_START( carnevil )
PORT_MODIFY("IN2")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("LIGHT0_X") /* fake analog X */
+ PORT_START("LIGHT0_X") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("LIGHT0_Y") /* fake analog Y */
+ PORT_START("LIGHT0_Y") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10)
- PORT_START_TAG("LIGHT1_X") /* fake analog X */
+ PORT_START("LIGHT1_X") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("LIGHT1_Y") /* fake analog Y */
+ PORT_START("LIGHT1_Y") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("FAKE") /* fake switches */
+ PORT_START("FAKE") /* fake switches */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
@@ -2410,33 +2410,33 @@ static INPUT_PORTS_START( hyprdriv )
PORT_MODIFY("IN2")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN0")
+ PORT_START("AN0")
PORT_BIT( 0x00ff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(25)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(20) PORT_PLAYER(1)
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(100) PORT_PLAYER(2)
- PORT_START_TAG("AN3")
+ PORT_START("AN3")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(25)
- PORT_START_TAG("AN4")
+ PORT_START("AN4")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN5")
+ PORT_START("AN5")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN6")
+ PORT_START("AN6")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN7")
+ PORT_START("AN7")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
/* 2008-06 FP: is this ever read?? */
- PORT_START_TAG("AN8")
+ PORT_START("AN8")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
INPUT_PORTS_END
diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c
index ab00476937e..50d26dd664d 100644
--- a/src/mame/drivers/segac2.c
+++ b/src/mame/drivers/segac2.c
@@ -680,7 +680,7 @@ ADDRESS_MAP_END
******************************************************************************/
static INPUT_PORTS_START( systemc_generic )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -690,7 +690,7 @@ static INPUT_PORTS_START( systemc_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
@@ -700,15 +700,15 @@ static INPUT_PORTS_START( systemc_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
- PORT_START_TAG("PORTC")
+ PORT_START("PORTC")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SPECIAL ) /* From uPD7759 pin 18. (/BUSY output) */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) /* From MB3773P pin 1. (/RESET output) */
- PORT_START_TAG("PORTD")
+ PORT_START("PORTD")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
@@ -718,7 +718,7 @@ static INPUT_PORTS_START( systemc_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("COINAGE")
+ PORT_START("COINAGE")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -754,7 +754,7 @@ static INPUT_PORTS_START( systemc_generic )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x00, "Free Play (if Coin A too) or 1/1" )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -780,7 +780,7 @@ static INPUT_PORTS_START( systemc_generic )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("PORTH")
+ PORT_START("PORTH")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c
index 86a5009f706..11f7c468b82 100644
--- a/src/mame/drivers/segae.c
+++ b/src/mame/drivers/segae.c
@@ -1535,11 +1535,11 @@ MACHINE_RESET(sms)
static INPUT_PORTS_START( transfrm ) /* Used By Transformer */
- PORT_START_TAG("DSW0") /* Read from Port 0xf2 */
+ PORT_START("DSW0") /* Read from Port 0xf2 */
SEGA_COIN_A
SEGA_COIN_B
- PORT_START_TAG("DSW1") /* Read from Port 0xf3 */
+ PORT_START("DSW1") /* Read from Port 0xf3 */
PORT_DIPNAME( 0x01, 0x00, "1 Player Only" ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1562,7 +1562,7 @@ static INPUT_PORTS_START( transfrm ) /* Used By Transformer */
PORT_DIPSETTING( 0x80, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_START_TAG("IN0") /* Read from Port 0xe0 */
+ PORT_START("IN0") /* Read from Port 0xe0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW)
@@ -1572,7 +1572,7 @@ static INPUT_PORTS_START( transfrm ) /* Used By Transformer */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1") /* Read from Port 0xe1 */
+ PORT_START("IN1") /* Read from Port 0xe1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -1584,11 +1584,11 @@ static INPUT_PORTS_START( transfrm ) /* Used By Transformer */
INPUT_PORTS_END
static INPUT_PORTS_START( fantzn2 ) /* Used By Fantasy Zone 2 */
- PORT_START_TAG("DSW0") /* Read from Port 0xf2 */
+ PORT_START("DSW0") /* Read from Port 0xf2 */
SEGA_COIN_A
SEGA_COIN_B
- PORT_START_TAG("DSW1") /* Read from Port 0xf3 */
+ PORT_START("DSW1") /* Read from Port 0xf3 */
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW2:1" )
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:2")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -1609,7 +1609,7 @@ static INPUT_PORTS_START( fantzn2 ) /* Used By Fantasy Zone 2 */
PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_START_TAG("IN0") /* Read from Port 0xe0 */
+ PORT_START("IN0") /* Read from Port 0xe0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW)
@@ -1619,7 +1619,7 @@ static INPUT_PORTS_START( fantzn2 ) /* Used By Fantasy Zone 2 */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1") /* Read from Port 0xe1 */
+ PORT_START("IN1") /* Read from Port 0xe1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -1631,11 +1631,11 @@ static INPUT_PORTS_START( fantzn2 ) /* Used By Fantasy Zone 2 */
INPUT_PORTS_END
static INPUT_PORTS_START( opaopa ) /* Used By Opa Opa */
- PORT_START_TAG("DSW0") /* Read from Port 0xf2 */
+ PORT_START("DSW0") /* Read from Port 0xf2 */
SEGA_COIN_A
SEGA_COIN_B
- PORT_START_TAG("DSW1") /* Read from Port 0xf3 */
+ PORT_START("DSW1") /* Read from Port 0xf3 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1658,7 +1658,7 @@ static INPUT_PORTS_START( opaopa ) /* Used By Opa Opa */
PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_START_TAG("IN0") /* Read from Port 0xe0 */
+ PORT_START("IN0") /* Read from Port 0xe0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW)
@@ -1668,7 +1668,7 @@ static INPUT_PORTS_START( opaopa ) /* Used By Opa Opa */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1") /* Read from Port 0xe1 */
+ PORT_START("IN1") /* Read from Port 0xe1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1678,7 +1678,7 @@ static INPUT_PORTS_START( opaopa ) /* Used By Opa Opa */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* Read from Port 0xe2 */
+ PORT_START("IN2") /* Read from Port 0xe2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1691,11 +1691,11 @@ INPUT_PORTS_END
static INPUT_PORTS_START( tetrisse ) /* Used By Tetris */
- PORT_START_TAG("DSW0") /* Read from Port 0xf2 */
+ PORT_START("DSW0") /* Read from Port 0xf2 */
SEGA_COIN_A
SEGA_COIN_B
- PORT_START_TAG("DSW1") /* Read from Port 0xf3 */
+ PORT_START("DSW1") /* Read from Port 0xf3 */
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW2:1" )
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:2")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -1710,7 +1710,7 @@ static INPUT_PORTS_START( tetrisse ) /* Used By Tetris */
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW2:7" )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW2:8" )
- PORT_START_TAG("IN0") /* Read from Port 0xe0 */
+ PORT_START("IN0") /* Read from Port 0xe0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW)
@@ -1720,7 +1720,7 @@ static INPUT_PORTS_START( tetrisse ) /* Used By Tetris */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1") /* Read from Port 0xe1 */
+ PORT_START("IN1") /* Read from Port 0xe1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -1733,11 +1733,11 @@ INPUT_PORTS_END
static INPUT_PORTS_START( hangonjr ) /* Used By Hang On Jr */
- PORT_START_TAG("DSW0") /* Read from Port 0xf2 */
+ PORT_START("DSW0") /* Read from Port 0xf2 */
SEGA_COIN_A
SEGA_COIN_B
- PORT_START_TAG("DSW1") /* Read from Port 0xf3 */
+ PORT_START("DSW1") /* Read from Port 0xf3 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:1") /* Supose to be demo sound but has no effect */
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1755,7 +1755,7 @@ static INPUT_PORTS_START( hangonjr ) /* Used By Hang On Jr */
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW2:7" )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW2:8" )
- PORT_START_TAG("IN0") /* Read from Port 0xe0 */
+ PORT_START("IN0") /* Read from Port 0xe0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW)
@@ -1765,7 +1765,7 @@ static INPUT_PORTS_START( hangonjr ) /* Used By Hang On Jr */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* Read from Port 0xe1 */
+ PORT_START("IN1") /* Read from Port 0xe1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1775,21 +1775,21 @@ static INPUT_PORTS_START( hangonjr ) /* Used By Hang On Jr */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* Read from Port 0xf8 */
+ PORT_START("IN2") /* Read from Port 0xf8 */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x20,0xe0) PORT_SENSITIVITY(100) PORT_KEYDELTA(4)
- PORT_START_TAG("IN3") /* Read from Port 0xf8 */
+ PORT_START("IN3") /* Read from Port 0xf8 */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(20)
INPUT_PORTS_END
static INPUT_PORTS_START( ridleofp ) /* Used By Riddle Of Pythagoras */
- PORT_START_TAG("DSW0") /* Read from Port 0xf2 */
+ PORT_START("DSW0") /* Read from Port 0xf2 */
SEGA_COIN_A
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
SEGA_COIN_B
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
- PORT_START_TAG("DSW1") /* Read from Port 0xf3 */
+ PORT_START("DSW1") /* Read from Port 0xf3 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -1807,7 +1807,7 @@ static INPUT_PORTS_START( ridleofp ) /* Used By Riddle Of Pythagoras */
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW2:8" )
- PORT_START_TAG("IN0") /* Read from Port 0xe0 */
+ PORT_START("IN0") /* Read from Port 0xe0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1817,7 +1817,7 @@ static INPUT_PORTS_START( ridleofp ) /* Used By Riddle Of Pythagoras */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Would Be IPT_START2 but the code doesn't use it
- PORT_START_TAG("IN1") /* Port 0xe1 */
+ PORT_START("IN1") /* Port 0xe1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1827,14 +1827,14 @@ static INPUT_PORTS_START( ridleofp ) /* Used By Riddle Of Pythagoras */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* Read from Port 0xf8 */
+ PORT_START("IN2") /* Read from Port 0xf8 */
PORT_BIT( 0x0fff, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(60) PORT_KEYDELTA(125)
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* is this used in the game? */
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* Read from Port 0xf8 */
+ PORT_START("IN3") /* Read from Port 0xf8 */
PORT_BIT( 0x0fff, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(60) PORT_KEYDELTA(125) PORT_COCKTAIL
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/segag80r.c b/src/mame/drivers/segag80r.c
index e8842b207a2..5a2803d371c 100644
--- a/src/mame/drivers/segag80r.c
+++ b/src/mame/drivers/segag80r.c
@@ -422,7 +422,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( g80r_generic )
- PORT_START_TAG("D7D6")
+ PORT_START("D7D6")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(3) /* P1.5 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) /* n/c */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) /* n/c */
@@ -432,7 +432,7 @@ static INPUT_PORTS_START( g80r_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* P1.14 */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* n/c */
- PORT_START_TAG("D5D4")
+ PORT_START("D5D4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) /* P1.10 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 ) /* P1.15 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) /* P1.16 */
@@ -442,7 +442,7 @@ static INPUT_PORTS_START( g80r_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* P1.20 */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* P1.21 */
- PORT_START_TAG("D3D2")
+ PORT_START("D3D2")
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW1:8" ) /* Listed as "Unused" (astrob) */
PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "SW1:7" ) /* Listed as "Unused" (astrob) */
PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "SW1:6" ) /* Listed as "Unused" (astrob) */
@@ -452,7 +452,7 @@ static INPUT_PORTS_START( g80r_generic )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW1:2" ) /* Listed as "Unused" (astrob) */
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW1:1" ) /* Listed as "Unused" (astrob) */
- PORT_START_TAG("D1D0")
+ PORT_START("D1D0")
PORT_DIPNAME( 0x0f, 0x03, DEF_STR( Coin_A )) PORT_DIPLOCATION("SW2:8,7,6,5")
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ))
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ))
@@ -488,7 +488,7 @@ static INPUT_PORTS_START( g80r_generic )
PORT_DIPSETTING( 0x70, DEF_STR( 1C_5C ))
PORT_DIPSETTING( 0x80, DEF_STR( 1C_6C ))
- PORT_START_TAG("FC")
+ PORT_START("FC")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) /* P1.23 */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED ) /* P1.24 */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED ) /* P1.25 */
@@ -498,7 +498,7 @@ static INPUT_PORTS_START( g80r_generic )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) /* P1.29 */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) /* P1.30 */
- PORT_START_TAG("SERVICESW")
+ PORT_START("SERVICESW")
PORT_SERVICE_NO_TOGGLE( 0x01, IP_ACTIVE_HIGH ) PORT_CHANGED(service_switch, 0)
INPUT_PORTS_END
diff --git a/src/mame/drivers/segag80v.c b/src/mame/drivers/segag80v.c
index dfb0f0a6e73..aaa5a7d2992 100644
--- a/src/mame/drivers/segag80v.c
+++ b/src/mame/drivers/segag80v.c
@@ -427,7 +427,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( g80v_generic )
- PORT_START_TAG("D7D6")
+ PORT_START("D7D6")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(3) /* P1.5 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) /* n/c */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) /* n/c */
@@ -437,7 +437,7 @@ static INPUT_PORTS_START( g80v_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* P1.14 */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* n/c */
- PORT_START_TAG("D5D4")
+ PORT_START("D5D4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) /* P1.10 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 ) /* P1.15 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) /* P1.16 */
@@ -447,7 +447,7 @@ static INPUT_PORTS_START( g80v_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* P1.20 */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* P1.21 */
- PORT_START_TAG("D3D2")
+ PORT_START("D3D2")
PORT_DIPUNKNOWN_DIPLOC( 0x01, 0x01, "SW1:8" )
PORT_DIPUNKNOWN_DIPLOC( 0x02, 0x02, "SW1:7" )
PORT_DIPUNKNOWN_DIPLOC( 0x04, 0x04, "SW1:6" )
@@ -457,7 +457,7 @@ static INPUT_PORTS_START( g80v_generic )
PORT_DIPUNKNOWN_DIPLOC( 0x40, 0x04, "SW1:2" )
PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x08, "SW1:1" )
- PORT_START_TAG("D1D0")
+ PORT_START("D1D0")
PORT_DIPNAME( 0x0f, 0x03, DEF_STR( Coin_A )) PORT_DIPLOCATION("SW2:8,7,6,5")
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ))
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ))
@@ -493,7 +493,7 @@ static INPUT_PORTS_START( g80v_generic )
PORT_DIPSETTING( 0x70, DEF_STR( 1C_5C ))
PORT_DIPSETTING( 0x80, DEF_STR( 1C_6C ))
- PORT_START_TAG("FC")
+ PORT_START("FC")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) /* P1.23 */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED ) /* P1.24 */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED ) /* P1.25 */
@@ -503,7 +503,7 @@ static INPUT_PORTS_START( g80v_generic )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) /* P1.29 */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) /* P1.30 */
- PORT_START_TAG("SERVICESW")
+ PORT_START("SERVICESW")
PORT_SERVICE_NO_TOGGLE( 0x01, IP_ACTIVE_HIGH ) PORT_CHANGED(service_switch, 0)
INPUT_PORTS_END
@@ -638,7 +638,7 @@ static INPUT_PORTS_START( elim4 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(3)
- PORT_START_TAG("COINS")
+ PORT_START("COINS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(1)
@@ -725,7 +725,7 @@ static INPUT_PORTS_START( zektor )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON2 )
- PORT_START_TAG("SPINNER")
+ PORT_START("SPINNER")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(3) PORT_RESET
INPUT_PORTS_END
@@ -766,7 +766,7 @@ static INPUT_PORTS_START( tacscan )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON2 )
- PORT_START_TAG("SPINNER")
+ PORT_START("SPINNER")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_RESET
INPUT_PORTS_END
@@ -810,7 +810,7 @@ static INPUT_PORTS_START( startrek )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON3 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON4 )
- PORT_START_TAG("SPINNER")
+ PORT_START("SPINNER")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_RESET
INPUT_PORTS_END
diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c
index f0d2fde5097..5c459d390ea 100644
--- a/src/mame/drivers/segahang.c
+++ b/src/mame/drivers/segahang.c
@@ -496,7 +496,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( hangon_generic )
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
@@ -506,7 +506,7 @@ static INPUT_PORTS_START( hangon_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("COINAGE")
+ PORT_START("COINAGE")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -542,7 +542,7 @@ static INPUT_PORTS_START( hangon_generic )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x00, "Free Play (if Coin A too) or 1/1" )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -568,13 +568,13 @@ static INPUT_PORTS_START( hangon_generic )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("UNKNOWN")
+ PORT_START("UNKNOWN")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( sharrier_generic )
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
@@ -584,10 +584,10 @@ static INPUT_PORTS_START( sharrier_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("UNKNOWN")
+ PORT_START("UNKNOWN")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("COINAGE")
+ PORT_START("COINAGE")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -623,7 +623,7 @@ static INPUT_PORTS_START( sharrier_generic )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x00, "Free Play (if Coin A too) or 1/1" )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -679,13 +679,13 @@ static INPUT_PORTS_START( hangon )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x20, DEF_STR( On ) )
- PORT_START_TAG("ADC0") /* steering */
+ PORT_START("ADC0") /* steering */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x20,0xe0) PORT_SENSITIVITY(100) PORT_KEYDELTA(4) PORT_REVERSE
- PORT_START_TAG("ADC1") /* gas pedal */
+ PORT_START("ADC1") /* gas pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20)
- PORT_START_TAG("ADC2") /* brake */
+ PORT_START("ADC2") /* brake */
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(100) PORT_KEYDELTA(40)
INPUT_PORTS_END
@@ -711,13 +711,13 @@ static INPUT_PORTS_START( shangupb )
PORT_DIPSETTING( 0x08, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_START_TAG("ADC0") /* steering */
+ PORT_START("ADC0") /* steering */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x20,0xe0) PORT_SENSITIVITY(100) PORT_KEYDELTA(4) PORT_REVERSE
- PORT_START_TAG("ADC1") /* gas pedal */
+ PORT_START("ADC1") /* gas pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20)
- PORT_START_TAG("ADC2") /* brake */
+ PORT_START("ADC2") /* brake */
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(100) PORT_KEYDELTA(40)
INPUT_PORTS_END
@@ -754,10 +754,10 @@ static INPUT_PORTS_START( sharrier )
PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_START_TAG("ADC0") /* X axis */
+ PORT_START("ADC0") /* X axis */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0x20,0xe0) PORT_SENSITIVITY(100) PORT_KEYDELTA(4) PORT_REVERSE
- PORT_START_TAG("ADC1") /* Y axis */
+ PORT_START("ADC1") /* Y axis */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(0x60,0xa0) PORT_SENSITIVITY(100) PORT_KEYDELTA(4) PORT_REVERSE
INPUT_PORTS_END
@@ -792,16 +792,16 @@ static INPUT_PORTS_START( enduror )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("ADC0") /* gas pedal */
+ PORT_START("ADC0") /* gas pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20)
- PORT_START_TAG("ADC1") /* brake */
+ PORT_START("ADC1") /* brake */
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(100) PORT_KEYDELTA(40)
- PORT_START_TAG("ADC2") /* bank up/down */
+ PORT_START("ADC2") /* bank up/down */
PORT_BIT( 0xff, 0x20, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(4)
- PORT_START_TAG("ADC3") /* steering */
+ PORT_START("ADC3") /* steering */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0x01,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(4) PORT_REVERSE
INPUT_PORTS_END
diff --git a/src/mame/drivers/segald.c b/src/mame/drivers/segald.c
index 52fe9a2a39a..b916ca564af 100644
--- a/src/mame/drivers/segald.c
+++ b/src/mame/drivers/segald.c
@@ -241,7 +241,7 @@ ADDRESS_MAP_END
/* PORTS */
static INPUT_PORTS_START( astron )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:4,3,2,1")
PORT_DIPSETTING( 0xe0, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x10, DEF_STR( 3C_1C ) )
@@ -277,7 +277,7 @@ static INPUT_PORTS_START( astron )
PORT_DIPSETTING( 0x0d, DEF_STR( 1C_5C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 1C_6C ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
@@ -301,7 +301,7 @@ static INPUT_PORTS_START( astron )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) /* SW0 = nonJAMMA pin 15 = coin1 & coin2 (?) */
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) /* SW1 = nonJAMMA pin S = unused (maybe coin2?) */
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("TEST") PORT_CODE(KEYCODE_F1) /* SW2 = nonJAMMA pin T = test switch */
@@ -311,7 +311,7 @@ static INPUT_PORTS_START( astron )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("CONTINUE") /* SW6 = nonJAMMA pin 18 = continue */
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* SW7 = nonJAMMA pin 19 = unused? */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) /* SW8 = nonJAMMA pin 9 = right */
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) /* SW9 = nonJAMMA pin 10 = left */
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) /* SW10 = nonJAMMA pin 11 = up */
diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c
index 192a470b6b6..29c3fc16c48 100644
--- a/src/mame/drivers/segaorun.c
+++ b/src/mame/drivers/segaorun.c
@@ -574,7 +574,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( outrun_generic )
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -584,10 +584,10 @@ static INPUT_PORTS_START( outrun_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("UNKNOWN")
+ PORT_START("UNKNOWN")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("COINAGE")
+ PORT_START("COINAGE")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SWA:1,2,3,4")
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -623,7 +623,7 @@ static INPUT_PORTS_START( outrun_generic )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x00, "Free Play (if Coin A too) or 1/1" )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWB:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -647,13 +647,13 @@ static INPUT_PORTS_START( outrun_generic )
PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_START_TAG("ADC0") /* steering */
+ PORT_START("ADC0") /* steering */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x20,0xe0) PORT_SENSITIVITY(100) PORT_KEYDELTA(4)
- PORT_START_TAG("ADC1") /* gas pedal */
+ PORT_START("ADC1") /* gas pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20)
- PORT_START_TAG("ADC2") /* brake */
+ PORT_START("ADC2") /* brake */
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(100) PORT_KEYDELTA(40)
INPUT_PORTS_END
diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c
index a1c685398b4..e240d7bc81c 100644
--- a/src/mame/drivers/segas16a.c
+++ b/src/mame/drivers/segas16a.c
@@ -887,7 +887,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( system16a_generic )
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
@@ -897,7 +897,7 @@ static INPUT_PORTS_START( system16a_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -907,10 +907,10 @@ static INPUT_PORTS_START( system16a_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START_TAG("UNUSED")
+ PORT_START("UNUSED")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -920,7 +920,7 @@ static INPUT_PORTS_START( system16a_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -956,7 +956,7 @@ static INPUT_PORTS_START( system16a_generic )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x00, "Free Play (if Coin A too) or 1/1" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPUNUSED_DIPLOC( 0x0001, 0x0001, "SW2:1" )
PORT_DIPUNUSED_DIPLOC( 0x0002, 0x0002, "SW2:2" )
PORT_DIPUNUSED_DIPLOC( 0x0004, 0x0004, "SW2:3" )
@@ -1039,7 +1039,7 @@ static INPUT_PORTS_START( aceattaa )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_PLAYER(2)
/* This is the power control of the "hand" device for player 2 */
- PORT_START_TAG("POW2")
+ PORT_START("POW2")
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON10 ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON11 ) PORT_PLAYER(2)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON12 ) PORT_PLAYER(2)
@@ -1068,22 +1068,22 @@ static INPUT_PORTS_START( aceattaa )
PORT_DIPSETTING( 0x10, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_START_TAG("ANALOGX1")
+ PORT_START("ANALOGX1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_REVERSE
- PORT_START_TAG("ANALOGY1")
+ PORT_START("ANALOGY1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5)
- PORT_START_TAG("DIAL1")
+ PORT_START("DIAL1")
PORT_BIT( 0x0f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(15)
- PORT_START_TAG("ANALOGX2")
+ PORT_START("ANALOGX2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_REVERSE
- PORT_START_TAG("ANALOGY2")
+ PORT_START("ANALOGY2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5)
- PORT_START_TAG("DIAL2")
+ PORT_START("DIAL2")
PORT_BIT( 0x0f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(15)
INPUT_PORTS_END
@@ -1270,32 +1270,32 @@ static INPUT_PORTS_START( mjleague )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("ANALOGX1")
+ PORT_START("ANALOGX1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5)
- PORT_START_TAG("ANALOGY1")
+ PORT_START("ANALOGY1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5)
- PORT_START_TAG("ANALOGX2")
+ PORT_START("ANALOGX2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_PLAYER(2)
- PORT_START_TAG("ANALOGY2")
+ PORT_START("ANALOGY2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_PLAYER(2)
- PORT_START_TAG("ANALOGZ1")
+ PORT_START("ANALOGZ1")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Z ) PORT_SENSITIVITY(75) PORT_KEYDELTA(15)
- PORT_START_TAG("ANALOGZ2")
+ PORT_START("ANALOGZ2")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Z ) PORT_SENSITIVITY(75) PORT_KEYDELTA(15) PORT_PLAYER(2)
- PORT_START_TAG("BUTTONS1")
+ PORT_START("BUTTONS1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON5 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("BUTTONS2")
+ PORT_START("BUTTONS2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
@@ -1331,7 +1331,7 @@ static INPUT_PORTS_START( pshot16a )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
@@ -1341,7 +1341,7 @@ static INPUT_PORTS_START( pshot16a )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(3)
- PORT_START_TAG("P4")
+ PORT_START("P4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
@@ -1510,16 +1510,16 @@ static INPUT_PORTS_START( sdi )
PORT_DIPSETTING( 0x40, "100000" )
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
- PORT_START_TAG("ANALOGX1")
+ PORT_START("ANALOGX1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5)
- PORT_START_TAG("ANALOGY1")
+ PORT_START("ANALOGY1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_REVERSE
- PORT_START_TAG("ANALOGX2")
+ PORT_START("ANALOGX2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_PLAYER(2)
- PORT_START_TAG("ANALOGY2")
+ PORT_START("ANALOGY2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_PLAYER(2) PORT_REVERSE
INPUT_PORTS_END
@@ -1565,7 +1565,7 @@ static INPUT_PORTS_START( sjryuko )
PORT_MODIFY("P2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MJ0")
+ PORT_START("MJ0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_C )
@@ -1573,21 +1573,21 @@ static INPUT_PORTS_START( sjryuko )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MJ1")
+ PORT_START("MJ1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MJ2")
+ PORT_START("MJ2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_I )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_J )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_L )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MJ3")
+ PORT_START("MJ3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_M )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_N )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
@@ -1595,12 +1595,12 @@ static INPUT_PORTS_START( sjryuko )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MJ4")
+ PORT_START("MJ4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MJ5")
+ PORT_START("MJ5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c
index ec716b1f428..a85821efeb1 100644
--- a/src/mame/drivers/segas16b.c
+++ b/src/mame/drivers/segas16b.c
@@ -1815,7 +1815,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( system16b_generic )
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
@@ -1825,7 +1825,7 @@ static INPUT_PORTS_START( system16b_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -1835,10 +1835,10 @@ static INPUT_PORTS_START( system16b_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START_TAG("UNUSED")
+ PORT_START("UNUSED")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -1848,7 +1848,7 @@ static INPUT_PORTS_START( system16b_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPUNUSED_DIPLOC( 0x0001, 0x0001, "SW2:1" )
PORT_DIPUNUSED_DIPLOC( 0x0002, 0x0002, "SW2:2" )
PORT_DIPUNUSED_DIPLOC( 0x0004, 0x0004, "SW2:3" )
@@ -1858,7 +1858,7 @@ static INPUT_PORTS_START( system16b_generic )
PORT_DIPUNUSED_DIPLOC( 0x0040, 0x0040, "SW2:7" )
PORT_DIPUNUSED_DIPLOC( 0x0080, 0x0080, "SW2:8" )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -1973,7 +1973,7 @@ static INPUT_PORTS_START( aceattac )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_PLAYER(2)
/* This is the power control of the "hand" device for player 2 */
- PORT_START_TAG("POW2")
+ PORT_START("POW2")
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON10 ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON11 ) PORT_PLAYER(2)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON12 ) PORT_PLAYER(2)
@@ -2002,22 +2002,22 @@ static INPUT_PORTS_START( aceattac )
PORT_DIPSETTING( 0x10, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_START_TAG("ANALOGX1")
+ PORT_START("ANALOGX1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_REVERSE
- PORT_START_TAG("ANALOGY1")
+ PORT_START("ANALOGY1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5)
- PORT_START_TAG("DIAL1")
+ PORT_START("DIAL1")
PORT_BIT( 0x0f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(15)
- PORT_START_TAG("ANALOGX2")
+ PORT_START("ANALOGX2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_REVERSE
- PORT_START_TAG("ANALOGY2")
+ PORT_START("ANALOGY2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5)
- PORT_START_TAG("DIAL2")
+ PORT_START("DIAL2")
PORT_BIT( 0x0f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(15)
INPUT_PORTS_END
@@ -2268,28 +2268,28 @@ static INPUT_PORTS_START( dunkshot )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("ANALOGX1") /* fake analog X */
+ PORT_START("ANALOGX1") /* fake analog X */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_PLAYER(1) PORT_REVERSE
- PORT_START_TAG("ANALOGY1") /* fake analog Y */
+ PORT_START("ANALOGY1") /* fake analog Y */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_PLAYER(1)
- PORT_START_TAG("ANALOGX2") /* fake analog X */
+ PORT_START("ANALOGX2") /* fake analog X */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_PLAYER(2)
- PORT_START_TAG("ANALOGY2") /* fake analog Y */
+ PORT_START("ANALOGY2") /* fake analog Y */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_PLAYER(2) PORT_REVERSE
- PORT_START_TAG("ANALOGX3") /* fake analog X */
+ PORT_START("ANALOGX3") /* fake analog X */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_PLAYER(3) PORT_REVERSE
- PORT_START_TAG("ANALOGY3") /* fake analog Y */
+ PORT_START("ANALOGY3") /* fake analog Y */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_PLAYER(3)
- PORT_START_TAG("ANALOGX4") /* fake analog X */
+ PORT_START("ANALOGX4") /* fake analog X */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_PLAYER(4)
- PORT_START_TAG("ANALOGY4") /* fake analog Y */
+ PORT_START("ANALOGY4") /* fake analog Y */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_PLAYER(4) PORT_REVERSE
INPUT_PORTS_END
@@ -2386,16 +2386,16 @@ static INPUT_PORTS_START( exctleag )
Hardest: you get less points by good play, and lose more points by bad play
*/
- PORT_START_TAG("ANALOGX1") /* fake analog X */
+ PORT_START("ANALOGX1") /* fake analog X */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_REVERSE
- PORT_START_TAG("ANALOGY1") /* fake analog Y */
+ PORT_START("ANALOGY1") /* fake analog Y */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5)
- PORT_START_TAG("ANALOGX2") /* fake analog X */
+ PORT_START("ANALOGX2") /* fake analog X */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_PLAYER(2)
- PORT_START_TAG("ANALOGY2") /* fake analog Y */
+ PORT_START("ANALOGY2") /* fake analog Y */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_PLAYER(2)
INPUT_PORTS_END
@@ -2487,13 +2487,13 @@ static INPUT_PORTS_START( hwchamp )
PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_START_TAG("MONITOR") /* monitor */
+ PORT_START("MONITOR") /* monitor */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(70) PORT_KEYDELTA(32)
- PORT_START_TAG("RIGHT") /* right handle */
+ PORT_START("RIGHT") /* right handle */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(70) PORT_KEYDELTA(32)
- PORT_START_TAG("LEFT") /* left handle */
+ PORT_START("LEFT") /* left handle */
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(70) PORT_KEYDELTA(32)
INPUT_PORTS_END
@@ -2590,7 +2590,7 @@ static INPUT_PORTS_START( passshtj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
@@ -2600,7 +2600,7 @@ static INPUT_PORTS_START( passshtj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(3)
- PORT_START_TAG("P4")
+ PORT_START("P4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
@@ -2747,16 +2747,16 @@ static INPUT_PORTS_START( sdi )
PORT_DIPSETTING( 0x40, "100000" )
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
- PORT_START_TAG("ANALOGX1") /* fake analog X */
+ PORT_START("ANALOGX1") /* fake analog X */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_REVERSE
- PORT_START_TAG("ANALOGY1") /* fake analog Y */
+ PORT_START("ANALOGY1") /* fake analog Y */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5)
- PORT_START_TAG("ANALOGX2") /* fake analog X */
+ PORT_START("ANALOGX2") /* fake analog X */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_PLAYER(2)
- PORT_START_TAG("ANALOGY2") /* fake analog Y */
+ PORT_START("ANALOGY2") /* fake analog Y */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_PLAYER(2)
INPUT_PORTS_END
@@ -2799,7 +2799,7 @@ static INPUT_PORTS_START( sjryuko )
PORT_MODIFY("P2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MJ0")
+ PORT_START("MJ0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_C )
@@ -2807,21 +2807,21 @@ static INPUT_PORTS_START( sjryuko )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MJ1")
+ PORT_START("MJ1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MJ2")
+ PORT_START("MJ2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_I )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_J )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_L )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MJ3")
+ PORT_START("MJ3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_M )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_N )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
@@ -2829,12 +2829,12 @@ static INPUT_PORTS_START( sjryuko )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MJ4")
+ PORT_START("MJ4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MJ5")
+ PORT_START("MJ5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
@@ -3061,7 +3061,7 @@ INPUT_PORTS_END
/* we use common sys16b tags to simplify port reads */
static INPUT_PORTS_START( atomicp )
- PORT_START_TAG("SERVICE") /* P1 */
+ PORT_START("SERVICE") /* P1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -3071,7 +3071,7 @@ static INPUT_PORTS_START( atomicp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("P1") /* P2 */
+ PORT_START("P1") /* P2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -3081,7 +3081,7 @@ static INPUT_PORTS_START( atomicp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("UNUSED") /* DSW1 */
+ PORT_START("UNUSED") /* DSW1 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 3C_1C ) )
@@ -3106,7 +3106,7 @@ static INPUT_PORTS_START( atomicp )
PORT_DIPSETTING( 0x40, "3" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_START_TAG("P2") /* DSW2 */
+ PORT_START("P2") /* DSW2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -3129,15 +3129,15 @@ static INPUT_PORTS_START( atomicp )
PORT_DIPSETTING( 0x00, "Atomic Point" )
PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_HIGH, "SW2:8" )
- PORT_START_TAG("DSW2") /* DUMMY */
+ PORT_START("DSW2") /* DUMMY */
- PORT_START_TAG("DSW1") /* DUMMY */
+ PORT_START("DSW1") /* DUMMY */
INPUT_PORTS_END
/* we use common sys16b tags to simplify port reads */
static INPUT_PORTS_START( snapper )
- PORT_START_TAG("SERVICE") /* P1 */
+ PORT_START("SERVICE") /* P1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -3147,12 +3147,12 @@ static INPUT_PORTS_START( snapper )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P1") /* SYSTEM */
+ PORT_START("P1") /* SYSTEM */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("UNUSED") /* DSW0 */
+ PORT_START("UNUSED") /* DSW0 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW0:1,2,3")
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 3C_1C ) )
@@ -3177,7 +3177,7 @@ static INPUT_PORTS_START( snapper )
PORT_DIPSETTING( 0x40, "3" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_START_TAG("P2") /* DSW1 */
+ PORT_START("P2") /* DSW1 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3201,9 +3201,9 @@ static INPUT_PORTS_START( snapper )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW1:8" )
- PORT_START_TAG("DSW2") /* DUMMY */
+ PORT_START("DSW2") /* DUMMY */
- PORT_START_TAG("DSW1") /* DUMMY */
+ PORT_START("DSW1") /* DUMMY */
INPUT_PORTS_END
diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c
index 984b7d3bbd9..0b921ef229b 100644
--- a/src/mame/drivers/segas18.c
+++ b/src/mame/drivers/segas18.c
@@ -648,7 +648,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( system18_generic )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 )
@@ -658,7 +658,7 @@ static INPUT_PORTS_START( system18_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
@@ -668,13 +668,13 @@ static INPUT_PORTS_START( system18_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("PORTC")
+ PORT_START("PORTC")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("PORTD")
+ PORT_START("PORTD")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
@@ -684,7 +684,7 @@ static INPUT_PORTS_START( system18_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("COINAGE")
+ PORT_START("COINAGE")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SWA:1,2,3,4")
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -720,7 +720,7 @@ static INPUT_PORTS_START( system18_generic )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x00, "Free Play (if Coin A too) or 1/1" )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWB:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -746,7 +746,7 @@ static INPUT_PORTS_START( system18_generic )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("PORTH")
+ PORT_START("PORTH")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
@@ -919,7 +919,7 @@ static INPUT_PORTS_START( ddcrew )
PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
@@ -929,7 +929,7 @@ static INPUT_PORTS_START( ddcrew )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
- PORT_START_TAG("P4")
+ PORT_START("P4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
@@ -939,7 +939,7 @@ static INPUT_PORTS_START( ddcrew )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
- PORT_START_TAG("P34START")
+ PORT_START("P34START")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START4 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) // individual mode
@@ -1083,22 +1083,22 @@ static INPUT_PORTS_START( lghost )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("GUNX1")
+ PORT_START("GUNX1")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(5)
- PORT_START_TAG("GUNY1")
+ PORT_START("GUNY1")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(5)
- PORT_START_TAG("GUNX2")
+ PORT_START("GUNX2")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(5) PORT_PLAYER(2)
- PORT_START_TAG("GUNY2")
+ PORT_START("GUNY2")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(5) PORT_PLAYER(2)
- PORT_START_TAG("GUNX3")
+ PORT_START("GUNX3")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(5) PORT_PLAYER(3)
- PORT_START_TAG("GUNY3")
+ PORT_START("GUNY3")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(5) PORT_PLAYER(3)
INPUT_PORTS_END
@@ -1212,22 +1212,22 @@ static INPUT_PORTS_START( wwally )
PORT_DIPSETTING( 0x20, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_START_TAG("TRACKX1")
+ PORT_START("TRACKX1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_REVERSE
- PORT_START_TAG("TRACKY1")
+ PORT_START("TRACKY1")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5)
- PORT_START_TAG("TRACKX2")
+ PORT_START("TRACKX2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_PLAYER(2) PORT_REVERSE
- PORT_START_TAG("TRACKY2")
+ PORT_START("TRACKY2")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_PLAYER(2)
- PORT_START_TAG("TRACKX3")
+ PORT_START("TRACKX3")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_PLAYER(3) PORT_REVERSE
- PORT_START_TAG("TRACKY3")
+ PORT_START("TRACKY3")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(75) PORT_KEYDELTA(5) PORT_PLAYER(3)
INPUT_PORTS_END
diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c
index d47caf50966..911ee57d53f 100644
--- a/src/mame/drivers/segas24.c
+++ b/src/mame/drivers/segas24.c
@@ -1273,7 +1273,7 @@ static MACHINE_RESET(system24)
*************************************/
static INPUT_PORTS_START( system24_P1_P2 )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -1283,7 +1283,7 @@ static INPUT_PORTS_START( system24_P1_P2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
@@ -1295,7 +1295,7 @@ static INPUT_PORTS_START( system24_P1_P2 )
INPUT_PORTS_END
static INPUT_PORTS_START( system24_Service )
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE )
@@ -1307,7 +1307,7 @@ static INPUT_PORTS_START( system24_Service )
INPUT_PORTS_END
static INPUT_PORTS_START( system24_DSW )
- PORT_START_TAG("COINAGE")
+ PORT_START("COINAGE")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SWA:1,2,3,4")
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -1343,7 +1343,7 @@ static INPUT_PORTS_START( system24_DSW )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x00, "Free Play (if Coin A too) or 1/1" )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) PORT_DIPLOCATION("SWB:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1416,28 +1416,28 @@ static INPUT_PORTS_START( hotrod )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DIAL1")
+ PORT_START("DIAL1")
PORT_BIT( 0xfff, 0x000, IPT_DIAL ) PORT_MINMAX(0x000,0xfff) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("DIAL2")
+ PORT_START("DIAL2")
PORT_BIT( 0xfff, 0x000, IPT_DIAL ) PORT_MINMAX(0x000,0xfff) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(2)
- PORT_START_TAG("DIAL3")
+ PORT_START("DIAL3")
PORT_BIT( 0xfff, 0x000, IPT_DIAL ) PORT_MINMAX(0x000,0xfff) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(3)
- PORT_START_TAG("DIAL4")
+ PORT_START("DIAL4")
PORT_BIT( 0xfff, 0x000, IPT_DIAL ) PORT_MINMAX(0x000,0xfff) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(4)
- PORT_START_TAG("PEDAL1")
+ PORT_START("PEDAL1")
PORT_BIT( 0xff, 0x01, IPT_PEDAL ) PORT_MINMAX(0x01,0xff) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("PEDAL2")
+ PORT_START("PEDAL2")
PORT_BIT( 0xff, 0x01, IPT_PEDAL ) PORT_MINMAX(0x01,0xff) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(2)
- PORT_START_TAG("PEDAL3")
+ PORT_START("PEDAL3")
PORT_BIT( 0xff, 0x01, IPT_PEDAL ) PORT_MINMAX(0x01,0xff) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(3)
- PORT_START_TAG("PEDAL4")
+ PORT_START("PEDAL4")
PORT_BIT( 0xff, 0x01, IPT_PEDAL ) PORT_MINMAX(0x01,0xff) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(4)
INPUT_PORTS_END
@@ -1527,10 +1527,10 @@ static INPUT_PORTS_START( roughrac )
PORT_DIPSETTING( 0x80, "10" )
PORT_DIPSETTING( 0x00, "15" )
- PORT_START_TAG("DIAL1")
+ PORT_START("DIAL1")
PORT_BIT( 0xfff, 0x000, IPT_DIAL ) PORT_MINMAX(0x000,0xfff) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("DIAL2")
+ PORT_START("DIAL2")
PORT_BIT( 0xfff, 0x000, IPT_DIAL ) PORT_MINMAX(0x000,0xfff) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(2)
INPUT_PORTS_END
@@ -1642,7 +1642,7 @@ static INPUT_PORTS_START( dcclub ) /* In the Japan set missing angle input */
PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_START_TAG("PADDLE")
+ PORT_START("PADDLE")
PORT_BIT( 0xff, 0x00, IPT_PADDLE ) PORT_MINMAX(0x00,0x8f) PORT_SENSITIVITY(64) PORT_KEYDELTA(64) PORT_PLAYER(1)
INPUT_PORTS_END
@@ -1692,7 +1692,7 @@ static INPUT_PORTS_START( sgmastj )
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DIAL1")
+ PORT_START("DIAL1")
PORT_BIT( 0xfff, 0x000, IPT_DIAL ) PORT_MINMAX(0x000,0xfff) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(2)
INPUT_PORTS_END
@@ -1709,7 +1709,7 @@ static INPUT_PORTS_START( quizmeku )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
@@ -1771,48 +1771,48 @@ static INPUT_PORTS_START( qrouka )
INPUT_PORTS_END
static INPUT_PORTS_START( mahmajn )
- PORT_START_TAG("MJ0")
+ PORT_START("MJ0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("A") PORT_CODE(KEYCODE_A)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("B") PORT_CODE(KEYCODE_B)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("C") PORT_CODE(KEYCODE_C)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("D") PORT_CODE(KEYCODE_D)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MJ1")
+ PORT_START("MJ1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("E") PORT_CODE(KEYCODE_E)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("F") PORT_CODE(KEYCODE_F)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("G") PORT_CODE(KEYCODE_G)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("H") PORT_CODE(KEYCODE_H)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MJ2")
+ PORT_START("MJ2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("I") PORT_CODE(KEYCODE_I)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("J") PORT_CODE(KEYCODE_J)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("K") PORT_CODE(KEYCODE_K)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("L") PORT_CODE(KEYCODE_L)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MJ3")
+ PORT_START("MJ3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("M") PORT_CODE(KEYCODE_M)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("N") PORT_CODE(KEYCODE_N)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Chi") PORT_CODE(KEYCODE_SPACE)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Pon") PORT_CODE(KEYCODE_LALT)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MJ4")
+ PORT_START("MJ4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MJ5")
+ PORT_START("MJ5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Kan") PORT_CODE(KEYCODE_LCONTROL)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Reach") PORT_CODE(KEYCODE_LSHIFT)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Ron") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_INCLUDE( system24_Service )
@@ -1840,7 +1840,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( gground )
PORT_INCLUDE( system24_P1_P2 )
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c
index 044a67871fd..1d3ea0e1bbb 100644
--- a/src/mame/drivers/segas32.c
+++ b/src/mame/drivers/segas32.c
@@ -1299,7 +1299,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( system32_generic )
- PORT_START_TAG("P1_A")
+ PORT_START("P1_A")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 )
@@ -1309,7 +1309,7 @@ static INPUT_PORTS_START( system32_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START_TAG("P2_A")
+ PORT_START("P2_A")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
@@ -1319,13 +1319,13 @@ static INPUT_PORTS_START( system32_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("PORTC_A")
+ PORT_START("PORTC_A")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("PORTD_A")
+ PORT_START("PORTD_A")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SERVICE12_A")
+ PORT_START("SERVICE12_A")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -1334,17 +1334,17 @@ static INPUT_PORTS_START( system32_generic )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SERVICE34_A")
+ PORT_START("SERVICE34_A")
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE3 ) /* sometimes mirrors SERVICE1 */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE4 ) /* tends to also work as a test switch */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(eeprom_bit_r, NULL)
- PORT_START_TAG("PORTG_A")
+ PORT_START("PORTG_A")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("PORTH_A")
+ PORT_START("PORTH_A")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
@@ -1352,19 +1352,19 @@ INPUT_PORTS_END
static INPUT_PORTS_START( multi32_generic )
PORT_INCLUDE( system32_generic )
- PORT_START_TAG("P1_B")
+ PORT_START("P1_B")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2_B")
+ PORT_START("P2_B")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("PORTC_B")
+ PORT_START("PORTC_B")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("PORTD_B")
+ PORT_START("PORTD_B")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SERVICE12_B")
+ PORT_START("SERVICE12_B")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -1372,14 +1372,14 @@ static INPUT_PORTS_START( multi32_generic )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SERVICE34_B")
+ PORT_START("SERVICE34_B")
PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(eeprom_bit_r, NULL)
- PORT_START_TAG("PORTG_B")
+ PORT_START("PORTG_B")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("PORTH_B")
+ PORT_START("PORTH_B")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
@@ -1406,13 +1406,13 @@ static INPUT_PORTS_START( arescue )
PORT_MODIFY("SERVICE34_A")
PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("ANALOG1")
+ PORT_START("ANALOG1")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_REVERSE
- PORT_START_TAG("ANALOG2")
+ PORT_START("ANALOG2")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10)
- PORT_START_TAG("ANALOG3")
+ PORT_START("ANALOG3")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Z ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10)
INPUT_PORTS_END
@@ -1432,16 +1432,16 @@ static INPUT_PORTS_START( alien3 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("ANALOG1")
+ PORT_START("ANALOG1")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5)
- PORT_START_TAG("ANALOG2")
+ PORT_START("ANALOG2")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5)
- PORT_START_TAG("ANALOG3")
+ PORT_START("ANALOG3")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5) PORT_PLAYER(2)
- PORT_START_TAG("ANALOG4")
+ PORT_START("ANALOG4")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5) PORT_PLAYER(2)
INPUT_PORTS_END
@@ -1455,7 +1455,7 @@ static INPUT_PORTS_START( arabfgt )
PORT_MODIFY("P2_A")
PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("EXTRA1")
+ PORT_START("EXTRA1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1464,7 +1464,7 @@ static INPUT_PORTS_START( arabfgt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
- PORT_START_TAG("EXTRA2")
+ PORT_START("EXTRA2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1473,7 +1473,7 @@ static INPUT_PORTS_START( arabfgt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
- PORT_START_TAG("EXTRA3")
+ PORT_START("EXTRA3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START4 )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1501,7 +1501,7 @@ static INPUT_PORTS_START( brival )
PORT_MODIFY("P2_A")
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("EXTRA2")
+ PORT_START("EXTRA2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(2)
@@ -1526,7 +1526,7 @@ static INPUT_PORTS_START( darkedge )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_START_TAG("EXTRA2")
+ PORT_START("EXTRA2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2)
@@ -1573,13 +1573,13 @@ static INPUT_PORTS_START( f1en )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("ANALOG1")
+ PORT_START("ANALOG1")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10)
- PORT_START_TAG("ANALOG2")
+ PORT_START("ANALOG2")
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10)
- PORT_START_TAG("ANALOG3")
+ PORT_START("ANALOG3")
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10)
INPUT_PORTS_END
@@ -1597,7 +1597,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( ga2 )
PORT_INCLUDE( system32_generic )
- PORT_START_TAG("EXTRA1")
+ PORT_START("EXTRA1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
@@ -1607,7 +1607,7 @@ static INPUT_PORTS_START( ga2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
- PORT_START_TAG("EXTRA2")
+ PORT_START("EXTRA2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
@@ -1617,7 +1617,7 @@ static INPUT_PORTS_START( ga2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
- PORT_START_TAG("EXTRA3")
+ PORT_START("EXTRA3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START4 )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1689,7 +1689,7 @@ static INPUT_PORTS_START( harddunk )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START5 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("EXTRA1")
+ PORT_START("EXTRA1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
@@ -1699,7 +1699,7 @@ static INPUT_PORTS_START( harddunk )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
- PORT_START_TAG("EXTRA2")
+ PORT_START("EXTRA2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(6)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(6)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(6)
@@ -1709,7 +1709,7 @@ static INPUT_PORTS_START( harddunk )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(6)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(6)
- PORT_START_TAG("EXTRA3")
+ PORT_START("EXTRA3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START6 )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1736,16 +1736,16 @@ static INPUT_PORTS_START( jpark )
PORT_MODIFY("P2_A")
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("ANALOG1")
+ PORT_START("ANALOG1")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5)
- PORT_START_TAG("ANALOG2")
+ PORT_START("ANALOG2")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5)
- PORT_START_TAG("ANALOG3")
+ PORT_START("ANALOG3")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5) PORT_PLAYER(2)
- PORT_START_TAG("ANALOG4")
+ PORT_START("ANALOG4")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5) PORT_PLAYER(2)
INPUT_PORTS_END
@@ -1775,22 +1775,22 @@ static INPUT_PORTS_START( orunners )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2) /* >> */
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("ANALOG1")
+ PORT_START("ANALOG1")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("ANALOG2")
+ PORT_START("ANALOG2")
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("ANALOG3")
+ PORT_START("ANALOG3")
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("ANALOG4")
+ PORT_START("ANALOG4")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("ANALOG7")
+ PORT_START("ANALOG7")
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("ANALOG8")
+ PORT_START("ANALOG8")
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(2)
INPUT_PORTS_END
@@ -1826,13 +1826,13 @@ static INPUT_PORTS_START( radm )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("ANALOG1")
+ PORT_START("ANALOG1")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10)
- PORT_START_TAG("ANALOG2")
+ PORT_START("ANALOG2")
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10)
- PORT_START_TAG("ANALOG3")
+ PORT_START("ANALOG3")
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10)
INPUT_PORTS_END
@@ -1866,13 +1866,13 @@ static INPUT_PORTS_START( radr )
PORT_DIPSETTING( 0x00, "Automatic" )
PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("ANALOG1")
+ PORT_START("ANALOG1")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10)
- PORT_START_TAG("ANALOG2")
+ PORT_START("ANALOG2")
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10)
- PORT_START_TAG("ANALOG3")
+ PORT_START("ANALOG3")
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10)
INPUT_PORTS_END
@@ -1892,16 +1892,16 @@ static INPUT_PORTS_START( scross )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_CODE(KEYCODE_S) /* brake */
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("ANALOG1")
+ PORT_START("ANALOG1")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("ANALOG2")
+ PORT_START("ANALOG2")
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("ANALOG3")
+ PORT_START("ANALOG3")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("ANALOG4")
+ PORT_START("ANALOG4")
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(2)
INPUT_PORTS_END
@@ -1935,13 +1935,13 @@ static INPUT_PORTS_START( slipstrm )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("ANALOG1")
+ PORT_START("ANALOG1")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10)
- PORT_START_TAG("ANALOG2")
+ PORT_START("ANALOG2")
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10)
- PORT_START_TAG("ANALOG3")
+ PORT_START("ANALOG3")
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10)
INPUT_PORTS_END
@@ -1961,22 +1961,22 @@ static INPUT_PORTS_START( sonic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START_TAG("TRACKX1")
+ PORT_START("TRACKX1")
PORT_BIT( 0xff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("TRACKY1")
+ PORT_START("TRACKY1")
PORT_BIT( 0xff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_PLAYER(1)
- PORT_START_TAG("TRACKX2")
+ PORT_START("TRACKX2")
PORT_BIT( 0xff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("TRACKY2")
+ PORT_START("TRACKY2")
PORT_BIT( 0xff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_PLAYER(2)
- PORT_START_TAG("TRACKX3")
+ PORT_START("TRACKX3")
PORT_BIT( 0xff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_REVERSE PORT_PLAYER(3)
- PORT_START_TAG("TRACKY3")
+ PORT_START("TRACKY3")
PORT_BIT( 0xff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(30) PORT_PLAYER(3)
INPUT_PORTS_END
@@ -1990,7 +1990,7 @@ static INPUT_PORTS_START( spidman )
PORT_MODIFY("P2_A")
PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("EXTRA1")
+ PORT_START("EXTRA1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1999,7 +1999,7 @@ static INPUT_PORTS_START( spidman )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
- PORT_START_TAG("EXTRA2")
+ PORT_START("EXTRA2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2008,7 +2008,7 @@ static INPUT_PORTS_START( spidman )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
- PORT_START_TAG("EXTRA3")
+ PORT_START("EXTRA3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START4 )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c
index 1fde51ffb61..3f41a9ee432 100644
--- a/src/mame/drivers/segaxbd.c
+++ b/src/mame/drivers/segaxbd.c
@@ -618,15 +618,15 @@ ADDRESS_MAP_END
*/
static INPUT_PORTS_START( xboard_generic )
- PORT_START_TAG("IO0PORTA")
+ PORT_START("IO0PORTA")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /INTR of ADC0804 */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IO0PORTB")
+ PORT_START("IO0PORTB")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IO1PORTA")
+ PORT_START("IO1PORTA")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button? not used by any game we have */
PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -636,10 +636,10 @@ static INPUT_PORTS_START( xboard_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("IO1PORTB")
+ PORT_START("IO1PORTB")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IO1PORTC")
+ PORT_START("IO1PORTC")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SWA:1,2,3,4")
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -673,7 +673,7 @@ static INPUT_PORTS_START( xboard_generic )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x00, "Free Play (if Coin A too) or 1/1" )
- PORT_START_TAG("IO1PORTD")
+ PORT_START("IO1PORTD")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWB:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -739,19 +739,19 @@ static INPUT_PORTS_START( aburner )
PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_START_TAG("ADC0") /* stick X */
+ PORT_START("ADC0") /* stick X */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0x20,0xe0) PORT_SENSITIVITY(100) PORT_KEYDELTA(4)
- PORT_START_TAG("ADC1") /* stick Y */
+ PORT_START("ADC1") /* stick Y */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(0x40,0xc0) PORT_SENSITIVITY(100) PORT_KEYDELTA(4) PORT_REVERSE
- PORT_START_TAG("ADC2") /* throttle */
+ PORT_START("ADC2") /* throttle */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Z ) PORT_SENSITIVITY(100) PORT_KEYDELTA(79)
- PORT_START_TAG("ADC3") /* motor Y */
+ PORT_START("ADC3") /* motor Y */
PORT_BIT( 0xff, (0xb0+0x50)/2, IPT_SPECIAL )
- PORT_START_TAG("ADC4") /* motor X */
+ PORT_START("ADC4") /* motor X */
PORT_BIT( 0xff, (0xb0+0x50)/2, IPT_SPECIAL )
INPUT_PORTS_END
@@ -819,13 +819,13 @@ static INPUT_PORTS_START( thndrbld )
On the "Standing" cabinet, the joystick Y axis is reversed.
On the "Mini Upright" cabinet, the inputs conform to After Burner II:
the X axis is (un-)reversed, and the throttle and Y axis switch places */
- PORT_START_TAG("ADC0") /* stick X */
+ PORT_START("ADC0") /* stick X */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0x01,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(4) PORT_REVERSE
- PORT_START_TAG("ADC1") /* "slottle" */
+ PORT_START("ADC1") /* "slottle" */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Z ) PORT_SENSITIVITY(100) PORT_KEYDELTA(79)
- PORT_START_TAG("ADC2") /* stick Y */
+ PORT_START("ADC2") /* stick Y */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(0x01,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(4)
INPUT_PORTS_END
@@ -901,16 +901,16 @@ static INPUT_PORTS_START( loffire )
PORT_DIPSETTING( 0x80, DEF_STR( Single ) )
PORT_DIPSETTING( 0x00, "Twin" )
- PORT_START_TAG("ADC0")
+ PORT_START("ADC0")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(5)
- PORT_START_TAG("ADC1")
+ PORT_START("ADC1")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(5)
- PORT_START_TAG("ADC2")
+ PORT_START("ADC2")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(5) PORT_PLAYER(2)
- PORT_START_TAG("ADC3")
+ PORT_START("ADC3")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(5) PORT_PLAYER(2)
INPUT_PORTS_END
@@ -943,13 +943,13 @@ static INPUT_PORTS_START( rachero )
PORT_DIPSETTING( 0x80, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Very_Hard ) )
- PORT_START_TAG("ADC0") /* steering */
+ PORT_START("ADC0") /* steering */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x20,0xe0) PORT_SENSITIVITY(100) PORT_KEYDELTA(4) PORT_REVERSE
- PORT_START_TAG("ADC1") /* gas pedal */
+ PORT_START("ADC1") /* gas pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20)
- PORT_START_TAG("ADC2") /* brake */
+ PORT_START("ADC2") /* brake */
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(100) PORT_KEYDELTA(40)
INPUT_PORTS_END
@@ -986,13 +986,13 @@ static INPUT_PORTS_START( smgp )
PORT_DIPSETTING( 0x40, DEF_STR( Upright ) )
// PORT_DIPSETTING( 0x00, "Deluxe" )
- PORT_START_TAG("ADC0") /* steering */
+ PORT_START("ADC0") /* steering */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x38,0xc8) PORT_SENSITIVITY(100) PORT_KEYDELTA(4)
- PORT_START_TAG("ADC1") /* gas pedal */
+ PORT_START("ADC1") /* gas pedal */
PORT_BIT( 0xff, 0x38, IPT_PEDAL ) PORT_MINMAX(0x38,0xb8) PORT_SENSITIVITY(100) PORT_KEYDELTA(20)
- PORT_START_TAG("ADC2") /* brake */
+ PORT_START("ADC2") /* brake */
PORT_BIT( 0xff, 0x28, IPT_PEDAL2 ) PORT_MINMAX(0x28,0xa8) PORT_SENSITIVITY(100) PORT_KEYDELTA(40)
INPUT_PORTS_END
@@ -1024,10 +1024,10 @@ static INPUT_PORTS_START( abcop )
PORT_DIPSETTING( 0x80, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_START_TAG("ADC0") /* steering */
+ PORT_START("ADC0") /* steering */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x20,0xe0) PORT_SENSITIVITY(100) PORT_KEYDELTA(4) PORT_REVERSE
- PORT_START_TAG("ADC1") /* accelerator */
+ PORT_START("ADC1") /* accelerator */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20)
INPUT_PORTS_END
@@ -1057,13 +1057,13 @@ static INPUT_PORTS_START( gprider )
PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_START_TAG("ADC0") /* steering */
+ PORT_START("ADC0") /* steering */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x01,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(4)
- PORT_START_TAG("ADC1") /* gas pedal */
+ PORT_START("ADC1") /* gas pedal */
PORT_BIT( 0xff, 0x10, IPT_PEDAL ) PORT_MINMAX(0x10,0xef) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_REVERSE
- PORT_START_TAG("ADC2") /* brake */
+ PORT_START("ADC2") /* brake */
PORT_BIT( 0xff, 0x10, IPT_PEDAL2 ) PORT_MINMAX(0x10,0xef) PORT_SENSITIVITY(100) PORT_KEYDELTA(40) PORT_REVERSE
INPUT_PORTS_END
diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c
index d58eb21750b..68ebccf52c5 100644
--- a/src/mame/drivers/segaybd.c
+++ b/src/mame/drivers/segaybd.c
@@ -466,10 +466,10 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( yboard_generic )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("GENERAL")
+ PORT_START("GENERAL")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* afterburner (gloc) */
PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -479,16 +479,16 @@ static INPUT_PORTS_START( yboard_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("PORTC")
+ PORT_START("PORTC")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("PORTD")
+ PORT_START("PORTD")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("PORTE")
+ PORT_START("PORTE")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SWB:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -514,7 +514,7 @@ static INPUT_PORTS_START( yboard_generic )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("COINAGE")
+ PORT_START("COINAGE")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SWA:1,2,3,4")
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -550,7 +550,7 @@ static INPUT_PORTS_START( yboard_generic )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x00, "Free Play (if Coin A too) or 1/1" )
- PORT_START_TAG("PORTH")
+ PORT_START("PORTH")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
@@ -592,13 +592,13 @@ static INPUT_PORTS_START( gforce2 )
PORT_DIPSETTING( 0x40, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, "City" )
- PORT_START_TAG("ADC0") /* stick X */
+ PORT_START("ADC0") /* stick X */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0x01,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(4)
- PORT_START_TAG("ADC1") /* stick Y */
+ PORT_START("ADC1") /* stick Y */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(0x01,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(4) PORT_REVERSE
- PORT_START_TAG("ADC2") /* throttle */
+ PORT_START("ADC2") /* throttle */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Z ) PORT_MINMAX(0x01,0xff) PORT_SENSITIVITY(100) PORT_KEYDELTA(79)
INPUT_PORTS_END
@@ -634,13 +634,13 @@ static INPUT_PORTS_START( gloc )
PORT_DIPSETTING( 0x80, "3 to Start, 2 to Continue" )
PORT_DIPSETTING( 0x00, "4 to Start, 3 to Continue" )
- PORT_START_TAG("ADC3") /* stick Y */
+ PORT_START("ADC3") /* stick Y */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(0x40,0xc0) PORT_SENSITIVITY(100) PORT_KEYDELTA(4) PORT_REVERSE
- PORT_START_TAG("ADC4") /* throttle */
+ PORT_START("ADC4") /* throttle */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Z ) PORT_SENSITIVITY(100) PORT_KEYDELTA(79)
- PORT_START_TAG("ADC5") /* stick X */
+ PORT_START("ADC5") /* stick X */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0x20,0xe0) PORT_SENSITIVITY(100) PORT_KEYDELTA(4)
INPUT_PORTS_END
@@ -719,16 +719,16 @@ static INPUT_PORTS_START( glocr360 )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_8C ) )
PORT_DIPSETTING( 0x00, "Free Play (if Coin A too) or 1/1" )
- PORT_START_TAG("ADC0") /* moving pitch */
+ PORT_START("ADC0") /* moving pitch */
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(4) PORT_PLAYER(2)
- PORT_START_TAG("ADC2") /* moving roll */
+ PORT_START("ADC2") /* moving roll */
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(4) PORT_PLAYER(3)
- PORT_START_TAG("ADC3") /* stick Y */
+ PORT_START("ADC3") /* stick Y */
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(4) PORT_REVERSE
- PORT_START_TAG("ADC5") /* stick X */
+ PORT_START("ADC5") /* stick X */
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(4)
INPUT_PORTS_END
@@ -762,13 +762,13 @@ static INPUT_PORTS_START( pdrift )
PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_START_TAG("ADC3") /* brake */
+ PORT_START("ADC3") /* brake */
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(100) PORT_KEYDELTA(40)
- PORT_START_TAG("ADC4") /* gas pedal */
+ PORT_START("ADC4") /* gas pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20)
- PORT_START_TAG("ADC5") /* steering */
+ PORT_START("ADC5") /* steering */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x20,0xe0) PORT_SENSITIVITY(100) PORT_KEYDELTA(4)
INPUT_PORTS_END
@@ -889,16 +889,16 @@ static INPUT_PORTS_START( rchase )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("ADC0")
+ PORT_START("ADC0")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5)
- PORT_START_TAG("ADC1")
+ PORT_START("ADC1")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5)
- PORT_START_TAG("ADC2")
+ PORT_START("ADC2")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5) PORT_PLAYER(2)
- PORT_START_TAG("ADC3")
+ PORT_START("ADC3")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5) PORT_PLAYER(2)
INPUT_PORTS_END
diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c
index 248426c486a..eacd8041ec7 100644
--- a/src/mame/drivers/seibuspi.c
+++ b/src/mame/drivers/seibuspi.c
@@ -1118,7 +1118,7 @@ ADDRESS_MAP_END
/********************************************************************/
static INPUT_PORTS_START( spi_2button )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1128,7 +1128,7 @@ static INPUT_PORTS_START( spi_2button )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1138,28 +1138,28 @@ static INPUT_PORTS_START( spi_2button )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW) /* Test Button */
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service Coin") PORT_CODE(KEYCODE_7)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("JP1") /* JP1 */
+ PORT_START("JP1") /* JP1 */
PORT_DIPNAME( 0x03, 0x03, "JP1" )
PORT_DIPSETTING( 0x03, "Update" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( spi_3button )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1169,7 +1169,7 @@ static INPUT_PORTS_START( spi_3button )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1179,28 +1179,28 @@ static INPUT_PORTS_START( spi_3button )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service Coin") PORT_CODE(KEYCODE_7)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("JP1")
+ PORT_START("JP1")
PORT_DIPNAME( 0x03, 0x03, "JP1" )
PORT_DIPSETTING( 0x03, "Update" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( seibu386_2button )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1210,7 +1210,7 @@ static INPUT_PORTS_START( seibu386_2button )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1220,7 +1220,7 @@ static INPUT_PORTS_START( seibu386_2button )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW) /* Test Button */
@@ -1229,7 +1229,7 @@ static INPUT_PORTS_START( seibu386_2button )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("JP1") /* JP1 */
+ PORT_START("JP1") /* JP1 */
PORT_DIPNAME( 0x03, 0x03, "JP1" )
PORT_DIPSETTING( 0x03, "Update" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
@@ -1274,30 +1274,30 @@ static CUSTOM_INPUT( ejanhs_encode )
}
static INPUT_PORTS_START( spi_ejanhs )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(ejanhs_encode, "IN0BITS")
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(ejanhs_encode, "IN1BITS")
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service Coin") PORT_CODE(KEYCODE_7)
PORT_BIT( 0xf3, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("JP1")
+ PORT_START("JP1")
PORT_DIPNAME( 0x03, 0x03, "JP1" )
PORT_DIPSETTING( 0x03, "Update" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN0BITS")
+ PORT_START("IN0BITS")
PORT_BIT( 0x001, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 A") PORT_CODE(KEYCODE_A)
PORT_BIT( 0x002, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 B") PORT_CODE(KEYCODE_B)
PORT_BIT( 0x004, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 E") PORT_CODE(KEYCODE_E)
@@ -1310,7 +1310,7 @@ static INPUT_PORTS_START( spi_ejanhs )
PORT_BIT( 0x200, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 Reach") PORT_CODE(KEYCODE_LSHIFT)
PORT_BIT( 0x400, IP_ACTIVE_HIGH, IPT_START1 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1BITS")
+ PORT_START("IN1BITS")
PORT_BIT( 0x001, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 C") PORT_CODE(KEYCODE_C)
PORT_BIT( 0x002, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 D") PORT_CODE(KEYCODE_D)
PORT_BIT( 0x004, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("P1 G") PORT_CODE(KEYCODE_G)
diff --git a/src/mame/drivers/seicross.c b/src/mame/drivers/seicross.c
index a65723c4948..9959fd14248 100644
--- a/src/mame/drivers/seicross.c
+++ b/src/mame/drivers/seicross.c
@@ -162,7 +162,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( friskyt )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -172,7 +172,7 @@ static INPUT_PORTS_START( friskyt )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -184,7 +184,7 @@ static INPUT_PORTS_START( friskyt )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("TEST") /* Test */
+ PORT_START("TEST") /* Test */
PORT_DIPNAME( 0x01, 0x00, "Test Mode" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -195,7 +195,7 @@ static INPUT_PORTS_START( friskyt )
INPUT_PORTS_END
static INPUT_PORTS_START( radrad )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -205,7 +205,7 @@ static INPUT_PORTS_START( radrad )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -215,12 +215,12 @@ static INPUT_PORTS_START( radrad )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("TEST") /* Test */
+ PORT_START("TEST") /* Test */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -234,7 +234,7 @@ static INPUT_PORTS_START( radrad )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW2") /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x0f, 0x01, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x07, DEF_STR( 7C_1C ) )
PORT_DIPSETTING( 0x06, DEF_STR( 6C_1C ) )
@@ -253,7 +253,7 @@ static INPUT_PORTS_START( radrad )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW3") /* DSW3 */
+ PORT_START("DSW3") /* DSW3 */
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x08, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x09, DEF_STR( 2C_2C ) )
@@ -275,7 +275,7 @@ static INPUT_PORTS_START( radrad )
INPUT_PORTS_END
static INPUT_PORTS_START( seicross )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -285,7 +285,7 @@ static INPUT_PORTS_START( seicross )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -295,14 +295,14 @@ static INPUT_PORTS_START( seicross )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("TEST") /* Test */
+ PORT_START("TEST") /* Test */
PORT_SERVICE( 0x01, IP_ACTIVE_HIGH )
PORT_DIPNAME( 0x02, 0x00, "Connection Error" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x02, DEF_STR( On ) )
PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -316,7 +316,7 @@ static INPUT_PORTS_START( seicross )
PORT_DIPSETTING( 0x0c, "30000 60000 90000" )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW2") /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -330,7 +330,7 @@ static INPUT_PORTS_START( seicross )
PORT_DIPSETTING( 0x0c, "5" )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW3") /* DSW3 */
+ PORT_START("DSW3") /* DSW3 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
@@ -343,7 +343,7 @@ static INPUT_PORTS_START( seicross )
PORT_DIPSETTING( 0x0c, DEF_STR( 1C_6C ) )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DEBUG") /* Debug */
+ PORT_START("DEBUG") /* Debug */
PORT_BIT( 0x1f, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_DIPNAME( 0x20, 0x20, "Debug Mode" )
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
diff --git a/src/mame/drivers/sengokmj.c b/src/mame/drivers/sengokmj.c
index a700fe888b5..757bcef7a10 100644
--- a/src/mame/drivers/sengokmj.c
+++ b/src/mame/drivers/sengokmj.c
@@ -139,7 +139,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( sengokmj )
SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -166,7 +166,7 @@ static INPUT_PORTS_START( sengokmj )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY0")
+ PORT_START("KEY0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
@@ -176,7 +176,7 @@ static INPUT_PORTS_START( sengokmj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
@@ -186,7 +186,7 @@ static INPUT_PORTS_START( sengokmj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
@@ -196,7 +196,7 @@ static INPUT_PORTS_START( sengokmj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
@@ -206,7 +206,7 @@ static INPUT_PORTS_START( sengokmj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY4")
+ PORT_START("KEY4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
@@ -216,10 +216,10 @@ static INPUT_PORTS_START( sengokmj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("UNUSED")
+ PORT_START("UNUSED")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0001, 0x0001, "Door" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/senjyo.c b/src/mame/drivers/senjyo.c
index 0228b4dbf27..a6b47467071 100644
--- a/src/mame/drivers/senjyo.c
+++ b/src/mame/drivers/senjyo.c
@@ -317,7 +317,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( senjyo )
- PORT_START /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -327,7 +327,7 @@ static INPUT_PORTS_START( senjyo )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -337,8 +337,8 @@ static INPUT_PORTS_START( senjyo )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN2 */
-/* coin input for both must be active between 2 and 9 frames to be consistently recognized */
+ PORT_START("SYSTEM") /* IN2 */
+ /* coin input for both must be active between 2 and 9 frames to be consistently recognized */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -348,7 +348,7 @@ static INPUT_PORTS_START( senjyo )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* DSW0 */
+ PORT_START("DSW1") /* DSW0 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) )
@@ -371,7 +371,7 @@ static INPUT_PORTS_START( senjyo )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* DSW1 */
+ PORT_START("DSW2") /* DSW1 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -398,7 +398,7 @@ static INPUT_PORTS_START( senjyo )
INPUT_PORTS_END
static INPUT_PORTS_START( starforc )
- PORT_START /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -408,7 +408,7 @@ static INPUT_PORTS_START( starforc )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -418,8 +418,8 @@ static INPUT_PORTS_START( starforc )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN2 */
-/* coin input for both must be active between 2 and 9 frames to be consistently recognized */
+ PORT_START("SYSTEM") /* IN2 */
+ /* coin input for both must be active between 2 and 9 frames to be consistently recognized */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -429,7 +429,7 @@ static INPUT_PORTS_START( starforc )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* DSW0 */
+ PORT_START("DSW1") /* DSW0 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -452,7 +452,7 @@ static INPUT_PORTS_START( starforc )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* DSW1 */
+ PORT_START("DSW2") /* DSW1 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x00, "50k, 200k and 500k" )
PORT_DIPSETTING( 0x01, "100k, 300k and 800k" )
@@ -479,7 +479,7 @@ static INPUT_PORTS_START( starforc )
INPUT_PORTS_END
static INPUT_PORTS_START( baluba )
- PORT_START /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -489,7 +489,7 @@ static INPUT_PORTS_START( baluba )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -499,8 +499,8 @@ static INPUT_PORTS_START( baluba )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN2 */
-/* coin input for both must be active between 2 and 9 frames to be consistently recognized */
+ PORT_START("SYSTEM") /* IN2 */
+ /* coin input for both must be active between 2 and 9 frames to be consistently recognized */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -510,7 +510,7 @@ static INPUT_PORTS_START( baluba )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* DSW0 */
+ PORT_START("DSW1") /* DSW0 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -533,7 +533,7 @@ static INPUT_PORTS_START( baluba )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* DSW1 */
+ PORT_START("DSW2") /* DSW1 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x00, "30k, 100k and 200k" )
PORT_DIPSETTING( 0x01, "50k, 200k and 500k" )
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index 39b0dcc9213..db3bea1fbf5 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -3249,13 +3249,13 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( arbalest )
- PORT_START_TAG("P1") // Player 1
+ PORT_START("P1") // Player 1
JOY_TYPE2_2BUTTONS(1)
- PORT_START_TAG("P2") // Player 2
+ PORT_START("P2") // Player 2
JOY_TYPE2_2BUTTONS(2)
- PORT_START_TAG("COINS") // Coins
+ PORT_START("COINS") // Coins
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -3265,7 +3265,7 @@ static INPUT_PORTS_START( arbalest )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
- PORT_START_TAG("DSW") // 2 DSWs - $600001 & 3.b
+ PORT_START("DSW") // 2 DSWs - $600001 & 3.b
PORT_DIPNAME( 0x4001, 0x0000, "Licensed To" )
PORT_DIPSETTING( 0x0000, "Taito" )
// PORT_DIPSETTING( 0x4000, "Taito" )
@@ -3316,7 +3316,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( atehate )
- PORT_START_TAG("P1") // Player 1
+ PORT_START("P1") // Player 1
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
@@ -3326,7 +3326,7 @@ static INPUT_PORTS_START( atehate )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") // Player 2
+ PORT_START("P2") // Player 2
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
@@ -3336,7 +3336,7 @@ static INPUT_PORTS_START( atehate )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("COINS") // Coins
+ PORT_START("COINS") // Coins
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_IMPULSE(5)
@@ -3346,7 +3346,7 @@ static INPUT_PORTS_START( atehate )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") // 2 DSWs - $e00001 & 3.b
+ PORT_START("DSW") // 2 DSWs - $e00001 & 3.b
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3")
PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 3C_1C ) )
@@ -3397,13 +3397,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( blandia )
- PORT_START_TAG("P1") //Player 1 - $400000.w
+ PORT_START("P1") //Player 1 - $400000.w
JOY_TYPE1_3BUTTONS(1)
- PORT_START_TAG("P2") //Player 2 - $400002.w
+ PORT_START("P2") //Player 2 - $400002.w
JOY_TYPE1_3BUTTONS(2)
- PORT_START_TAG("COINS") //Coins - $400004.w
+ PORT_START("COINS") //Coins - $400004.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -3413,7 +3413,7 @@ static INPUT_PORTS_START( blandia )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b
+ PORT_START("DSW") //2 DSWs - $600001 & 3.b
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0001, DEF_STR( On ) )
@@ -3468,13 +3468,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( blockcar )
- PORT_START_TAG("P1") //Player 1 - $500001.b
+ PORT_START("P1") //Player 1 - $500001.b
JOY_TYPE1_2BUTTONS(1) // button2 = speed up
- PORT_START_TAG("P2") //Player 2 - $500003.b
+ PORT_START("P2") //Player 2 - $500003.b
JOY_TYPE1_2BUTTONS(2)
- PORT_START_TAG("COINS") //Coins + DSW - $500005.b
+ PORT_START("COINS") //Coins + DSW - $500005.b
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -3483,7 +3483,7 @@ static INPUT_PORTS_START( blockcar )
PORT_DIPSETTING( 0x0010, "Thunder & Lightning 2" )
PORT_DIPSETTING( 0x0000, "Block Carnival" )
- PORT_START_TAG("DSW") //2 DSWs - $300003 & 1.b
+ PORT_START("DSW") //2 DSWs - $300003 & 1.b
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
@@ -3533,13 +3533,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( calibr50 )
- PORT_START_TAG("P1") //Player 1
+ PORT_START("P1") //Player 1
JOY_TYPE2_2BUTTONS(1)
- PORT_START_TAG("P2") //Player 2
+ PORT_START("P2") //Player 2
JOY_TYPE2_2BUTTONS(2)
- PORT_START_TAG("COINS") //Coins
+ PORT_START("COINS") //Coins
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -3549,7 +3549,7 @@ static INPUT_PORTS_START( calibr50 )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
- PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b
+ PORT_START("DSW") //2 DSWs - $600001 & 3.b
PORT_DIPNAME( 0x4001, 0x4000, "Licensed To" )
PORT_DIPSETTING( 0x0001, "Romstar" )
PORT_DIPSETTING( 0x4001, "Taito America" )
@@ -3595,10 +3595,10 @@ static INPUT_PORTS_START( calibr50 )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("ROT1") // Rotation Player 1
+ PORT_START("ROT1") // Rotation Player 1
JOY_ROTATION(1, Z, X)
- PORT_START_TAG("ROT2") // Rotation Player 2
+ PORT_START("ROT2") // Rotation Player 2
JOY_ROTATION(2, N, M)
INPUT_PORTS_END
@@ -3607,13 +3607,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( daioh )
- PORT_START_TAG("P1")
+ PORT_START("P1")
JOY_TYPE1_3BUTTONS(1)
- PORT_START_TAG("P2")
+ PORT_START("P2")
JOY_TYPE1_3BUTTONS(2)
- PORT_START_TAG("COINS")
+ PORT_START("COINS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -3632,7 +3632,7 @@ static INPUT_PORTS_START( daioh )
PORT_DIPSETTING( 0x0080, "USA (6 buttons)" )
PORT_DIPSETTING( 0x0000, "Japan (2 buttons)" )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3")
PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 3C_1C ) )
@@ -3678,7 +3678,7 @@ static INPUT_PORTS_START( daioh )
PORT_DIPSETTING( 0x4000, "800k and 2000k only" )
PORT_DIPSETTING( 0x0000, "1000k Only" )
- PORT_START_TAG("EXTRA")
+ PORT_START("EXTRA")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1)
@@ -3694,13 +3694,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( drgnunit )
- PORT_START_TAG("P1") //Player 1
+ PORT_START("P1") //Player 1
JOY_TYPE1_3BUTTONS(1)
- PORT_START_TAG("P2") //Player 2
+ PORT_START("P2") //Player 2
JOY_TYPE1_3BUTTONS(2)
- PORT_START_TAG("COINS") //Coins
+ PORT_START("COINS") //Coins
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -3717,7 +3717,7 @@ static INPUT_PORTS_START( drgnunit )
PORT_DIPSETTING( 0x0040, "Seta USA / Taito America" )
PORT_DIPSETTING( 0x0000, "Seta USA / Romstar" )
- PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b
+ PORT_START("DSW") //2 DSWs - $600001 & 3.b
PORT_DIPNAME( 0x0003, 0x0002, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x0003, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Normal ) )
@@ -3765,13 +3765,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( downtown )
- PORT_START_TAG("P1") //Player 1
+ PORT_START("P1") //Player 1
JOY_TYPE2_2BUTTONS(1)
- PORT_START_TAG("P2") //Player 2
+ PORT_START("P2") //Player 2
JOY_TYPE2_2BUTTONS(2)
- PORT_START_TAG("COINS") //Coins
+ PORT_START("COINS") //Coins
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -3781,7 +3781,7 @@ static INPUT_PORTS_START( downtown )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
- PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b
+ PORT_START("DSW") //2 DSWs - $600001 & 3.b
PORT_DIPNAME( 0x0001, 0x0000, "Sales" ) PORT_DIPLOCATION("SW1:1") /* Manual for USA version says "Always Off" */
PORT_DIPSETTING( 0x0001, "Japan Only" )
PORT_DIPSETTING( 0x0000, DEF_STR( World ) )
@@ -3838,10 +3838,10 @@ static INPUT_PORTS_START( downtown )
PORT_DIPSETTING( 0x8000, "1" )
PORT_DIPSETTING( 0x0000, "2" )
- PORT_START_TAG("ROT1") //Rotation Player 1
+ PORT_START("ROT1") //Rotation Player 1
JOY_ROTATION(1, Z, X)
- PORT_START_TAG("ROT2") //Rotation Player 2
+ PORT_START("ROT2") //Rotation Player 2
JOY_ROTATION(2, N, M)
INPUT_PORTS_END
@@ -3852,13 +3852,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( eightfrc )
- PORT_START_TAG("P1") //Player 1
+ PORT_START("P1") //Player 1
JOY_TYPE1_2BUTTONS(1)
- PORT_START_TAG("P2") //Player 2
+ PORT_START("P2") //Player 2
JOY_TYPE1_2BUTTONS(2)
- PORT_START_TAG("COINS") //Coins
+ PORT_START("COINS") //Coins
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -3868,7 +3868,7 @@ static INPUT_PORTS_START( eightfrc )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b
+ PORT_START("DSW") //2 DSWs - $600001 & 3.b
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3")
PORT_DIPSETTING( 0x0004, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0005, DEF_STR( 3C_1C ) )
@@ -3923,7 +3923,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( extdwnhl )
- PORT_START_TAG("P1") //Player 1
+ PORT_START("P1") //Player 1
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -3933,7 +3933,7 @@ static INPUT_PORTS_START( extdwnhl )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") //Player 2
+ PORT_START("P2") //Player 2
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -3943,7 +3943,7 @@ static INPUT_PORTS_START( extdwnhl )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("COINS") //Coins
+ PORT_START("COINS") //Coins
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -3961,7 +3961,7 @@ static INPUT_PORTS_START( extdwnhl )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("DSW") //2 DSWs - $400009 & b.b
+ PORT_START("DSW") //2 DSWs - $400009 & b.b
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -4017,13 +4017,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( gundhara )
- PORT_START_TAG("P1") //Player 1
+ PORT_START("P1") //Player 1
JOY_TYPE1_3BUTTONS(1)
- PORT_START_TAG("P2") //Player 2
+ PORT_START("P2") //Player 2
JOY_TYPE1_3BUTTONS(2)
- PORT_START_TAG("COINS") //Coins
+ PORT_START("COINS") //Coins
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -4033,7 +4033,7 @@ static INPUT_PORTS_START( gundhara )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b
+ PORT_START("DSW") //2 DSWs - $600001 & 3.b
PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3,4")
PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0005, DEF_STR( 3C_1C ) )
@@ -4086,7 +4086,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( zombraid )
- PORT_START_TAG("P1") //Player 1
+ PORT_START("P1") //Player 1
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -4096,7 +4096,7 @@ static INPUT_PORTS_START( zombraid )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") //Player 2
+ PORT_START("P2") //Player 2
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -4106,7 +4106,7 @@ static INPUT_PORTS_START( zombraid )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("COINS") //Coins
+ PORT_START("COINS") //Coins
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -4116,7 +4116,7 @@ static INPUT_PORTS_START( zombraid )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0001, 0x0001, "Vertical Screen Flip" ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -4164,14 +4164,14 @@ static INPUT_PORTS_START( zombraid )
/* The user calibrated values are lost each time MAME starts, so the gun always needs to be re-calibrated. */
/* Either NVRAM or battery backed up RAM is not emulated. */
/* For now it is best to just use a Save State after calibration to remember the setting. */
- PORT_START_TAG("GUNX1") /* Player 1 Gun X ($f00003) */
+ PORT_START("GUNX1") /* Player 1 Gun X ($f00003) */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, -1, 0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("GUNY1") /* Player 1 Gun Y ($f00003) */
+ PORT_START("GUNY1") /* Player 1 Gun Y ($f00003) */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1, 0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("GUNX2") /* Player 2 Gun X ($f00003) */
+ PORT_START("GUNX2") /* Player 2 Gun X ($f00003) */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, -1, 0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("GUNY2") /* Player 2 Gun Y ($f00003) */
+ PORT_START("GUNY2") /* Player 2 Gun Y ($f00003) */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1, 0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(2)
INPUT_PORTS_END
@@ -4181,13 +4181,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( jjsquawk )
- PORT_START_TAG("P1") //Player 1 - $400000.w
+ PORT_START("P1") //Player 1 - $400000.w
JOY_TYPE1_2BUTTONS(1)
- PORT_START_TAG("P2") //Player 2 - $400002.w
+ PORT_START("P2") //Player 2 - $400002.w
JOY_TYPE1_2BUTTONS(2)
- PORT_START_TAG("COINS") //Coins - $400004.w
+ PORT_START("COINS") //Coins - $400004.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -4197,7 +4197,7 @@ static INPUT_PORTS_START( jjsquawk )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b
+ PORT_START("DSW") //2 DSWs - $600001 & 3.b
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3")
PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 3C_1C ) )
@@ -4249,13 +4249,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( kamenrid )
- PORT_START_TAG("P1") //Player 1
+ PORT_START("P1") //Player 1
JOY_TYPE1_2BUTTONS(1) // BUTTON3 in "test mode" only
- PORT_START_TAG("P2") //Player 2
+ PORT_START("P2") //Player 2
JOY_TYPE1_2BUTTONS(2) // BUTTON3 in "test mode" only
- PORT_START_TAG("COINS") //Coins
+ PORT_START("COINS") //Coins
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -4274,7 +4274,7 @@ static INPUT_PORTS_START( kamenrid )
PORT_DIPSETTING( 0x0080, DEF_STR( USA ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Japan ) )
- PORT_START_TAG("DSW") // IN3 - 2 DSWs - $500005 & 7.b
+ PORT_START("DSW") // IN3 - 2 DSWs - $500005 & 7.b
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Off ) )
@@ -4335,13 +4335,13 @@ INPUT_PORTS_END
PORT_BIT( 0x0fff, 0x0000, IPT_TRACKBALL_##_dir_ ) PORT_PLAYER(_n_) PORT_SENSITIVITY(70) PORT_KEYDELTA(30) PORT_REVERSE
static INPUT_PORTS_START( krzybowl )
- PORT_START_TAG("P1") //Player 1
+ PORT_START("P1") //Player 1
JOY_TYPE1_3BUTTONS(1)
- PORT_START_TAG("P2") //Player 2
+ PORT_START("P2") //Player 2
JOY_TYPE1_3BUTTONS(2)
- PORT_START_TAG("COINS") //Coins
+ PORT_START("COINS") //Coins
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_IMPULSE(5)
@@ -4351,7 +4351,7 @@ static INPUT_PORTS_START( krzybowl )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b
+ PORT_START("DSW") //2 DSWs - $600001 & 3.b
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -4399,16 +4399,16 @@ static INPUT_PORTS_START( krzybowl )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("TRACK1_X") //Rotation X Player 1
+ PORT_START("TRACK1_X") //Rotation X Player 1
KRZYBOWL_TRACKBALL(X,1)
- PORT_START_TAG("TRACK1_Y") //Rotation Y Player 1
+ PORT_START("TRACK1_Y") //Rotation Y Player 1
KRZYBOWL_TRACKBALL(Y,1)
- PORT_START_TAG("TRACK2_X") //Rotation X Player 2
+ PORT_START("TRACK2_X") //Rotation X Player 2
KRZYBOWL_TRACKBALL(X,2) PORT_REVERSE
- PORT_START_TAG("TRACK2_Y") //Rotation Y Player 2
+ PORT_START("TRACK2_Y") //Rotation Y Player 2
KRZYBOWL_TRACKBALL(Y,2)
INPUT_PORTS_END
@@ -4418,13 +4418,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( madshark )
- PORT_START_TAG("P1") //Player 1
+ PORT_START("P1") //Player 1
JOY_TYPE1_2BUTTONS(1)
- PORT_START_TAG("P2") //Player 2
+ PORT_START("P2") //Player 2
JOY_TYPE1_2BUTTONS(2)
- PORT_START_TAG("COINS") //Coins
+ PORT_START("COINS") //Coins
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -4443,7 +4443,7 @@ static INPUT_PORTS_START( madshark )
PORT_DIPSETTING( 0x0080, DEF_STR( Japan ) )
PORT_DIPSETTING( 0x0000, DEF_STR( World ) )
- PORT_START_TAG("DSW") //2 DSWs
+ PORT_START("DSW") //2 DSWs
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -4494,13 +4494,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( metafox )
- PORT_START_TAG("P1") //Player 1
+ PORT_START("P1") //Player 1
JOY_TYPE2_2BUTTONS(1)
- PORT_START_TAG("P2") //Player 2
+ PORT_START("P2") //Player 2
JOY_TYPE2_2BUTTONS(2)
- PORT_START_TAG("COINS") //Coins
+ PORT_START("COINS") //Coins
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -4510,7 +4510,7 @@ static INPUT_PORTS_START( metafox )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
- PORT_START_TAG("DSW") //$600001 & 3.b
+ PORT_START("DSW") //$600001 & 3.b
PORT_DIPNAME( 0x4001, 0x4001, "Licensed To" )
PORT_DIPSETTING( 0x0001, "Jordan" )
PORT_DIPSETTING( 0x4001, "Romstar" )
@@ -4563,13 +4563,13 @@ INPUT_PORTS_END
static INPUT_PORTS_START( msgundam )
- PORT_START_TAG("P1") //Player 1 - $400000.w
+ PORT_START("P1") //Player 1 - $400000.w
JOY_TYPE1_2BUTTONS(1)
- PORT_START_TAG("P2") //Player 2 - $400002.w
+ PORT_START("P2") //Player 2 - $400002.w
JOY_TYPE1_2BUTTONS(2)
- PORT_START_TAG("COINS") //Coins - $400004.w
+ PORT_START("COINS") //Coins - $400004.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -4581,7 +4581,7 @@ static INPUT_PORTS_START( msgundam )
PORT_DIPSETTING( 0x0080, DEF_STR( English ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Japanese ) )
- PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b
+ PORT_START("DSW") //2 DSWs - $600001 & 3.b
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3")
PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) )
@@ -4646,13 +4646,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( oisipuzl )
- PORT_START_TAG("P1") //Player 1
+ PORT_START("P1") //Player 1
JOY_TYPE1_2BUTTONS(1)
- PORT_START_TAG("P2") //Player 2
+ PORT_START("P2") //Player 2
JOY_TYPE1_2BUTTONS(2)
- PORT_START_TAG("COINS") //Coins
+ PORT_START("COINS") //Coins
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -4662,7 +4662,7 @@ static INPUT_PORTS_START( oisipuzl )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b
+ PORT_START("DSW") //2 DSWs - $600001 & 3.b
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
@@ -4706,15 +4706,15 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( kiwame )
- PORT_START_TAG("P1") //Unused
- PORT_START_TAG("P2") //Unused
+ PORT_START("P1") //Unused
+ PORT_START("P2") //Unused
- PORT_START_TAG("COINS") //Coins
+ PORT_START("COINS") //Coins
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_IMPULSE(5)
- PORT_START_TAG("DSW") //2 DSWs - $e00001 & 3.b
+ PORT_START("DSW") //2 DSWs - $e00001 & 3.b
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3")
PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 3C_1C ) )
@@ -4773,14 +4773,14 @@ bit 0 a b c d lc
5 st bt
*/
- PORT_START_TAG("KEY0")
+ PORT_START("KEY0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
PORT_BIT( 0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_J )
@@ -4789,7 +4789,7 @@ bit 0 a b c d lc
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_I )
@@ -4798,7 +4798,7 @@ bit 0 a b c d lc
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_C )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_K )
@@ -4806,7 +4806,7 @@ bit 0 a b c d lc
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
PORT_BIT( 0xffe0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY4")
+ PORT_START("KEY4")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_D )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_L )
@@ -4821,7 +4821,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( qzkklogy )
- PORT_START_TAG("P1") //Player 1 - $b00001.b
+ PORT_START("P1") //Player 1 - $b00001.b
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
@@ -4831,7 +4831,7 @@ static INPUT_PORTS_START( qzkklogy )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") //Player 2 - $b00003.b
+ PORT_START("P2") //Player 2 - $b00003.b
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
@@ -4841,13 +4841,13 @@ static INPUT_PORTS_START( qzkklogy )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("COINS") //Coins - $b00005.b
+ PORT_START("COINS") //Coins - $b00005.b
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b
+ PORT_START("DSW") //2 DSWs - $600001 & 3.b
PORT_DIPNAME( 0x0003, 0x0003, "Unknown 1-0&1*" ) /* Manual States dips 1-5 are unused */
PORT_DIPSETTING( 0x0000, "0" )
PORT_DIPSETTING( 0x0001, "1" )
@@ -4901,7 +4901,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( qzkklgy2 )
- PORT_START_TAG("P1") //Player 1 - $b00001.b
+ PORT_START("P1") //Player 1 - $b00001.b
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
@@ -4911,7 +4911,7 @@ static INPUT_PORTS_START( qzkklgy2 )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") //Player 2 - $b00003.b
+ PORT_START("P2") //Player 2 - $b00003.b
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
@@ -4921,13 +4921,13 @@ static INPUT_PORTS_START( qzkklgy2 )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("COINS") //Coins - $b00005.b
+ PORT_START("COINS") //Coins - $b00005.b
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b
+ PORT_START("DSW") //2 DSWs - $600001 & 3.b
PORT_DIPNAME( 0x0003, 0x0003, "Unknown 1-0&1*" ) /* Manual States dips 1-5 are unused */
PORT_DIPSETTING( 0x0000, "0" )
PORT_DIPSETTING( 0x0001, "1" )
@@ -4980,13 +4980,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( rezon )
- PORT_START_TAG("P1") //Player 1
+ PORT_START("P1") //Player 1
JOY_TYPE1_3BUTTONS(1) // 1 used??
- PORT_START_TAG("P2") //Player 2
+ PORT_START("P2") //Player 2
JOY_TYPE1_3BUTTONS(2) // 1 used ??
- PORT_START_TAG("COINS") //Coins
+ PORT_START("COINS") //Coins
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -4996,7 +4996,7 @@ static INPUT_PORTS_START( rezon )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b
+ PORT_START("DSW") //2 DSWs - $600001 & 3.b
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -5059,13 +5059,13 @@ INPUT_PORTS_END
pressing P1's button3 freezes the game (pressing P2's button3 resumes it).
*/
static INPUT_PORTS_START( neobattl )
- PORT_START_TAG("P1") // Player 1 - $400000.w
+ PORT_START("P1") // Player 1 - $400000.w
JOY_TYPE1_1BUTTON(1) // bump to 3 buttons for freezing to work
- PORT_START_TAG("P2") //Player 2 - $400002.w
+ PORT_START("P2") //Player 2 - $400002.w
JOY_TYPE1_1BUTTON(2) // bump to 3 buttons for freezing to work
- PORT_START_TAG("COINS") //Coins - $400004.w
+ PORT_START("COINS") //Coins - $400004.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -5075,7 +5075,7 @@ static INPUT_PORTS_START( neobattl )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b
+ PORT_START("DSW") //2 DSWs - $600001 & 3.b
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -5135,13 +5135,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( sokonuke )
- PORT_START_TAG("P1") //Player 1
+ PORT_START("P1") //Player 1
JOY_TYPE1_1BUTTON(1)
- PORT_START_TAG("P2") //Player 2
+ PORT_START("P2") //Player 2
JOY_TYPE1_1BUTTON(2)
- PORT_START_TAG("COINS") //Coins
+ PORT_START("COINS") //Coins
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -5151,7 +5151,7 @@ static INPUT_PORTS_START( sokonuke )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") //2 DSWs - $400009 & b.b
+ PORT_START("DSW") //2 DSWs - $400009 & b.b
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -5207,13 +5207,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( stg )
- PORT_START_TAG("P1") //Player 1 - $b00001.b
+ PORT_START("P1") //Player 1 - $b00001.b
JOY_TYPE1_2BUTTONS(1)
- PORT_START_TAG("P2") //Player 2 - $b00003.b
+ PORT_START("P2") //Player 2 - $b00003.b
JOY_TYPE1_2BUTTONS(2)
- PORT_START_TAG("COINS") //Coins - $b00005.b
+ PORT_START("COINS") //Coins - $b00005.b
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -5222,7 +5222,7 @@ static INPUT_PORTS_START( stg )
/* This is the index in a table with pointers to the
title logo, but the table is filled with just 1 value */
- PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b
+ PORT_START("DSW") //2 DSWs - $600001 & 3.b
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) ) // 0
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) ) // 4
@@ -5264,13 +5264,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( thunderl )
- PORT_START_TAG("P1") //Player 1
+ PORT_START("P1") //Player 1
JOY_TYPE1_2BUTTONS(1) // button2 = speed up
- PORT_START_TAG("P2") //Player 2
+ PORT_START("P2") //Player 2
JOY_TYPE1_2BUTTONS(2)
- PORT_START_TAG("COINS") //Coins + DSW
+ PORT_START("COINS") //Coins + DSW
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -5288,7 +5288,7 @@ static INPUT_PORTS_START( thunderl )
// PORT_DIPSETTING( 0x0020, DEF_STR( None ) )
// PORT_DIPSETTING( 0x0000, DEF_STR( None ) )
- PORT_START_TAG("DSW") //2 DSWs - $600003 & 1.b
+ PORT_START("DSW") //2 DSWs - $600003 & 1.b
PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3,4")
PORT_DIPSETTING( 0x000c, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x000d, DEF_STR( 3C_1C ) )
@@ -5347,10 +5347,10 @@ static INPUT_PORTS_START( thunderl )
PORT_DIPSETTING( 0x0000, DEF_STR( Hardest ) )
/* These are needed due to the memory map shared with Wit's */
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P4") //Player 4
+ PORT_START("P4") //Player 4
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
@@ -5361,13 +5361,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( tndrcade )
- PORT_START_TAG("P1") //Player 1
+ PORT_START("P1") //Player 1
JOY_TYPE1_2BUTTONS(1)
- PORT_START_TAG("P2") //Player 2
+ PORT_START("P2") //Player 2
JOY_TYPE1_2BUTTONS(2)
- PORT_START_TAG("COINS") //Coins
+ PORT_START("COINS") //Coins
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -5377,7 +5377,7 @@ static INPUT_PORTS_START( tndrcade )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b
+ PORT_START("DSW") //2 DSWs - $600001 & 3.b
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
@@ -5447,13 +5447,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( twineagl )
- PORT_START_TAG("P1") //Player 1
+ PORT_START("P1") //Player 1
JOY_TYPE1_2BUTTONS(1)
- PORT_START_TAG("P2") //Player 2
+ PORT_START("P2") //Player 2
JOY_TYPE1_2BUTTONS(2)
- PORT_START_TAG("COINS") //Coins
+ PORT_START("COINS") //Coins
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -5463,7 +5463,7 @@ static INPUT_PORTS_START( twineagl )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b
+ PORT_START("DSW") //2 DSWs - $600001 & 3.b
PORT_DIPNAME( 0x4001, 0x4001, "Copyright" ) // Always "Seta" if sim. players = 1
PORT_DIPSETTING( 0x4001, "Seta (Taito license)" )
PORT_DIPSETTING( 0x0001, "Taito" )
@@ -5513,13 +5513,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( umanclub )
- PORT_START_TAG("P1") //Player 1
+ PORT_START("P1") //Player 1
JOY_TYPE1_2BUTTONS(1)
- PORT_START_TAG("P2") //Player 2
+ PORT_START("P2") //Player 2
JOY_TYPE1_2BUTTONS(2)
- PORT_START_TAG("COINS") //Coins
+ PORT_START("COINS") //Coins
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -5529,7 +5529,7 @@ static INPUT_PORTS_START( umanclub )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") //2 DSWs
+ PORT_START("DSW") //2 DSWs
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -5588,13 +5588,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( utoukond )
- PORT_START_TAG("P1") //Player 1
+ PORT_START("P1") //Player 1
JOY_TYPE1_3BUTTONS(1)
- PORT_START_TAG("P2") //Player 2
+ PORT_START("P2") //Player 2
JOY_TYPE1_3BUTTONS(2)
- PORT_START_TAG("COINS") //Coins
+ PORT_START("COINS") //Coins
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -5613,7 +5613,7 @@ static INPUT_PORTS_START( utoukond )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("DSW") //2 DSWs
+ PORT_START("DSW") //2 DSWs
PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3,4")
PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0005, DEF_STR( 3C_1C ) )
@@ -5676,35 +5676,35 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( usclssic )
- PORT_START_TAG("P1X") /* muxed port 0 */
+ PORT_START("P1X") /* muxed port 0 */
PORT_BIT( 0x0fff, 0x0000, IPT_TRACKBALL_X ) PORT_SENSITIVITY(70) PORT_KEYDELTA(30) PORT_RESET
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P1Y") /* muxed port 0 */
+ PORT_START("P1Y") /* muxed port 0 */
PORT_BIT( 0x0fff, 0x0000, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(70) PORT_KEYDELTA(30) PORT_RESET
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2X") /* muxed port 1 */
+ PORT_START("P2X") /* muxed port 1 */
PORT_BIT( 0x0fff, 0x0000, IPT_TRACKBALL_X ) PORT_SENSITIVITY(70) PORT_KEYDELTA(30) PORT_RESET PORT_COCKTAIL
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2Y") /* muxed port 1 */
+ PORT_START("P2Y") /* muxed port 1 */
PORT_BIT( 0x0fff, 0x0000, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(70) PORT_KEYDELTA(30) PORT_RESET PORT_COCKTAIL
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("COINS")
+ PORT_START("COINS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) // tested (sound related?)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -5714,7 +5714,7 @@ static INPUT_PORTS_START( usclssic )
PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_TILT )
- PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b
+ PORT_START("DSW") //2 DSWs - $600001 & 3.b
PORT_DIPNAME( 0x0001, 0x0001, "Credits For 9-Hole" ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x0001, "2" )
PORT_DIPSETTING( 0x0000, "3" )
@@ -5767,14 +5767,14 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( wrofaero )
- PORT_START_TAG("P1") //Player 1 - $400000.w
+ PORT_START("P1") //Player 1 - $400000.w
JOY_TYPE1_3BUTTONS(1) // 3rd button selects the weapon
// when the dsw for cheating is on
- PORT_START_TAG("P2") //Player 2 - $400002.w
+ PORT_START("P2") //Player 2 - $400002.w
JOY_TYPE1_3BUTTONS(2)
- PORT_START_TAG("COINS") //Coins - $400004.w
+ PORT_START("COINS") //Coins - $400004.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -5784,7 +5784,7 @@ static INPUT_PORTS_START( wrofaero )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b
+ PORT_START("DSW") //2 DSWs - $600001 & 3.b
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -5838,13 +5838,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( wits )
- PORT_START_TAG("P1") //Player 1
+ PORT_START("P1") //Player 1
JOY_TYPE1_2BUTTONS(1)
- PORT_START_TAG("P2") //Player 2
+ PORT_START("P2") //Player 2
JOY_TYPE1_2BUTTONS(2)
- PORT_START_TAG("COINS") //Coins + DSW
+ PORT_START("COINS") //Coins + DSW
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -5861,7 +5861,7 @@ static INPUT_PORTS_START( wits )
PORT_DIPSETTING( 0x0040, "Visco (Japan Only)" )
PORT_DIPSETTING( 0x0000, "Athena (Japan Only)" )
- PORT_START_TAG("DSW") //2 DSWs - $600003 & 1.b
+ PORT_START("DSW") //2 DSWs - $600003 & 1.b
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
@@ -5905,10 +5905,10 @@ static INPUT_PORTS_START( wits )
PORT_DIPSETTING( 0x4000, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 1C_6C ) )
- PORT_START_TAG("P3") //Player 3
+ PORT_START("P3") //Player 3
JOY_TYPE1_2BUTTONS(3)
- PORT_START_TAG("P4") //Player 4
+ PORT_START("P4") //Player 4
JOY_TYPE1_2BUTTONS(4)
INPUT_PORTS_END
@@ -5918,13 +5918,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( zingzip )
- PORT_START_TAG("P1") //Player 1 - $400000.w
+ PORT_START("P1") //Player 1 - $400000.w
JOY_TYPE1_2BUTTONS(1)
- PORT_START_TAG("P2") //Player 2 - $400002.w
+ PORT_START("P2") //Player 2 - $400002.w
JOY_TYPE1_2BUTTONS(2)
- PORT_START_TAG("COINS") //Coins - $400004.w
+ PORT_START("COINS") //Coins - $400004.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) // no coin 2
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -5934,7 +5934,7 @@ static INPUT_PORTS_START( zingzip )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b
+ PORT_START("DSW") //2 DSWs - $600001 & 3.b
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -5982,19 +5982,19 @@ INPUT_PORTS_END
*************************************/
static INPUT_PORTS_START( pairlove )
- PORT_START_TAG("P1") //Player 1 - $500001.b
+ PORT_START("P1") //Player 1 - $500001.b
JOY_TYPE1_2BUTTONS(1) // button2 = speed up
- PORT_START_TAG("P2") //Player 2 - $500003.b
+ PORT_START("P2") //Player 2 - $500003.b
JOY_TYPE1_2BUTTONS(2)
- PORT_START_TAG("COINS") //Coins + DSW - $500005.b
+ PORT_START("COINS") //Coins + DSW - $500005.b
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT )
- PORT_START_TAG("DSW") // 2 DIP switches
+ PORT_START("DSW") // 2 DIP switches
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -6039,13 +6039,13 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( orbs )
- PORT_START_TAG("P1") //Player 1
+ PORT_START("P1") //Player 1
JOY_TYPE1_1BUTTON(1)
- PORT_START_TAG("P2") //Player 2 ??
+ PORT_START("P2") //Player 2 ??
JOY_TYPE1_1BUTTON(2)
- PORT_START_TAG("COINS") //Coins
+ PORT_START("COINS") //Coins
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_IMPULSE(5)
@@ -6055,7 +6055,7 @@ static INPUT_PORTS_START( orbs )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b
+ PORT_START("DSW") //2 DSWs - $600001 & 3.b
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -6109,7 +6109,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( crazyfgt )
- PORT_START_TAG("COINS") //Coins - $610000.w
+ PORT_START("COINS") //Coins - $610000.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -6119,7 +6119,7 @@ static INPUT_PORTS_START( crazyfgt )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) // protection
- PORT_START_TAG("UNK") //? - $610002.w
+ PORT_START("UNK") //? - $610002.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -6129,7 +6129,7 @@ static INPUT_PORTS_START( crazyfgt )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("INPUT") //Player - $610004.w
+ PORT_START("INPUT") //Player - $610004.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("top-center") PORT_CODE(KEYCODE_5_PAD)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("bottom-center") PORT_CODE(KEYCODE_2_PAD)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("top-left") PORT_CODE(KEYCODE_4_PAD)
@@ -6139,7 +6139,7 @@ static INPUT_PORTS_START( crazyfgt )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SERVICE1 ) // ticket
- PORT_START_TAG("DSW") //2 DSWs - $630001 & 3.b
+ PORT_START("DSW") //2 DSWs - $630001 & 3.b
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3")
PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) )
@@ -6190,7 +6190,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( inttoote )
- PORT_START_TAG("DSW1") // DSW 1
+ PORT_START("DSW1") // DSW 1
PORT_DIPNAME( 0x03, 0x03, "Max Bet" )
PORT_DIPSETTING( 0x03, "10" )
PORT_DIPSETTING( 0x02, "20" )
@@ -6215,7 +6215,7 @@ static INPUT_PORTS_START( inttoote )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2_3") // DSW 2&3
+ PORT_START("DSW2_3") // DSW 2&3
PORT_DIPNAME( 0x0001, 0x0001, "Unknown 2-0" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -6269,7 +6269,7 @@ static INPUT_PORTS_START( inttoote )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SPECIAL ) // P1 coin out
@@ -6287,7 +6287,7 @@ static INPUT_PORTS_START( inttoote )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Door Open") PORT_TOGGLE
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Question Mark")
@@ -6313,7 +6313,7 @@ static INPUT_PORTS_START( inttoote )
5 1-6 (5H)
6 (6)
*/
- PORT_START_TAG("BET0") // 200000.w (0x08)
+ PORT_START("BET0") // 200000.w (0x08)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 1") PORT_CODE(KEYCODE_1_PAD)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 2") PORT_CODE(KEYCODE_2_PAD)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 3") PORT_CODE(KEYCODE_3_PAD)
@@ -6331,7 +6331,7 @@ static INPUT_PORTS_START( inttoote )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("BET1") // 200000.w (0x10)
+ PORT_START("BET1") // 200000.w (0x10)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 6") PORT_CODE(KEYCODE_6_PAD)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Collect")
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -6349,7 +6349,7 @@ static INPUT_PORTS_START( inttoote )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("BET2") // 200000.w (0x20)
+ PORT_START("BET2") // 200000.w (0x20)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 1-2") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 1-3") PORT_CODE(KEYCODE_A)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 1-4") PORT_CODE(KEYCODE_Z)
@@ -6367,7 +6367,7 @@ static INPUT_PORTS_START( inttoote )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("BET3") // 200000.w (0x40)
+ PORT_START("BET3") // 200000.w (0x40)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 2-3") PORT_CODE(KEYCODE_W)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 2-4") PORT_CODE(KEYCODE_S)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 2-5") PORT_CODE(KEYCODE_X)
@@ -6385,7 +6385,7 @@ static INPUT_PORTS_START( inttoote )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("BET4") // 200000.w (0x80)
+ PORT_START("BET4") // 200000.w (0x80)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 3-5") PORT_CODE(KEYCODE_D)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 3-6") PORT_CODE(KEYCODE_C)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 4-5") PORT_CODE(KEYCODE_R)
diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c
index d0fb5a49119..1da3e9a7b50 100644
--- a/src/mame/drivers/seta2.c
+++ b/src/mame/drivers/seta2.c
@@ -831,7 +831,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( gundamex )
- PORT_START_TAG("DSW1") // $600000.w
+ PORT_START("DSW1") // $600000.w
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0001, DEF_STR( On ) )
@@ -853,7 +853,7 @@ static INPUT_PORTS_START( gundamex )
PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW2") // $600002.w
+ PORT_START("DSW2") // $600002.w
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3")
PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) )
@@ -880,7 +880,7 @@ static INPUT_PORTS_START( gundamex )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P1") // $700000.w
+ PORT_START("P1") // $700000.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
@@ -891,7 +891,7 @@ static INPUT_PORTS_START( gundamex )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2") // $700002.w
+ PORT_START("P2") // $700002.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
@@ -902,7 +902,7 @@ static INPUT_PORTS_START( gundamex )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM") // $700004.w
+ PORT_START("SYSTEM") // $700004.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -915,7 +915,7 @@ static INPUT_PORTS_START( gundamex )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0") // $700008.w
+ PORT_START("IN0") // $700008.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -926,7 +926,7 @@ static INPUT_PORTS_START( gundamex )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") // $70000a.w
+ PORT_START("IN1") // $70000a.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -943,7 +943,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( grdians )
- PORT_START_TAG("DSW1") // $600000.w
+ PORT_START("DSW1") // $600000.w
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) ) // 0
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) ) // 1
@@ -966,7 +966,7 @@ static INPUT_PORTS_START( grdians )
PORT_DIPSETTING( 0x0080, DEF_STR( On ) )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW2") // $600002.w
+ PORT_START("DSW2") // $600002.w
PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3,4")
PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0005, DEF_STR( 3C_1C ) )
@@ -1003,7 +1003,7 @@ static INPUT_PORTS_START( grdians )
PORT_DIPSETTING( 0x0000, DEF_STR( Free_Play ) )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P1") // $700000.w
+ PORT_START("P1") // $700000.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
@@ -1014,7 +1014,7 @@ static INPUT_PORTS_START( grdians )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2") // $700002.w
+ PORT_START("P2") // $700002.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
@@ -1025,7 +1025,7 @@ static INPUT_PORTS_START( grdians )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM") // $700004.w
+ PORT_START("SYSTEM") // $700004.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1043,7 +1043,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( mj4simai )
- PORT_START_TAG("DSW1") // $600300.w
+ PORT_START("DSW1") // $600300.w
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 ) )
@@ -1068,7 +1068,7 @@ static INPUT_PORTS_START( mj4simai )
PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW2") // $600302.w
+ PORT_START("DSW2") // $600302.w
PORT_DIPNAME( 0x0007, 0x0004, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2,3")
PORT_DIPSETTING( 0x0004, "0" )
PORT_DIPSETTING( 0x0003, "1" )
@@ -1095,7 +1095,7 @@ static INPUT_PORTS_START( mj4simai )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM") // $600100.w
+ PORT_START("SYSTEM") // $600100.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1106,7 +1106,7 @@ static INPUT_PORTS_START( mj4simai )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY0") // $600000(0)
+ PORT_START("KEY0") // $600000(0)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_I )
@@ -1115,7 +1115,7 @@ static INPUT_PORTS_START( mj4simai )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY1") // $600000(1)
+ PORT_START("KEY1") // $600000(1)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_J )
@@ -1124,7 +1124,7 @@ static INPUT_PORTS_START( mj4simai )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN)
- PORT_START_TAG("KEY2") // $600000(2)
+ PORT_START("KEY2") // $600000(2)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_C )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_K )
@@ -1132,14 +1132,14 @@ static INPUT_PORTS_START( mj4simai )
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
PORT_BIT( 0xffe0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3") // $600000(3)
+ PORT_START("KEY3") // $600000(3)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_D )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_L )
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
PORT_BIT( 0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY4") // $600000(4)
+ PORT_START("KEY4") // $600000(4)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
@@ -1156,7 +1156,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( myangel )
- PORT_START_TAG("DSW1") // $700300.w
+ PORT_START("DSW1") // $700300.w
PORT_SERVICE_DIPLOC( 0x0001, IP_ACTIVE_LOW, "SW1:1" )
PORT_DIPUNUSED_DIPLOC( 0x0002, 0x0002, "SW1:2" ) /* Listed as "Unused" */
PORT_DIPUNUSED_DIPLOC( 0x0004, 0x0004, "SW1:3" ) /* Listed as "Unused" */
@@ -1176,7 +1176,7 @@ static INPUT_PORTS_START( myangel )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW2") // $700302.w
+ PORT_START("DSW2") // $700302.w
PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW2:1,2,3,4")
PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0005, DEF_STR( 3C_1C ) )
@@ -1202,7 +1202,7 @@ static INPUT_PORTS_START( myangel )
PORT_DIPSETTING( 0x0000, DEF_STR( Yes ) )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P1") //$700000.w
+ PORT_START("P1") //$700000.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1213,7 +1213,7 @@ static INPUT_PORTS_START( myangel )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2") //$700002.w
+ PORT_START("P2") //$700002.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1224,7 +1224,7 @@ static INPUT_PORTS_START( myangel )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM") //$700004.w
+ PORT_START("SYSTEM") //$700004.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1242,7 +1242,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( myangel2 )
- PORT_START_TAG("DSW1") //$600300.w
+ PORT_START("DSW1") //$600300.w
PORT_SERVICE_DIPLOC( 0x0001, IP_ACTIVE_LOW, "SW1:1" )
PORT_DIPUNUSED_DIPLOC( 0x0002, 0x0002, "SW1:2" ) /* Listed as "Unused" */
PORT_DIPUNUSED_DIPLOC( 0x0004, 0x0004, "SW1:3" ) /* Listed as "Unused" */
@@ -1262,7 +1262,7 @@ static INPUT_PORTS_START( myangel2 )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW2") //$600302.w
+ PORT_START("DSW2") //$600302.w
PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW2:1,2,3,4")
PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0005, DEF_STR( 3C_1C ) )
@@ -1286,7 +1286,7 @@ static INPUT_PORTS_START( myangel2 )
PORT_DIPUNUSED_DIPLOC( 0x0080, 0x0080, "SW2:8" ) /* Listed as "Unused" */
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P1") //$600000.w
+ PORT_START("P1") //$600000.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1297,7 +1297,7 @@ static INPUT_PORTS_START( myangel2 )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2") //$600002.w
+ PORT_START("P2") //$600002.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1308,7 +1308,7 @@ static INPUT_PORTS_START( myangel2 )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM") //$600004.w
+ PORT_START("SYSTEM") //$600004.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1326,7 +1326,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( pzlbowl )
- PORT_START_TAG("DSW1") //$400300.w
+ PORT_START("DSW1") //$400300.w
PORT_SERVICE_DIPLOC( 0x0001, IP_ACTIVE_LOW, "SW1:1" )
PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:2")
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -1350,7 +1350,7 @@ static INPUT_PORTS_START( pzlbowl )
PORT_DIPSETTING( 0x0000, "5" )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW2") //$400302.w
+ PORT_START("DSW2") //$400302.w
PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW2:1,2,3,4")
PORT_DIPSETTING( 0x0005, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0008, DEF_STR( 2C_1C ) )
@@ -1380,7 +1380,7 @@ static INPUT_PORTS_START( pzlbowl )
PORT_DIPSETTING( 0x0080, DEF_STR( Japanese ) )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P1") //$500000.w
+ PORT_START("P1") //$500000.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
@@ -1391,7 +1391,7 @@ static INPUT_PORTS_START( pzlbowl )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2") //$500002.w
+ PORT_START("P2") //$500002.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
@@ -1402,7 +1402,7 @@ static INPUT_PORTS_START( pzlbowl )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM") //$500004.w
+ PORT_START("SYSTEM") //$500004.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) // unused, test mode shows it
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1420,7 +1420,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( penbros )
- PORT_START_TAG("DSW1") //$500300.w
+ PORT_START("DSW1") //$500300.w
PORT_SERVICE_DIPLOC( 0x0001, IP_ACTIVE_LOW, "SW1:1" )
PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:2")
PORT_DIPSETTING( 0x0002, DEF_STR( Off ) )
@@ -1441,7 +1441,7 @@ static INPUT_PORTS_START( penbros )
PORT_DIPSETTING( 0x0000, DEF_STR( 1C_2C ) )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW2") //$500302.w
+ PORT_START("DSW2") //$500302.w
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
@@ -1464,7 +1464,7 @@ static INPUT_PORTS_START( penbros )
PORT_DIPSETTING( 0x0000, "5" )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P1") //$600000.w
+ PORT_START("P1") //$600000.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
@@ -1475,7 +1475,7 @@ static INPUT_PORTS_START( penbros )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2") //$600002.w
+ PORT_START("P2") //$600002.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
@@ -1486,7 +1486,7 @@ static INPUT_PORTS_START( penbros )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM") //$600004.w
+ PORT_START("SYSTEM") //$600004.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) // unused, test mode shows it
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1504,7 +1504,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( deerhunt )
- PORT_START_TAG("DSW1") // IN0 - $400000.w
+ PORT_START("DSW1") // IN0 - $400000.w
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x0005, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0006, DEF_STR( 2C_1C ) )
@@ -1529,7 +1529,7 @@ static INPUT_PORTS_START( deerhunt )
PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW2") // IN1 - fffd0a.w
+ PORT_START("DSW2") // IN1 - fffd0a.w
PORT_DIPNAME( 0x0001, 0x0001, "Vert. Flip Screen" ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1555,35 +1555,35 @@ static INPUT_PORTS_START( deerhunt )
PORT_DIPSETTING( 0x0000, "Hand Gun" )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("GUN1Y") // IN2 - $500000.b
+ PORT_START("GUN1Y") // IN2 - $500000.b
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1, 0, 0) PORT_MINMAX(0x08,0xf8) PORT_SENSITIVITY(35) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("GUN1X") // IN3 - $500001.b
+ PORT_START("GUN1X") // IN3 - $500001.b
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1, 0, 0) PORT_MINMAX(0x25,0xc5) PORT_SENSITIVITY(35) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("GUN2Y") // IN4 - $580000.b
+ PORT_START("GUN2Y") // IN4 - $580000.b
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) // P2 gun, read but not used
- PORT_START_TAG("GUN2X") // IN5 - $580001.b
+ PORT_START("GUN2X") // IN5 - $580001.b
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN ) // P2 gun, read but not used
- PORT_START_TAG("TRIGGER") // IN6 - $700000
+ PORT_START("TRIGGER") // IN6 - $700000
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_SPECIAL ) // trigger
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xff3f, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("PUMP") // IN7 - $700003.b
+ PORT_START("PUMP") // IN7 - $700003.b
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_SPECIAL ) // pump
PORT_BIT( 0xffbf, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("COIN") // IN8 - $700005.b
+ PORT_START("COIN") // IN8 - $700005.b
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SERVICE2 )
PORT_BIT( 0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("BUTTONS") // IN9 - $400002
+ PORT_START("BUTTONS") // IN9 - $400002
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) // trigger
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) // pump
PORT_BIT( 0xfffc, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c
index e6e7025c282..91d24dfefa3 100644
--- a/src/mame/drivers/sf.c
+++ b/src/mame/drivers/sf.c
@@ -291,7 +291,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( sf )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) )
@@ -339,7 +339,7 @@ static INPUT_PORTS_START( sf )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_SERVICE( 0x8000, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0007, 0x0007, "Continuation max stage" )
PORT_DIPSETTING( 0x0007, "5th" )
PORT_DIPSETTING( 0x0006, "4th" )
@@ -373,7 +373,7 @@ static INPUT_PORTS_START( sf )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -391,7 +391,7 @@ static INPUT_PORTS_START( sf )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("COINS")
+ PORT_START("COINS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -409,7 +409,7 @@ static INPUT_PORTS_START( sf )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -427,7 +427,7 @@ static INPUT_PORTS_START( sf )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -437,7 +437,7 @@ static INPUT_PORTS_START( sf )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_PLAYER(1)
@@ -447,7 +447,7 @@ static INPUT_PORTS_START( sf )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2)
@@ -457,7 +457,7 @@ static INPUT_PORTS_START( sf )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_PLAYER(2)
@@ -469,7 +469,7 @@ static INPUT_PORTS_START( sf )
INPUT_PORTS_END
static INPUT_PORTS_START( sfus )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) )
@@ -517,7 +517,7 @@ static INPUT_PORTS_START( sfus )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_SERVICE( 0x8000, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0007, 0x0007, "Continuation max stage" )
PORT_DIPSETTING( 0x0007, "5th" )
PORT_DIPSETTING( 0x0006, "4th" )
@@ -551,7 +551,7 @@ static INPUT_PORTS_START( sfus )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -569,7 +569,7 @@ static INPUT_PORTS_START( sfus )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1)
@@ -587,7 +587,7 @@ static INPUT_PORTS_START( sfus )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -607,7 +607,7 @@ static INPUT_PORTS_START( sfus )
INPUT_PORTS_END
static INPUT_PORTS_START( sfjp )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) )
@@ -655,7 +655,7 @@ static INPUT_PORTS_START( sfjp )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_SERVICE( 0x8000, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0007, 0x0007, "Continuation max stage" )
PORT_DIPSETTING( 0x0007, "5th" )
PORT_DIPSETTING( 0x0006, "4th" )
@@ -689,7 +689,7 @@ static INPUT_PORTS_START( sfjp )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -707,7 +707,7 @@ static INPUT_PORTS_START( sfjp )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("COINS")
+ PORT_START("COINS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -725,7 +725,7 @@ static INPUT_PORTS_START( sfjp )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -743,7 +743,7 @@ static INPUT_PORTS_START( sfjp )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/sfkick.c b/src/mame/drivers/sfkick.c
index 40187c536a8..a9bee1a0366 100644
--- a/src/mame/drivers/sfkick.c
+++ b/src/mame/drivers/sfkick.c
@@ -40,7 +40,7 @@ ADDRESS_MAP_END
#endif
static INPUT_PORTS_START( sfkick )
- PORT_START
+ PORT_START("IN0")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/sg1000a.c b/src/mame/drivers/sg1000a.c
index 59922d3bfc9..bae4a0fadb6 100644
--- a/src/mame/drivers/sg1000a.c
+++ b/src/mame/drivers/sg1000a.c
@@ -159,7 +159,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( sg1000 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
@@ -169,7 +169,7 @@ static INPUT_PORTS_START( sg1000 )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -179,7 +179,7 @@ static INPUT_PORTS_START( sg1000 )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT ( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coinage ) ) PORT_DIPLOCATION("DSW:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
diff --git a/src/mame/drivers/sgladiat.c b/src/mame/drivers/sgladiat.c
index 9204d7595bf..5080caf1004 100644
--- a/src/mame/drivers/sgladiat.c
+++ b/src/mame/drivers/sgladiat.c
@@ -218,7 +218,7 @@ ROM_START( sgladiat )
ROM_END
static INPUT_PORTS_START( sgladiat )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -228,7 +228,7 @@ static INPUT_PORTS_START( sgladiat )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -238,7 +238,7 @@ static INPUT_PORTS_START( sgladiat )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
@@ -248,7 +248,7 @@ static INPUT_PORTS_START( sgladiat )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* Copied from TNK3! */
+ PORT_START("DSW1") /* Copied from TNK3! */
PORT_DIPNAME( 0x01, 0x01, "Walk everywhere (Cheat)")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -271,7 +271,7 @@ static INPUT_PORTS_START( sgladiat )
PORT_DIPSETTING( 0x40, "50k 120k" )
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
- PORT_START_TAG("DSW2") /* Copied from TNK3! */
+ PORT_START("DSW2") /* Copied from TNK3! */
PORT_DIPNAME( 0x01, 0x01, "Bonus Occurrence" )
PORT_DIPSETTING( 0x01, "1st & every 2nd" )
PORT_DIPSETTING( 0x00, "1st & 2nd only" )
diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c
index 66eaab4a552..8479468b37b 100644
--- a/src/mame/drivers/shadfrce.c
+++ b/src/mame/drivers/shadfrce.c
@@ -323,13 +323,13 @@ ADDRESS_MAP_END
#if USE_SHADFRCE_FAKE_INPUT_PORTS
static INPUT_PORTS_START( shadfrce )
- PORT_START_TAG("P1") /* Fake IN0 (player 1 inputs) */
+ PORT_START("P1") /* Fake IN0 (player 1 inputs) */
SHADFRCE_PLAYER_INPUT( 1, IPT_START1 )
- PORT_START_TAG("P2") /* Fake IN1 (player 2 inputs) */
+ PORT_START("P2") /* Fake IN1 (player 2 inputs) */
SHADFRCE_PLAYER_INPUT( 2, IPT_START2 )
- PORT_START_TAG("EXTRA") /* Fake IN2 (players 1 & 2 extra inputs */
+ PORT_START("EXTRA") /* Fake IN2 (players 1 & 2 extra inputs */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1)
@@ -339,21 +339,21 @@ static INPUT_PORTS_START( shadfrce )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("OTHER") /* Fake IN3 (other extra inputs ?) */
+ PORT_START("OTHER") /* Fake IN3 (other extra inputs ?) */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SYSTEM") /* Fake IN4 (system inputs) */
+ PORT_START("SYSTEM") /* Fake IN4 (system inputs) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) /* only in "test mode" ? */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) /* only in "test mode" ? */
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("MISC") /* Fake IN5 (misc) */
+ PORT_START("MISC") /* Fake IN5 (misc) */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_VBLANK ) /* guess */
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* must be ACTIVE_LOW or 'shadfrcj' jumps to the end (code at 0x04902e) */
PORT_BIT( 0xeb, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1") /* Fake IN6 (DIP1) */
+ PORT_START("DSW1") /* Fake IN6 (DIP1) */
PORT_DIPNAME( 0x01, 0x01, "Unused DIP 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -376,7 +376,7 @@ static INPUT_PORTS_START( shadfrce )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW2") /* Fake IN7 (DIP2) */
+ PORT_START("DSW2") /* Fake IN7 (DIP2) */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -402,7 +402,7 @@ static INPUT_PORTS_START( shadfrce )
INPUT_PORTS_END
#else
static INPUT_PORTS_START( shadfrce )
- PORT_START_TAG("IN0") /* IN0 - $1d0020.w */
+ PORT_START("IN0") /* IN0 - $1d0020.w */
SHADFRCE_PLAYER_INPUT( 1, IPT_START1 )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN2 ) /* only in "test mode" ? */
@@ -417,7 +417,7 @@ static INPUT_PORTS_START( shadfrce )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* IN1 - $1d0022.w */
+ PORT_START("IN1") /* IN1 - $1d0022.w */
SHADFRCE_PLAYER_INPUT( 2, IPT_START2 )
PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0100, DEF_STR( Easy ) )
@@ -438,7 +438,7 @@ static INPUT_PORTS_START( shadfrce )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* IN2 - $1d0024.w */
+ PORT_START("IN2") /* IN2 - $1d0024.w */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1)
@@ -467,7 +467,7 @@ static INPUT_PORTS_START( shadfrce )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3") /* IN3 - $1d0026.w */
+ PORT_START("IN3") /* IN3 - $1d0026.w */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c
index a8523d08b95..aeea1ff35f1 100644
--- a/src/mame/drivers/shangha3.c
+++ b/src/mame/drivers/shangha3.c
@@ -212,7 +212,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( shangha3 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -230,7 +230,7 @@ static INPUT_PORTS_START( shangha3 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -240,7 +240,7 @@ static INPUT_PORTS_START( shangha3 )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -263,7 +263,7 @@ static INPUT_PORTS_START( shangha3 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
@@ -291,7 +291,7 @@ static INPUT_PORTS_START( shangha3 )
INPUT_PORTS_END
static INPUT_PORTS_START( heberpop )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -309,7 +309,7 @@ static INPUT_PORTS_START( heberpop )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_VBLANK ) /* vblank?? has to toggle */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -319,7 +319,7 @@ static INPUT_PORTS_START( heberpop )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Very_Easy) )
PORT_DIPSETTING( 0x0001, DEF_STR( Easy ) )
@@ -370,7 +370,7 @@ static INPUT_PORTS_START( heberpop )
INPUT_PORTS_END
static INPUT_PORTS_START( blocken )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -388,7 +388,7 @@ static INPUT_PORTS_START( blocken )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_VBLANK ) /* vblank?? has to toggle */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -398,7 +398,7 @@ static INPUT_PORTS_START( blocken )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0006, 0x0006, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0004, DEF_STR( Easy ) )
diff --git a/src/mame/drivers/shanghai.c b/src/mame/drivers/shanghai.c
index dfec903c9cd..b6e6cd87ba4 100644
--- a/src/mame/drivers/shanghai.c
+++ b/src/mame/drivers/shanghai.c
@@ -866,7 +866,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( kothello )
SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -877,7 +877,7 @@ static INPUT_PORTS_START( kothello )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -888,7 +888,7 @@ static INPUT_PORTS_START( kothello )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -899,7 +899,7 @@ static INPUT_PORTS_START( kothello )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
@@ -928,7 +928,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( shanghai )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -938,7 +938,7 @@ static INPUT_PORTS_START( shanghai )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -948,7 +948,7 @@ static INPUT_PORTS_START( shanghai )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -958,7 +958,7 @@ static INPUT_PORTS_START( shanghai )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Allow_Continue ) )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
@@ -982,7 +982,7 @@ static INPUT_PORTS_START( shanghai )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_4C ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, "Confirmation" )
PORT_DIPSETTING( 0x01, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
@@ -1007,7 +1007,7 @@ static INPUT_PORTS_START( shanghai )
INPUT_PORTS_END
static INPUT_PORTS_START( shangha2 )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -1017,7 +1017,7 @@ static INPUT_PORTS_START( shangha2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -1027,7 +1027,7 @@ static INPUT_PORTS_START( shangha2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -1037,7 +1037,7 @@ static INPUT_PORTS_START( shangha2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x06, 0x06, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x06, DEF_STR( Easy ) )
@@ -1058,7 +1058,7 @@ static INPUT_PORTS_START( shangha2 )
PORT_DIPSETTING( 0x40, "90" )
PORT_DIPSETTING( 0x00, "120" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, "Mystery Tiles" )
PORT_DIPSETTING( 0x03, "0" )
PORT_DIPSETTING( 0x02, "4" )
diff --git a/src/mame/drivers/shangkid.c b/src/mame/drivers/shangkid.c
index 47edbc98970..8654b741f8b 100644
--- a/src/mame/drivers/shangkid.c
+++ b/src/mame/drivers/shangkid.c
@@ -503,7 +503,7 @@ MACHINE_DRIVER_END
/***************************************************************************************/
static INPUT_PORTS_START( dynamski )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* service */
@@ -513,7 +513,7 @@ static INPUT_PORTS_START( dynamski )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -523,7 +523,7 @@ static INPUT_PORTS_START( dynamski )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -533,7 +533,7 @@ static INPUT_PORTS_START( dynamski )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Unknown ) )
/* what's 00 ? */
PORT_DIPSETTING( 0x01, "A" )
@@ -559,7 +559,7 @@ static INPUT_PORTS_START( dynamski )
INPUT_PORTS_END
static INPUT_PORTS_START( chinhero )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -582,7 +582,7 @@ static INPUT_PORTS_START( chinhero )
PORT_DIPSETTING( 0x80, DEF_STR( Hard ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Hardest ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* service */
@@ -592,7 +592,7 @@ static INPUT_PORTS_START( chinhero )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2)
@@ -602,7 +602,7 @@ static INPUT_PORTS_START( chinhero )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -614,7 +614,7 @@ static INPUT_PORTS_START( chinhero )
INPUT_PORTS_END
static INPUT_PORTS_START( shangkid )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
/* There are also two potentiometers on the PCB for volume:
** RV1 - Music
** RV2 - Sound Effects
@@ -643,7 +643,7 @@ static INPUT_PORTS_START( shangkid )
PORT_DIPSETTING( 0x80, DEF_STR( Hard ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Hardest ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* service */
@@ -653,7 +653,7 @@ static INPUT_PORTS_START( shangkid )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* busy flag? */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) /* kick */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) /* punch */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -663,7 +663,7 @@ static INPUT_PORTS_START( shangkid )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) /* kick */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) /* punch */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
diff --git a/src/mame/drivers/shaolins.c b/src/mame/drivers/shaolins.c
index a77e3554f6e..56eb7bd2897 100644
--- a/src/mame/drivers/shaolins.c
+++ b/src/mame/drivers/shaolins.c
@@ -71,7 +71,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( shaolins )
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -81,7 +81,7 @@ static INPUT_PORTS_START( shaolins )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -91,7 +91,7 @@ static INPUT_PORTS_START( shaolins )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
@@ -101,7 +101,7 @@ static INPUT_PORTS_START( shaolins )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* DSW0 */
+ PORT_START("DSW1") /* DSW0 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -124,7 +124,7 @@ static INPUT_PORTS_START( shaolins )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW1 */
+ PORT_START("DSW2") /* DSW1 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -146,7 +146,7 @@ static INPUT_PORTS_START( shaolins )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW2 */
+ PORT_START("DSW3") /* DSW2 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/shisen.c b/src/mame/drivers/shisen.c
index 42b3a6e26b2..3df3f8309d1 100644
--- a/src/mame/drivers/shisen.c
+++ b/src/mame/drivers/shisen.c
@@ -105,7 +105,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( shisen )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -115,7 +115,7 @@ static INPUT_PORTS_START( shisen )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -125,7 +125,7 @@ static INPUT_PORTS_START( shisen )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -135,7 +135,7 @@ static INPUT_PORTS_START( shisen )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Timer" ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -174,7 +174,7 @@ static INPUT_PORTS_START( shisen )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_5C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_6C ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c
index 6b75037dc85..50ab6377cd6 100644
--- a/src/mame/drivers/shootout.c
+++ b/src/mame/drivers/shootout.c
@@ -146,7 +146,7 @@ ADDRESS_MAP_END
/*******************************************************************************/
static INPUT_PORTS_START( shootout )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -168,7 +168,7 @@ static INPUT_PORTS_START( shootout )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -178,7 +178,7 @@ static INPUT_PORTS_START( shootout )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -188,7 +188,7 @@ static INPUT_PORTS_START( shootout )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x03, "3" )
diff --git a/src/mame/drivers/shougi.c b/src/mame/drivers/shougi.c
index ecdb6e9b76a..93f5738495d 100644
--- a/src/mame/drivers/shougi.c
+++ b/src/mame/drivers/shougi.c
@@ -313,7 +313,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( shougi )
- PORT_START_TAG("PLAYER1")
+ PORT_START("PLAYER1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -323,7 +323,7 @@ static INPUT_PORTS_START( shougi )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
- PORT_START_TAG("PLAYER2")
+ PORT_START("PLAYER2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
@@ -336,7 +336,7 @@ static INPUT_PORTS_START( shougi )
// dip switch order is not sequential. Only 2,3,4, and 5 identified.
// 1 and 6 missing, with three possible positions (the third available
// bit is not a dip switch)
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
diff --git a/src/mame/drivers/shuuz.c b/src/mame/drivers/shuuz.c
index d45d7f75133..820abbcf0e1 100644
--- a/src/mame/drivers/shuuz.c
+++ b/src/mame/drivers/shuuz.c
@@ -186,32 +186,32 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( shuuz )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x07fc, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("BUTTONS")
+ PORT_START("BUTTONS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x07fc, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE( 0x0800, IP_ACTIVE_LOW )
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("TRACKX")
+ PORT_START("TRACKX")
PORT_BIT( 0xff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(30) PORT_PLAYER(1)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("TRACKY")
+ PORT_START("TRACKY")
PORT_BIT( 0xff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(30) PORT_REVERSE PORT_PLAYER(1)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( shuuz2 )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x00fc, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -223,7 +223,7 @@ static INPUT_PORTS_START( shuuz2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Crosshair Debug SW") PORT_CODE(KEYCODE_C)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Freeze Debug SW") PORT_CODE(KEYCODE_F)
- PORT_START_TAG("BUTTONS")
+ PORT_START("BUTTONS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x00fc, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -235,11 +235,11 @@ static INPUT_PORTS_START( shuuz2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_START_TAG("TRACKX")
+ PORT_START("TRACKX")
PORT_BIT( 0xff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(30) PORT_PLAYER(1)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("TRACKY")
+ PORT_START("TRACKY")
PORT_BIT( 0xff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(30) PORT_REVERSE PORT_PLAYER(1)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c
index a85fb6c8e06..d15bd2a53e1 100644
--- a/src/mame/drivers/sidearms.c
+++ b/src/mame/drivers/sidearms.c
@@ -241,7 +241,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( sidearms )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -253,7 +253,7 @@ static INPUT_PORTS_START( sidearms )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -263,7 +263,7 @@ static INPUT_PORTS_START( sidearms )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -273,7 +273,7 @@ static INPUT_PORTS_START( sidearms )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x07, 0x04, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "0 (Easiest)" )
PORT_DIPSETTING( 0x06, "1" )
@@ -296,7 +296,7 @@ static INPUT_PORTS_START( sidearms )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
@@ -322,13 +322,13 @@ static INPUT_PORTS_START( sidearms )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK ) /* not sure, but likely */
INPUT_PORTS_END
static INPUT_PORTS_START( turtship )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -338,7 +338,7 @@ static INPUT_PORTS_START( turtship )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -348,7 +348,7 @@ static INPUT_PORTS_START( turtship )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -358,7 +358,7 @@ static INPUT_PORTS_START( turtship )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x01, "Invulnerability (Cheat)")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -384,7 +384,7 @@ static INPUT_PORTS_START( turtship )
PORT_DIPSETTING( 0x80, "7" )
PORT_DIPSETTING( 0x00, "8" )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -409,7 +409,7 @@ static INPUT_PORTS_START( turtship )
INPUT_PORTS_END
static INPUT_PORTS_START( dyger )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* seems to be 1-player only */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -419,7 +419,7 @@ static INPUT_PORTS_START( dyger )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -429,10 +429,10 @@ static INPUT_PORTS_START( dyger )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* seems to be 1-player only */
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -458,7 +458,7 @@ static INPUT_PORTS_START( dyger )
PORT_DIPSETTING( 0x80, "7" )
PORT_DIPSETTING( 0x00, "8" )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -483,7 +483,7 @@ static INPUT_PORTS_START( dyger )
INPUT_PORTS_END
static INPUT_PORTS_START( whizz )
- PORT_START_TAG("DSW0") /* 8-bit */
+ PORT_START("DSW0") /* 8-bit */
PORT_DIPNAME( 0x07, 0x04, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "0 (Easiest)" )
PORT_DIPSETTING( 0x06, "1" )
@@ -509,7 +509,7 @@ static INPUT_PORTS_START( whizz )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* 8-bit */
+ PORT_START("DSW1") /* 8-bit */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
@@ -534,7 +534,7 @@ static INPUT_PORTS_START( whizz )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* 8-bit */
+ PORT_START("DSW2") /* 8-bit */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
@@ -560,7 +560,7 @@ static INPUT_PORTS_START( whizz )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -578,7 +578,7 @@ static INPUT_PORTS_START( whizz )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN1") /* 8-bit */
+ PORT_START("IN1") /* 8-bit */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -586,14 +586,14 @@ static INPUT_PORTS_START( whizz )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* 8-bit */
+ PORT_START("IN2") /* 8-bit */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -603,7 +603,7 @@ static INPUT_PORTS_START( whizz )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/sidepckt.c b/src/mame/drivers/sidepckt.c
index b11790dac79..567ec33542c 100644
--- a/src/mame/drivers/sidepckt.c
+++ b/src/mame/drivers/sidepckt.c
@@ -178,7 +178,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( sidepckt )
- PORT_START_TAG("0X3000")
+ PORT_START("0X3000")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -188,7 +188,7 @@ static INPUT_PORTS_START( sidepckt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("0X3001")
+ PORT_START("0X3001")
/* I haven't found a way to make the game use the 2p controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -199,7 +199,7 @@ static INPUT_PORTS_START( sidepckt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("0X3002")
+ PORT_START("0X3002")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_3C ) )
@@ -223,7 +223,7 @@ static INPUT_PORTS_START( sidepckt )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("0X3003")
+ PORT_START("0X3003")
PORT_DIPNAME( 0x03, 0x03, "Timer Speed" )
PORT_DIPSETTING( 0x00, "Stopped (Cheat)")
PORT_DIPSETTING( 0x03, "Slow" )
diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c
index 23b42800810..d7e52860405 100644
--- a/src/mame/drivers/silkroad.c
+++ b/src/mame/drivers/silkroad.c
@@ -259,7 +259,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( silkroad )
- PORT_START_TAG("PLAYERS") /* Players inputs */
+ PORT_START("PLAYERS") /* Players inputs */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
@@ -277,7 +277,7 @@ static INPUT_PORTS_START( silkroad )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
- PORT_START_TAG("SYSTEM") /* System inputs */
+ PORT_START("SYSTEM") /* System inputs */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -295,7 +295,7 @@ static INPUT_PORTS_START( silkroad )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0001, "1" )
PORT_DIPSETTING( 0x0000, "2" )
@@ -345,7 +345,7 @@ static INPUT_PORTS_START( silkroad )
PORT_DIPSETTING( 0xa000, DEF_STR(1C_3C))
PORT_DIPSETTING( 0x8000, DEF_STR(1C_4C))
-// PORT_START_TAG("MISC") /* Misc inputs */
+// PORT_START("MISC") /* Misc inputs */
// PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* VBLANK ? */
// PORT_BIT( 0xff7f, IP_ACTIVE_LOW, IPT_UNUSED ) /* unknown / unused */
INPUT_PORTS_END
diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c
index e7d80aabb8a..11c5bd31514 100644
--- a/src/mame/drivers/simpl156.c
+++ b/src/mame/drivers/simpl156.c
@@ -104,7 +104,7 @@ extern VIDEO_UPDATE( simpl156 );
static INPUT_PORTS_START( simpl156 )
- PORT_START_TAG("IN0") /* 16bit */
+ PORT_START("IN0") /* 16bit */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -113,7 +113,7 @@ static INPUT_PORTS_START( simpl156 )
PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_SPECIAL ) // eeprom?..
- PORT_START_TAG("IN1") /* 16bit */
+ PORT_START("IN1") /* 16bit */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c
index c135fc0c617..a6b0d2bf00a 100644
--- a/src/mame/drivers/simpsons.c
+++ b/src/mame/drivers/simpsons.c
@@ -92,7 +92,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( simpsons )
- PORT_START_TAG("P1") /* IN0 - Player 1 */
+ PORT_START("P1") /* IN0 - Player 1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -102,7 +102,7 @@ static INPUT_PORTS_START( simpsons )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) //BUTTON3 Unused
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* IN1 - Player 2 */
+ PORT_START("P2") /* IN1 - Player 2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -112,7 +112,7 @@ static INPUT_PORTS_START( simpsons )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) //BUTTON3 Unused
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("P3") /* IN2 - Player 3 - Used on the 4p version */
+ PORT_START("P3") /* IN2 - Player 3 - Used on the 4p version */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
@@ -122,7 +122,7 @@ static INPUT_PORTS_START( simpsons )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) //BUTTON3 Unused
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START_TAG("P4") /* IN3 - Player 4 - Used on the 4p version */
+ PORT_START("P4") /* IN3 - Player 4 - Used on the 4p version */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
@@ -132,7 +132,7 @@ static INPUT_PORTS_START( simpsons )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) //BUTTON3 Unused
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4 )
- PORT_START_TAG("COIN") /* IN4 */
+ PORT_START("COIN") /* IN4 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -142,13 +142,13 @@ static INPUT_PORTS_START( simpsons )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) //SERVICE3 Unused
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) //SERVICE4 Unused
- PORT_START_TAG("TEST") /* IN5 */
+ PORT_START("TEST") /* IN5 */
PORT_SERVICE_NO_TOGGLE( 0x01, IP_ACTIVE_LOW )
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( simpsn2p )
- PORT_START_TAG("P1") /* IN0 - Player 1 */
+ PORT_START("P1") /* IN0 - Player 1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -158,7 +158,7 @@ static INPUT_PORTS_START( simpsn2p )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) //BUTTON3 Unused
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* IN1 - Player 2 */
+ PORT_START("P2") /* IN1 - Player 2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -168,7 +168,7 @@ static INPUT_PORTS_START( simpsn2p )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) //BUTTON3 Unused
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("P3") /* IN2 - Player 3 - Used on the 4p version */
+ PORT_START("P3") /* IN2 - Player 3 - Used on the 4p version */
// PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
// PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
// PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
@@ -178,7 +178,7 @@ static INPUT_PORTS_START( simpsn2p )
// PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) //BUTTON3 Unused
// PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START_TAG("P4") /* IN3 - Player 4 - Used on the 4p version */
+ PORT_START("P4") /* IN3 - Player 4 - Used on the 4p version */
// PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
// PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
// PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
@@ -188,7 +188,7 @@ static INPUT_PORTS_START( simpsn2p )
// PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) //BUTTON3 Unused
// PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4 )
- PORT_START_TAG("COINS") /* IN4 */
+ PORT_START("COINS") /* IN4 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) //COIN3 Unused
@@ -198,7 +198,7 @@ static INPUT_PORTS_START( simpsn2p )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) //SERVICE3 Unused
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) //SERVICE4 Unused
- PORT_START_TAG("TEST") /* IN5 */
+ PORT_START("TEST") /* IN5 */
PORT_SERVICE_NO_TOGGLE( 0x01, IP_ACTIVE_LOW )
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
diff --git a/src/mame/drivers/skullxbo.c b/src/mame/drivers/skullxbo.c
index 85609929203..02fefece2ab 100644
--- a/src/mame/drivers/skullxbo.c
+++ b/src/mame/drivers/skullxbo.c
@@ -164,7 +164,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( skullxbo )
- PORT_START_TAG("FF5800") /* ff5800 */
+ PORT_START("FF5800") /* ff5800 */
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -175,7 +175,7 @@ static INPUT_PORTS_START( skullxbo )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_START_TAG("FF5802") /* ff5802 */
+ PORT_START("FF5802") /* ff5802 */
PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_UNUSED ) /* HBLANK */
PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_VBLANK )
diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c
index 7106764c54c..19e27d864c4 100644
--- a/src/mame/drivers/skyarmy.c
+++ b/src/mame/drivers/skyarmy.c
@@ -179,45 +179,44 @@ static ADDRESS_MAP_START( skyarmy_writemem, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( skyarmy )
- PORT_START
- PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
+ PORT_START("DSW")
+ PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "3" )
PORT_DIPSETTING( 0x02, "4" )
PORT_DIPSETTING( 0x03, DEF_STR (Free_Play ))
- PORT_DIPNAME( 0x08, 0x00, DEF_STR( Coinage ) )
- PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
- PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) )
- /* coinage - bits 4-7 ? */
-
- PORT_START
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_BIT( 0xC0, IP_ACTIVE_HIGH, IPT_UNUSED )
-
- PORT_START
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_BIT( 0xC0, IP_ACTIVE_HIGH, IPT_UNUSED )
-
- PORT_START
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START2 )
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON3 )
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON4 )
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON5 )
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON6 )
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON7 )
-
+ PORT_DIPNAME( 0x08, 0x00, DEF_STR( Coinage ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
+ PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) )
+ /* coinage - bits 4-7 ? */
+
+ PORT_START("P1")
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
+ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
+ PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
+ PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1)
+ PORT_BIT( 0xC0, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+ PORT_START("P2")
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
+ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
+ PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
+ PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
+ PORT_BIT( 0xC0, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+ PORT_START("SYSTEM")
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 )
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START2 )
+ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON3 )
+ PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON4 )
+ PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON5 )
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON6 )
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON7 )
INPUT_PORTS_END
static const gfx_layout charlayout =
diff --git a/src/mame/drivers/skydiver.c b/src/mame/drivers/skydiver.c
index 982831a3790..20ac8a4d1c0 100644
--- a/src/mame/drivers/skydiver.c
+++ b/src/mame/drivers/skydiver.c
@@ -229,47 +229,47 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( skydiver )
- PORT_START /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT (0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
- PORT_START /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT (0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_START /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT (0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) /* Jump 1 */
PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* Chute 1 */
- PORT_START /* IN3 */
+ PORT_START("IN3") /* IN3 */
PORT_BIT (0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) /* Jump 2 */
PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) /* Chute 2 */
- PORT_START /* IN4 */
+ PORT_START("IN4") /* IN4 */
PORT_BIT (0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("(D) OPT SW NEXT TEST") PORT_CODE(KEYCODE_D)
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("(F) OPT SW") PORT_CODE(KEYCODE_F)
- PORT_START /* IN5 */
+ PORT_START("IN5") /* IN5 */
PORT_BIT (0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("(E) OPT SW") PORT_CODE(KEYCODE_E)
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("(H) OPT SW DIAGNOSTICS") PORT_CODE(KEYCODE_H)
- PORT_START /* IN6 */
+ PORT_START("IN6") /* IN6 */
PORT_BIT (0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
- PORT_START /* IN7 */
+ PORT_START("IN7") /* IN7 */
PORT_BIT (0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(1)
- PORT_START /* IN8 */
+ PORT_START("IN8") /* IN8 */
PORT_BIT (0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0xc0, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
@@ -277,7 +277,7 @@ static INPUT_PORTS_START( skydiver )
PORT_DIPSETTING( 0x80, "5" )
PORT_DIPSETTING( 0xc0, "6" )
- PORT_START /* IN9 */
+ PORT_START("IN9") /* IN9 */
PORT_BIT (0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0xc0, 0x80, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0xc0, DEF_STR( 2C_1C ) )
@@ -285,7 +285,7 @@ static INPUT_PORTS_START( skydiver )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
- PORT_START /* IN10 */
+ PORT_START("IN10") /* IN10 */
PORT_BIT (0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x40, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x40, DEF_STR( Easy ) )
@@ -294,7 +294,7 @@ static INPUT_PORTS_START( skydiver )
PORT_DIPSETTING( 0x80, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
- PORT_START /* IN11 */
+ PORT_START("IN11") /* IN11 */
PORT_BIT (0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0xc0, 0x00, DEF_STR( Language ) )
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
@@ -302,20 +302,20 @@ static INPUT_PORTS_START( skydiver )
PORT_DIPSETTING( 0x80, DEF_STR( Spanish ) )
PORT_DIPSETTING( 0xc0, DEF_STR( German ) )
- PORT_START /* IN12 */
+ PORT_START("IN12") /* IN12 */
PORT_BIT (0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START /* IN13 */
+ PORT_START("IN13") /* IN13 */
PORT_BIT (0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("WHISTLE1")
+ PORT_START("WHISTLE1")
PORT_ADJUSTER( 33, "Whistle 1 Freq" )
- PORT_START_TAG("WHISTLE2")
+ PORT_START("WHISTLE2")
PORT_ADJUSTER( 25, "Whistle 2 Freq" )
INPUT_PORTS_END
diff --git a/src/mame/drivers/skyfox.c b/src/mame/drivers/skyfox.c
index 59dccf329ae..9c7916be9d8 100644
--- a/src/mame/drivers/skyfox.c
+++ b/src/mame/drivers/skyfox.c
@@ -115,7 +115,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( skyfox )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
@@ -125,7 +125,7 @@ static INPUT_PORTS_START( skyfox )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x01, "Unknown 1-0" ) // rest unused?
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -150,7 +150,7 @@ static INPUT_PORTS_START( skyfox )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW1") // Coins, DSW + Vblank
+ PORT_START("DSW1") // Coins, DSW + Vblank
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_DIPNAME( 0x0e, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW2:1,2,3")
PORT_DIPSETTING( 0x0e, DEF_STR( 5C_1C ) )
@@ -167,7 +167,7 @@ static INPUT_PORTS_START( skyfox )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW2") // DSW
+ PORT_START("DSW2") // DSW
PORT_DIPNAME( 0x07, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x01, "2" )
@@ -183,7 +183,7 @@ static INPUT_PORTS_START( skyfox )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("COINS") // Fake input port, polled every VBLANK to generate an NMI upon coin insertion
+ PORT_START("COINS") // Fake input port, polled every VBLANK to generate an NMI upon coin insertion
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(1)
INPUT_PORTS_END
diff --git a/src/mame/drivers/skykid.c b/src/mame/drivers/skykid.c
index 0d08c5ca6a6..285b13d5534 100644
--- a/src/mame/drivers/skykid.c
+++ b/src/mame/drivers/skykid.c
@@ -156,7 +156,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( skykid )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x60, 0x60, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
@@ -178,7 +178,7 @@ static INPUT_PORTS_START( skykid )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSWB") /* DSW B */
+ PORT_START("DSWB") /* DSW B */
PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x80, "1" )
PORT_DIPSETTING( 0x40, "2" )
@@ -202,14 +202,14 @@ static INPUT_PORTS_START( skykid )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("BUTTON2")
+ PORT_START("BUTTON2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SYSTEM") /* IN 0 */
+ PORT_START("SYSTEM") /* IN 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -217,7 +217,7 @@ static INPUT_PORTS_START( skykid )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P1") /* IN 1 */
+ PORT_START("P1") /* IN 1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -225,7 +225,7 @@ static INPUT_PORTS_START( skykid )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2") /* IN 2 */
+ PORT_START("P2") /* IN 2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -235,7 +235,7 @@ static INPUT_PORTS_START( skykid )
INPUT_PORTS_END
static INPUT_PORTS_START( skykids )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x60, 0x60, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
@@ -257,7 +257,7 @@ static INPUT_PORTS_START( skykids )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSWB") /* DSW B */
+ PORT_START("DSWB") /* DSW B */
PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x80, "1" )
PORT_DIPSETTING( 0x40, "2" )
@@ -281,14 +281,14 @@ static INPUT_PORTS_START( skykids )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("BUTTON2")
+ PORT_START("BUTTON2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SYSTEM") /* IN 0 */
+ PORT_START("SYSTEM") /* IN 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -296,7 +296,7 @@ static INPUT_PORTS_START( skykids )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P1") /* IN 1 */
+ PORT_START("P1") /* IN 1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -304,7 +304,7 @@ static INPUT_PORTS_START( skykids )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2") /* IN 2 */
+ PORT_START("P2") /* IN 2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -314,7 +314,7 @@ static INPUT_PORTS_START( skykids )
INPUT_PORTS_END
static INPUT_PORTS_START( drgnbstr )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x60, 0x60, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
@@ -336,7 +336,7 @@ static INPUT_PORTS_START( drgnbstr )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSWB") /* DSW B */
+ PORT_START("DSWB") /* DSW B */
PORT_DIPNAME( 0x80, 0x80, "Spurt Time" )
PORT_DIPSETTING( 0x80, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x00, "Difficult" )
@@ -360,7 +360,7 @@ static INPUT_PORTS_START( drgnbstr )
PORT_DIPSETTING( 0x01, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
- PORT_START_TAG("BUTTON2")
+ PORT_START("BUTTON2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x02, DEF_STR( Upright ) )
@@ -369,7 +369,7 @@ static INPUT_PORTS_START( drgnbstr )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SYSTEM") /* IN 0 */
+ PORT_START("SYSTEM") /* IN 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -377,7 +377,7 @@ static INPUT_PORTS_START( drgnbstr )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P1") /* IN 1 */
+ PORT_START("P1") /* IN 1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
@@ -385,7 +385,7 @@ static INPUT_PORTS_START( drgnbstr )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2") /* IN 2 */
+ PORT_START("P2") /* IN 2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c
index dea8882347a..f85dfbe844e 100644
--- a/src/mame/drivers/skylncr.c
+++ b/src/mame/drivers/skylncr.c
@@ -263,7 +263,7 @@ GFXDECODE_END
static INPUT_PORTS_START( skylncr )
- PORT_START // IN0 - $0 "PORT0 A"
+ PORT_START("SYSTEM") // IN0 - $0 "PORT0 A"
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START3)
@@ -273,7 +273,7 @@ static INPUT_PORTS_START( skylncr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE4)
- PORT_START // IN1 - $1 "PORT0 B"
+ PORT_START("BUTTONS") // IN1 - $1 "PORT0 B"
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3)
@@ -283,7 +283,7 @@ static INPUT_PORTS_START( skylncr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4) PORT_PLAYER(2)
- PORT_START // IN2 - $2 "DSW1"
+ PORT_START("DSW1") // IN2 - $2 "DSW1"
PORT_DIPNAME( 0x01, 0x01, "DSW1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -309,7 +309,7 @@ static INPUT_PORTS_START( skylncr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START // IN3 - $10 "DSW2"
+ PORT_START("DSW2") // IN3 - $10 "DSW2"
PORT_DIPNAME( 0x01, 0x01, "DSW2" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -335,7 +335,7 @@ static INPUT_PORTS_START( skylncr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START // IN4 - $11 "PORT1 B"
+ PORT_START("COIN1") // IN4 - $11 "PORT1 B"
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -345,7 +345,7 @@ static INPUT_PORTS_START( skylncr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START // IN5 - $12 "PORT1 C"
+ PORT_START("COIN2") // IN5 - $12 "PORT1 C"
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -355,7 +355,7 @@ static INPUT_PORTS_START( skylncr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START // IN6 - AY8910 port A
+ PORT_START("DSW4") // IN6 - AY8910 port A
PORT_DIPNAME( 0x01, 0x01, "DSW4" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -381,7 +381,7 @@ static INPUT_PORTS_START( skylncr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START // IN7 - AY8910 port B
+ PORT_START("DSW3") // IN7 - AY8910 port B
PORT_DIPNAME( 0x01, 0x01, "DSW3" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/skyraid.c b/src/mame/drivers/skyraid.c
index c4574e3ef4c..a8f426e1f49 100644
--- a/src/mame/drivers/skyraid.c
+++ b/src/mame/drivers/skyraid.c
@@ -130,7 +130,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( skyraid )
- PORT_START_TAG("LANGUAGE")
+ PORT_START("LANGUAGE")
PORT_DIPNAME( 0x30, 0x00, DEF_STR( Language ) )
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
PORT_DIPSETTING( 0x10, DEF_STR( French ) )
@@ -139,7 +139,7 @@ static INPUT_PORTS_START( skyraid )
PORT_BIT (0x40, IP_ACTIVE_HIGH, IPT_UNUSED) /* POT1 */
PORT_BIT (0x80, IP_ACTIVE_HIGH, IPT_UNUSED) /* POT0 */
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x30, 0x10, "Play Time" )
PORT_DIPSETTING( 0x00, "60 Seconds" )
PORT_DIPSETTING( 0x10, "80 Seconds" )
@@ -154,7 +154,7 @@ static INPUT_PORTS_START( skyraid )
/* coinage settings are insane, refer to the manual */
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_DIPNAME( 0x0F, 0x01, DEF_STR( Coinage )) /* dial */
PORT_DIPSETTING( 0x00, "Mode 0" )
PORT_DIPSETTING( 0x01, "Mode 1" )
@@ -179,16 +179,16 @@ static INPUT_PORTS_START( skyraid )
PORT_BIT (0x40, IP_ACTIVE_HIGH, IPT_COIN1)
PORT_BIT (0x80, IP_ACTIVE_HIGH, IPT_COIN2)
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_TILT)
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Hiscore Reset") PORT_CODE(KEYCODE_H)
PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_START1)
PORT_SERVICE(0x80, IP_ACTIVE_LOW)
- PORT_START_TAG("STICKY")
+ PORT_START("STICKY")
PORT_BIT( 0x3f, 0x20, IPT_AD_STICK_Y ) PORT_MINMAX(0,63) PORT_SENSITIVITY(10) PORT_KEYDELTA(10) PORT_REVERSE
- PORT_START_TAG("STICKX")
+ PORT_START("STICKX")
PORT_BIT( 0x3f, 0x20, IPT_AD_STICK_X ) PORT_MINMAX(0,63) PORT_SENSITIVITY(10) PORT_KEYDELTA(10)
INPUT_PORTS_END
diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c
index d5e19668aad..93595e3f9fa 100644
--- a/src/mame/drivers/slapfght.c
+++ b/src/mame/drivers/slapfght.c
@@ -600,7 +600,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( slapfght_generic )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
@@ -610,7 +610,7 @@ static INPUT_PORTS_START( slapfght_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -620,7 +620,7 @@ static INPUT_PORTS_START( slapfght_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:8,7,6")
// PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
@@ -642,7 +642,7 @@ static INPUT_PORTS_START( slapfght_generic )
PORT_SERVICE_DIPLOC(0x40, IP_ACTIVE_LOW, "SW1:2" )
PORT_DIPUNUSED_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW1:1" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:8,7")
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x00, "2" )
diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c
index 785108bd0e5..8af1edc0c4c 100644
--- a/src/mame/drivers/slapshot.c
+++ b/src/mame/drivers/slapshot.c
@@ -370,7 +370,7 @@ ADDRESS_MAP_END
/* Tags below are the ones expected by TC0640FIO_halfword_byteswap_r */
static INPUT_PORTS_START( slapshot )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -380,7 +380,7 @@ static INPUT_PORTS_START( slapshot )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -390,7 +390,7 @@ static INPUT_PORTS_START( slapshot )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -400,7 +400,7 @@ static INPUT_PORTS_START( slapshot )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -410,7 +410,7 @@ static INPUT_PORTS_START( slapshot )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -420,13 +420,13 @@ static INPUT_PORTS_START( slapshot )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("SERVICE") /* IN5, so we can OR in service switch */
+ PORT_START("SERVICE") /* IN5, so we can OR in service switch */
PORT_SERVICE_NO_TOGGLE(0x10, IP_ACTIVE_LOW)
INPUT_PORTS_END
/* Tags below are the ones expected by TC0640FIO_halfword_byteswap_r */
static INPUT_PORTS_START( opwolf3 )
- PORT_START_TAG("DSWA") /* IN0, all bogus */
+ PORT_START("DSWA") /* IN0, all bogus */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -436,7 +436,7 @@ static INPUT_PORTS_START( opwolf3 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -446,7 +446,7 @@ static INPUT_PORTS_START( opwolf3 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN4 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("1 Player Start/Button3")// also button 3
@@ -456,7 +456,7 @@ static INPUT_PORTS_START( opwolf3 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 ) PORT_NAME("2 Player Start/Button3")// also button 3
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -466,7 +466,7 @@ static INPUT_PORTS_START( opwolf3 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -476,19 +476,19 @@ static INPUT_PORTS_START( opwolf3 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SERVICE") /* IN5, so we can OR in service switch */
+ PORT_START("SERVICE") /* IN5, so we can OR in service switch */
PORT_SERVICE_NO_TOGGLE(0x10, IP_ACTIVE_LOW)
- PORT_START_TAG("GUN1X") /* IN 6, P1X */
+ PORT_START("GUN1X") /* IN 6, P1X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("GUN1Y") /* IN 7, P1Y */
+ PORT_START("GUN1Y") /* IN 7, P1Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_PLAYER(1)
- PORT_START_TAG("GUN2X") /* IN 8, P2X */
+ PORT_START("GUN2X") /* IN 8, P2X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("GUN2Y") /* IN 9, P2Y */
+ PORT_START("GUN2Y") /* IN 9, P2Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_PLAYER(2)
INPUT_PORTS_END
diff --git a/src/mame/drivers/sliver.c b/src/mame/drivers/sliver.c
index 42bb34641ad..58124857a74 100644
--- a/src/mame/drivers/sliver.c
+++ b/src/mame/drivers/sliver.c
@@ -458,8 +458,7 @@ static VIDEO_UPDATE(sliver)
}
static INPUT_PORTS_START( sliver )
-
- PORT_START
+ PORT_START("P1_P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -477,7 +476,7 @@ static INPUT_PORTS_START( sliver )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -485,7 +484,7 @@ static INPUT_PORTS_START( sliver )
PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_UNKNOWN ) //jpeg ready flag
PORT_BIT( 0xffa4, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x000f, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x000e, DEF_STR( 1C_2C ) )
@@ -526,7 +525,6 @@ static INPUT_PORTS_START( sliver )
PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
-
INPUT_PORTS_END
static INTERRUPT_GEN( sliver_int )
diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c
index 24e9f50f42d..19a36247bed 100644
--- a/src/mame/drivers/snk.c
+++ b/src/mame/drivers/snk.c
@@ -3038,7 +3038,7 @@ ROM_END
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_6C ) )
static INPUT_PORTS_START( ikari )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* sound CPU status */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -3048,20 +3048,20 @@ static INPUT_PORTS_START( ikari )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
SNK_JOY1_PORT
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
SNK_JOY2_PORT
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
SNK_BUTTON_PORT
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "Allow killing each other" )
PORT_DIPSETTING( 0x01, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
@@ -3076,7 +3076,7 @@ static INPUT_PORTS_START( ikari )
PORT_DIPSETTING( 0x00, "5" )
SNK_COINAGE
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -3101,7 +3101,7 @@ static INPUT_PORTS_START( ikari )
INPUT_PORTS_END
static INPUT_PORTS_START( ikarijp )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -3111,20 +3111,20 @@ static INPUT_PORTS_START( ikarijp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* tilt? */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
SNK_JOY1_PORT
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
SNK_JOY2_PORT
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
SNK_BUTTON_PORT
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "Allow killing each other" )
PORT_DIPSETTING( 0x01, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
@@ -3139,7 +3139,7 @@ static INPUT_PORTS_START( ikarijp )
PORT_DIPSETTING( 0x00, "5" )
SNK_COINAGE
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -3184,7 +3184,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( victroad )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* sound related ??? */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -3194,20 +3194,20 @@ static INPUT_PORTS_START( victroad )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
SNK_JOY1_PORT
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
SNK_JOY2_PORT
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
SNK_BUTTON_PORT
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "Kill friend & walk everywhere (Cheat)")
PORT_DIPSETTING( 0x01, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
@@ -3222,7 +3222,7 @@ static INPUT_PORTS_START( victroad )
PORT_DIPSETTING( 0x00, "5" )
SNK_COINAGE
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -3248,7 +3248,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( dogosokj )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* sound related ??? */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -3258,19 +3258,19 @@ static INPUT_PORTS_START( dogosokj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
SNK_JOY1_NODIAL_PORT
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
SNK_JOY2_NODIAL_PORT
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
SNK_BUTTON_PORT
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "Kill friend & walk everywhere (Cheat)")
PORT_DIPSETTING( 0x01, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
@@ -3285,7 +3285,7 @@ static INPUT_PORTS_START( dogosokj )
PORT_DIPSETTING( 0x00, "5" )
SNK_COINAGE
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -3311,7 +3311,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( gwar )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* sound related ??? */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* causes reset */
@@ -3321,20 +3321,20 @@ static INPUT_PORTS_START( gwar )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
SNK_JOY1_PORT
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
SNK_JOY2_PORT
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
SNK_BUTTON_PORT
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Allow_Continue ) )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x01, DEF_STR( Yes ) )
@@ -3349,7 +3349,7 @@ static INPUT_PORTS_START( gwar )
PORT_DIPSETTING( 0x00, "5" )
SNK_COINAGE
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -3375,7 +3375,7 @@ static INPUT_PORTS_START( gwar )
INPUT_PORTS_END
static INPUT_PORTS_START( athena )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* sound CPU status */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -3385,7 +3385,7 @@ static INPUT_PORTS_START( athena )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -3395,7 +3395,7 @@ static INPUT_PORTS_START( athena )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -3405,7 +3405,7 @@ static INPUT_PORTS_START( athena )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) /* Listed as "Unused" in the manual */
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3420,7 +3420,7 @@ static INPUT_PORTS_START( athena )
PORT_DIPSETTING( 0x00, "5" )
SNK_COINAGE
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -3446,7 +3446,7 @@ static INPUT_PORTS_START( athena )
INPUT_PORTS_END
static INPUT_PORTS_START( tnk3 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -3456,21 +3456,21 @@ static INPUT_PORTS_START( tnk3 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0xf0, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
PORT_BIT( 0xf0, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M) PORT_PLAYER(2)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -3480,7 +3480,7 @@ static INPUT_PORTS_START( tnk3 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "Walk everywhere (Cheat)")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3504,7 +3504,7 @@ static INPUT_PORTS_START( tnk3 )
PORT_DIPSETTING( 0x40, "50k 120k" )
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, "Bonus Occurrence" )
PORT_DIPSETTING( 0x01, "1st & every 2nd" )
PORT_DIPSETTING( 0x00, "1st & 2nd only" )
@@ -3530,7 +3530,7 @@ static INPUT_PORTS_START( tnk3 )
INPUT_PORTS_END
static INPUT_PORTS_START( bermudat )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* sound CPU status */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* tile? */
@@ -3540,20 +3540,20 @@ static INPUT_PORTS_START( bermudat )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
SNK_JOY1_PORT
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
SNK_JOY2_PORT
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
SNK_BUTTON_PORT
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3568,7 +3568,7 @@ static INPUT_PORTS_START( bermudat )
PORT_DIPSETTING( 0x00, "5" )
SNK_COINAGE
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -3629,7 +3629,7 @@ static INPUT_PORTS_START( worldwar )
INPUT_PORTS_END
static INPUT_PORTS_START( psychos )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* sound related */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* reset */
@@ -3639,7 +3639,7 @@ static INPUT_PORTS_START( psychos )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -3649,11 +3649,11 @@ static INPUT_PORTS_START( psychos )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
SNK_BUTTON_PORT
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -3666,7 +3666,7 @@ static INPUT_PORTS_START( psychos )
PORT_DIPSETTING( 0x00, "5" )
SNK_COINAGE
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -3692,7 +3692,7 @@ static INPUT_PORTS_START( psychos )
INPUT_PORTS_END
static INPUT_PORTS_START( legofair )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* sound CPU status */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT ) /* Reset */
@@ -3702,7 +3702,7 @@ static INPUT_PORTS_START( legofair )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -3712,7 +3712,7 @@ static INPUT_PORTS_START( legofair )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -3722,7 +3722,7 @@ static INPUT_PORTS_START( legofair )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3737,7 +3737,7 @@ static INPUT_PORTS_START( legofair )
PORT_DIPSETTING( 0x00, "5" )
SNK_COINAGE
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -3762,7 +3762,7 @@ static INPUT_PORTS_START( legofair )
INPUT_PORTS_END
static INPUT_PORTS_START( choppera )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* sound CPU status */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT ) /* Reset */
@@ -3772,19 +3772,19 @@ static INPUT_PORTS_START( choppera )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
SNK_JOY1_NODIAL_PORT
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
SNK_JOY2_NODIAL_PORT
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
SNK_BUTTON_PORT
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3799,7 +3799,7 @@ static INPUT_PORTS_START( choppera )
PORT_DIPSETTING( 0x00, "5" )
SNK_COINAGE
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -3824,7 +3824,7 @@ static INPUT_PORTS_START( choppera )
INPUT_PORTS_END
static INPUT_PORTS_START( fitegolf )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* sound related? */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -3834,7 +3834,7 @@ static INPUT_PORTS_START( fitegolf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -3844,7 +3844,7 @@ static INPUT_PORTS_START( fitegolf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -3854,7 +3854,7 @@ static INPUT_PORTS_START( fitegolf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Language ) ) /* Version */
PORT_DIPSETTING( 0x01, DEF_STR( English ) ) /* Over Sea */
PORT_DIPSETTING( 0x00, DEF_STR( Japanese ) ) /* Domestic */
@@ -3875,7 +3875,7 @@ static INPUT_PORTS_START( fitegolf )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_6C ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, "Shot Time" )
PORT_DIPSETTING( 0x00, "Short (10 sec)" )
PORT_DIPSETTING( 0x01, "Long (12 sec)" )
@@ -3901,7 +3901,7 @@ static INPUT_PORTS_START( fitegolf )
INPUT_PORTS_END
static INPUT_PORTS_START( countryc )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* sound related? */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -3911,15 +3911,15 @@ static INPUT_PORTS_START( countryc )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x7f, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(30) PORT_REVERSE
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x7f, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(30)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Language ) ) /* NOT showed in Test Mode/Manual */
PORT_DIPSETTING( 0x01, DEF_STR( English ) )
PORT_DIPSETTING( 0x00, DEF_STR( Japanese ) )
@@ -3940,7 +3940,7 @@ static INPUT_PORTS_START( countryc )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_4C ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, "Shot Time" )
PORT_DIPSETTING( 0x00, "Short (10 sec)" )
PORT_DIPSETTING( 0x01, "Long (12 sec)" )
@@ -3966,7 +3966,7 @@ static INPUT_PORTS_START( countryc )
INPUT_PORTS_END
static INPUT_PORTS_START( fsoccer )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -3976,7 +3976,7 @@ static INPUT_PORTS_START( fsoccer )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Start Game A")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) PORT_NAME("Start Game B")
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -3986,7 +3986,7 @@ static INPUT_PORTS_START( fsoccer )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -3996,7 +3996,7 @@ static INPUT_PORTS_START( fsoccer )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -4006,7 +4006,7 @@ static INPUT_PORTS_START( fsoccer )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -4016,23 +4016,23 @@ static INPUT_PORTS_START( fsoccer )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
- PORT_START_TAG("IN5") /* Only used in the "test mode" in this version */
+ PORT_START("IN5") /* Only used in the "test mode" in this version */
PORT_BIT( 0x7f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN6") /* Only used in the "test mode" in this version */
+ PORT_START("IN6") /* Only used in the "test mode" in this version */
PORT_BIT( 0x7f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN7") /* Only used in the "test mode" in this version */
+ PORT_START("IN7") /* Only used in the "test mode" in this version */
PORT_BIT( 0x7f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN8") /* Only used in the "test mode" in this version */
+ PORT_START("IN8") /* Only used in the "test mode" in this version */
PORT_BIT( 0x7f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x03, "Upright (With VS)" )
PORT_DIPSETTING( 0x02, "Upright (Without VS)" )
@@ -4045,7 +4045,7 @@ static INPUT_PORTS_START( fsoccer )
/* PORT_DIPSETTING( 0x0c, DEF_STR( Europe ) ) */
SNK_COINAGE
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Allow_Continue ) )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x01, DEF_STR( Yes ) )
@@ -4068,7 +4068,7 @@ static INPUT_PORTS_START( fsoccer )
PORT_DIPSETTING( 0x00, "2:10" )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN9")
+ PORT_START("IN9")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -4080,7 +4080,7 @@ static INPUT_PORTS_START( fsoccer )
INPUT_PORTS_END
static INPUT_PORTS_START( tdfever )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -4090,7 +4090,7 @@ static INPUT_PORTS_START( tdfever )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Start Game A")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) PORT_NAME("Start Game B")
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -4100,7 +4100,7 @@ static INPUT_PORTS_START( tdfever )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -4110,7 +4110,7 @@ static INPUT_PORTS_START( tdfever )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -4120,7 +4120,7 @@ static INPUT_PORTS_START( tdfever )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -4130,23 +4130,23 @@ static INPUT_PORTS_START( tdfever )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
- PORT_START_TAG("IN5")
+ PORT_START("IN5")
PORT_BIT( 0x7f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN6")
+ PORT_START("IN6")
PORT_BIT( 0x7f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN7")
+ PORT_START("IN7")
PORT_BIT( 0x7f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN8")
+ PORT_START("IN8")
PORT_BIT( 0x7f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Allow_Continue ) )
PORT_DIPSETTING( 0x01, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
@@ -4170,7 +4170,7 @@ static INPUT_PORTS_START( tdfever )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -4209,7 +4209,7 @@ Actual Play Times listed in manual based on Players & cabinet type:
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN9")
+ PORT_START("IN9")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -4221,7 +4221,7 @@ Actual Play Times listed in manual based on Players & cabinet type:
INPUT_PORTS_END
static INPUT_PORTS_START( tdfeverj )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -4231,7 +4231,7 @@ static INPUT_PORTS_START( tdfeverj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Start Game A")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) PORT_NAME("Start Game B")
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -4241,7 +4241,7 @@ static INPUT_PORTS_START( tdfeverj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -4251,7 +4251,7 @@ static INPUT_PORTS_START( tdfeverj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -4261,7 +4261,7 @@ static INPUT_PORTS_START( tdfeverj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -4271,23 +4271,23 @@ static INPUT_PORTS_START( tdfeverj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
- PORT_START_TAG("IN5")
+ PORT_START("IN5")
PORT_BIT( 0x7f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN6")
+ PORT_START("IN6")
PORT_BIT( 0x7f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN7")
+ PORT_START("IN7")
PORT_BIT( 0x7f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN8")
+ PORT_START("IN8")
PORT_BIT( 0x7f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Allow_Continue ) )
PORT_DIPSETTING( 0x01, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
@@ -4311,7 +4311,7 @@ static INPUT_PORTS_START( tdfeverj )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -4350,7 +4350,7 @@ Actual Play Times listed in manual based on Players & cabinet type:
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN9")
+ PORT_START("IN9")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c
index da298a65b0a..02cbee74482 100644
--- a/src/mame/drivers/snk68.c
+++ b/src/mame/drivers/snk68.c
@@ -190,7 +190,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( pow )
- PORT_START_TAG("P1") /* Player 1 controls */
+ PORT_START("P1") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -200,7 +200,7 @@ static INPUT_PORTS_START( pow )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 controls */
+ PORT_START("P2") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -210,7 +210,7 @@ static INPUT_PORTS_START( pow )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) /* same as the service mode dsw */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -220,7 +220,7 @@ static INPUT_PORTS_START( pow )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0300, 0x0000, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 1C_1C ) )
@@ -245,7 +245,7 @@ static INPUT_PORTS_START( pow )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x8000, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE( 0x0100, IP_ACTIVE_HIGH )
PORT_DIPNAME( 0x0200, 0x0000, DEF_STR( Allow_Continue ) )
@@ -280,7 +280,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( searchar )
- PORT_START_TAG("P1") /* Player 1 controls */
+ PORT_START("P1") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -290,7 +290,7 @@ static INPUT_PORTS_START( searchar )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 controls */
+ PORT_START("P2") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -300,7 +300,7 @@ static INPUT_PORTS_START( searchar )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) /* same as the service mode dsw */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -310,7 +310,7 @@ static INPUT_PORTS_START( searchar )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0100, 0x0000, DEF_STR( Joystick ) )
PORT_DIPSETTING( 0x0000, "Rotary Joystick" )
@@ -335,7 +335,7 @@ static INPUT_PORTS_START( searchar )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x8000, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE( 0x0100, IP_ACTIVE_HIGH )
PORT_DIPNAME( 0x0200, 0x0000, DEF_STR( Allow_Continue ) )
@@ -357,16 +357,16 @@ static INPUT_PORTS_START( searchar )
PORT_DIPSETTING( 0x4000, DEF_STR( Hard ) )
PORT_DIPSETTING( 0xc000, DEF_STR( Hardest ) )
- PORT_START_TAG("ROT1") /* player 1 12-way rotary control */
+ PORT_START("ROT1") /* player 1 12-way rotary control */
PORT_BIT( 0x0f, 0x00, IPT_POSITIONAL ) PORT_POSITIONS(12) PORT_WRAPS PORT_SENSITIVITY(5) PORT_KEYDELTA(5) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X) PORT_REVERSE PORT_FULL_TURN_COUNT(12)
- PORT_START_TAG("ROT2") /* player 2 12-way rotary control */
+ PORT_START("ROT2") /* player 2 12-way rotary control */
PORT_BIT( 0x0f, 0x00, IPT_POSITIONAL ) PORT_POSITIONS(12) PORT_WRAPS PORT_SENSITIVITY(5) PORT_KEYDELTA(5) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M) PORT_PLAYER(2) PORT_REVERSE PORT_FULL_TURN_COUNT(12)
INPUT_PORTS_END
static INPUT_PORTS_START( streetsm )
- PORT_START_TAG("P1") /* Player 1 controls */
+ PORT_START("P1") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -376,7 +376,7 @@ static INPUT_PORTS_START( streetsm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 controls */
+ PORT_START("P2") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -386,7 +386,7 @@ static INPUT_PORTS_START( streetsm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) /* same as the service mode dsw */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -396,7 +396,7 @@ static INPUT_PORTS_START( streetsm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* Dip switches (Active high) */
+ PORT_START("DSW1") /* Dip switches (Active high) */
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0300, 0x0000, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0200, "1" )
@@ -421,7 +421,7 @@ static INPUT_PORTS_START( streetsm )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x8000, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* Dip switches (Active high) */
+ PORT_START("DSW2") /* Dip switches (Active high) */
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE( 0x0100, IP_ACTIVE_HIGH )
PORT_DIPNAME( 0x0200, 0x0000, DEF_STR( Allow_Continue ) )
@@ -443,10 +443,10 @@ static INPUT_PORTS_START( streetsm )
PORT_DIPSETTING( 0x4000, DEF_STR( Hard ) )
PORT_DIPSETTING( 0xc000, DEF_STR( Hardest ) )
- PORT_START_TAG("ROT1") /* player 1 12-way rotary control - not used in this game */
+ PORT_START("ROT1") /* player 1 12-way rotary control - not used in this game */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("ROT2") /* player 2 12-way rotary control - not used in this game */
+ PORT_START("ROT2") /* player 2 12-way rotary control - not used in this game */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
@@ -464,7 +464,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( ikari3 )
- PORT_START_TAG("P1") /* Player 1 controls, maybe all are active_high? */
+ PORT_START("P1") /* Player 1 controls, maybe all are active_high? */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -474,7 +474,7 @@ static INPUT_PORTS_START( ikari3 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 controls */
+ PORT_START("P2") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -484,7 +484,7 @@ static INPUT_PORTS_START( ikari3 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) /* same as the service mode dsw */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -494,7 +494,7 @@ static INPUT_PORTS_START( ikari3 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* Dip switches (Active high) */
+ PORT_START("DSW1") /* Dip switches (Active high) */
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0300, 0x0000, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0200, "2" )
@@ -519,7 +519,7 @@ static INPUT_PORTS_START( ikari3 )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x8000, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* Dip switches (Active high) */
+ PORT_START("DSW2") /* Dip switches (Active high) */
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE( 0x0100, IP_ACTIVE_HIGH )
PORT_DIPNAME( 0x0200, 0x0000, DEF_STR( Allow_Continue ) )
@@ -541,10 +541,10 @@ static INPUT_PORTS_START( ikari3 )
PORT_DIPSETTING( 0x4000, DEF_STR( Hard ) )
PORT_DIPSETTING( 0xc000, DEF_STR( Hardest ) )
- PORT_START_TAG("ROT1") /* player 1 12-way rotary control */
+ PORT_START("ROT1") /* player 1 12-way rotary control */
PORT_BIT( 0x0f, 0x00, IPT_POSITIONAL ) PORT_POSITIONS(12) PORT_WRAPS PORT_SENSITIVITY(5) PORT_KEYDELTA(5) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X) PORT_REVERSE PORT_FULL_TURN_COUNT(12)
- PORT_START_TAG("ROT2") /* player 2 12-way rotary control */
+ PORT_START("ROT2") /* player 2 12-way rotary control */
PORT_BIT( 0x0f, 0x00, IPT_POSITIONAL ) PORT_POSITIONS(12) PORT_WRAPS PORT_SENSITIVITY(5) PORT_KEYDELTA(5) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M) PORT_PLAYER(2) PORT_REVERSE PORT_FULL_TURN_COUNT(12)
INPUT_PORTS_END
diff --git a/src/mame/drivers/snookr10.c b/src/mame/drivers/snookr10.c
index 527cbe65d96..e2ebde4c8f9 100644
--- a/src/mame/drivers/snookr10.c
+++ b/src/mame/drivers/snookr10.c
@@ -507,7 +507,7 @@ ADDRESS_MAP_END
All Hold & Cancel buttons have a rattle sound in the real PCB. */
static INPUT_PORTS_START( snookr10 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Remote x100") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Stop 1") PORT_CODE(KEYCODE_Z) /* Input Test in stats mode */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Cancella (Cancel) / Play / Bet") PORT_CODE(KEYCODE_N)
@@ -517,7 +517,7 @@ static INPUT_PORTS_START( snookr10 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Management")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Stop 4 / Alta (High)") PORT_CODE(KEYCODE_V)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Stop 2 / Bassa (Low)") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Stop 3") PORT_CODE(KEYCODE_C)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Ticket") PORT_CODE(KEYCODE_T)
@@ -527,7 +527,7 @@ static INPUT_PORTS_START( snookr10 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Scarica (Payout)") PORT_CODE(KEYCODE_M)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -537,7 +537,7 @@ static INPUT_PORTS_START( snookr10 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SW1")
+ PORT_START("SW1")
PORT_DIPNAME( 0x03, 0x00, "Pool Value" ) PORT_DIPLOCATION("SW1:7,8")
PORT_DIPSETTING( 0x03, "100" )
PORT_DIPSETTING( 0x02, "200" )
@@ -566,7 +566,7 @@ static INPUT_PORTS_START( apple10 )
/* Eliminated all PORT_IMPULSE limitations.
All Hold & Cancel buttons have a rattle sound in the real PCB. */
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Remote x100") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Stop 1") PORT_CODE(KEYCODE_Z) /* Input Test in stats mode */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Cancella (Cancel) / Play / Bet") PORT_CODE(KEYCODE_N)
@@ -576,7 +576,7 @@ static INPUT_PORTS_START( apple10 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Management")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Stop 4 / Alta (High)") PORT_CODE(KEYCODE_V)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Stop 2 / Bassa (Low)") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Stop 3") PORT_CODE(KEYCODE_C)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Ticket") PORT_CODE(KEYCODE_T)
@@ -586,7 +586,7 @@ static INPUT_PORTS_START( apple10 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Scarica (Payout)") PORT_CODE(KEYCODE_M)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -596,7 +596,7 @@ static INPUT_PORTS_START( apple10 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SW1")
+ PORT_START("SW1")
PORT_DIPNAME( 0x03, 0x00, "Pool Value" ) PORT_DIPLOCATION("SW1:7,8")
PORT_DIPSETTING( 0x03, "100" )
PORT_DIPSETTING( 0x02, "200" )
@@ -625,7 +625,7 @@ static INPUT_PORTS_START( tenballs )
/* Eliminated all PORT_IMPULSE limitations.
All Hold & Cancel buttons have a rattle sound in the real PCB. */
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Remote x100") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Stop 1") PORT_CODE(KEYCODE_Z) /* no Input Test in stats mode */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Cancella (Cancel) / Play / Bet") PORT_CODE(KEYCODE_N)
@@ -635,7 +635,7 @@ static INPUT_PORTS_START( tenballs )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Management")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Stop 4 / Alta (High)") PORT_CODE(KEYCODE_V)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Stop 2 / Bassa (Low)") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Stop 3") PORT_CODE(KEYCODE_C)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Ticket") PORT_CODE(KEYCODE_T)
@@ -645,7 +645,7 @@ static INPUT_PORTS_START( tenballs )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Scarica (Payout)") PORT_CODE(KEYCODE_M)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -658,7 +658,7 @@ static INPUT_PORTS_START( tenballs )
/* tenballs seems a prototype, most DIP
switches seems to do nothing at all.
*/
- PORT_START_TAG("SW1")
+ PORT_START("SW1")
PORT_DIPNAME( 0x03, 0x00, "Pool Value" ) PORT_DIPLOCATION("SW1:7,8")
PORT_DIPSETTING( 0x03, "100" )
PORT_DIPSETTING( 0x02, "200" )
diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c
index 1341e3aa4ae..d7d2d4fc405 100644
--- a/src/mame/drivers/snowbros.c
+++ b/src/mame/drivers/snowbros.c
@@ -560,7 +560,7 @@ static ADDRESS_MAP_START( finalttr_writemem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
static INPUT_PORTS_START( snowbros )
- PORT_START_TAG("DSW") /* 500001 */
+ PORT_START("DSW1") /* 500001 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Region ) )
PORT_DIPSETTING( 0x00, DEF_STR( Europe ) )
PORT_DIPSETTING( 0x01, "America (Romstar license)" )
@@ -572,22 +572,22 @@ static INPUT_PORTS_START( snowbros )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) )
- PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) ) PORT_CONDITION("DSW",0x01,PORTCOND_EQUALS,0x00)
- PORT_DIPSETTING( 0x10, DEF_STR( 3C_1C ) ) PORT_CONDITION("DSW",0x01,PORTCOND_EQUALS,0x00)
- PORT_DIPSETTING( 0x20, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW",0x01,PORTCOND_EQUALS,0x00)
- PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW",0x01,PORTCOND_EQUALS,0x01)
+ PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) ) PORT_CONDITION("DSW1",0x01,PORTCOND_EQUALS,0x00)
+ PORT_DIPSETTING( 0x10, DEF_STR( 3C_1C ) ) PORT_CONDITION("DSW1",0x01,PORTCOND_EQUALS,0x00)
+ PORT_DIPSETTING( 0x20, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW1",0x01,PORTCOND_EQUALS,0x00)
+ PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW1",0x01,PORTCOND_EQUALS,0x01)
PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) )
- PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW",0x01,PORTCOND_EQUALS,0x01)
- PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW",0x01,PORTCOND_EQUALS,0x01)
+ PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW1",0x01,PORTCOND_EQUALS,0x01)
+ PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW1",0x01,PORTCOND_EQUALS,0x01)
PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_B ) )
- PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW",0x01,PORTCOND_EQUALS,0x01)
- PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW",0x01,PORTCOND_EQUALS,0x01)
- PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW",0x01,PORTCOND_EQUALS,0x01)
- PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW",0x01,PORTCOND_EQUALS,0x01)
- PORT_DIPSETTING( 0xc0, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW",0x01,PORTCOND_EQUALS,0x00)
- PORT_DIPSETTING( 0x80, DEF_STR( 1C_3C ) ) PORT_CONDITION("DSW",0x01,PORTCOND_EQUALS,0x00)
- PORT_DIPSETTING( 0x40, DEF_STR( 1C_4C ) ) PORT_CONDITION("DSW",0x01,PORTCOND_EQUALS,0x00)
- PORT_DIPSETTING( 0x00, DEF_STR( 1C_6C ) ) PORT_CONDITION("DSW",0x01,PORTCOND_EQUALS,0x00)
+ PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW1",0x01,PORTCOND_EQUALS,0x01)
+ PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW1",0x01,PORTCOND_EQUALS,0x01)
+ PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW1",0x01,PORTCOND_EQUALS,0x01)
+ PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW1",0x01,PORTCOND_EQUALS,0x01)
+ PORT_DIPSETTING( 0xc0, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW1",0x01,PORTCOND_EQUALS,0x00)
+ PORT_DIPSETTING( 0x80, DEF_STR( 1C_3C ) ) PORT_CONDITION("DSW1",0x01,PORTCOND_EQUALS,0x00)
+ PORT_DIPSETTING( 0x40, DEF_STR( 1C_4C ) ) PORT_CONDITION("DSW1",0x01,PORTCOND_EQUALS,0x00)
+ PORT_DIPSETTING( 0x00, DEF_STR( 1C_6C ) ) PORT_CONDITION("DSW1",0x01,PORTCOND_EQUALS,0x00)
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -598,7 +598,7 @@ static INPUT_PORTS_START( snowbros )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Must be low or game stops! */
/* probably VBlank */
- PORT_START /* 500003 */
+ PORT_START("DSW2") /* 500003 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -629,7 +629,7 @@ static INPUT_PORTS_START( snowbros )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* 500005 */
+ PORT_START("SYSTEM") /* 500005 */
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -641,7 +641,7 @@ static INPUT_PORTS_START( snowbros )
INPUT_PORTS_END
static INPUT_PORTS_START( snowbroj )
- PORT_START /* 500001 */
+ PORT_START("DSW1") /* 500001 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -672,7 +672,7 @@ static INPUT_PORTS_START( snowbroj )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Must be low or game stops! */
/* probably VBlank */
- PORT_START /* 500003 */
+ PORT_START("DSW2") /* 500003 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -703,7 +703,7 @@ static INPUT_PORTS_START( snowbroj )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* 500005 */
+ PORT_START("SYSTEM") /* 500005 */
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -715,7 +715,7 @@ static INPUT_PORTS_START( snowbroj )
INPUT_PORTS_END
static INPUT_PORTS_START( honeydol )
- PORT_START_TAG("DSW")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) )
@@ -748,7 +748,7 @@ static INPUT_PORTS_START( honeydol )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_VBLANK ) /* Must be low or game stops! */
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Hard ) )
@@ -779,7 +779,7 @@ static INPUT_PORTS_START( honeydol )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -791,7 +791,7 @@ static INPUT_PORTS_START( honeydol )
INPUT_PORTS_END
static INPUT_PORTS_START( twinadv )
- PORT_START_TAG("DSW")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) )
@@ -824,7 +824,7 @@ static INPUT_PORTS_START( twinadv )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_VBLANK ) /* Must be low or game stops! */
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Hard ) )
@@ -857,7 +857,7 @@ static INPUT_PORTS_START( twinadv )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -869,7 +869,7 @@ static INPUT_PORTS_START( twinadv )
INPUT_PORTS_END
static INPUT_PORTS_START( 4in1boot )
- PORT_START /* 500001 */
+ PORT_START("DSW1") /* 500001 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -908,7 +908,7 @@ static INPUT_PORTS_START( 4in1boot )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Must be low or game stops! */
/* probably VBlank */
- PORT_START /* 500003 */
+ PORT_START("DSW2") /* 500003 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x02, "1" )
PORT_DIPSETTING( 0x00, "2" )
@@ -939,7 +939,7 @@ static INPUT_PORTS_START( 4in1boot )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* 500005 */
+ PORT_START("SYSTEM") /* 500005 */
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -951,7 +951,7 @@ static INPUT_PORTS_START( 4in1boot )
INPUT_PORTS_END
static INPUT_PORTS_START( hyperpac )
- PORT_START /* 500000.w */
+ PORT_START("DSW1") /* 500000.w */
PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -982,7 +982,7 @@ static INPUT_PORTS_START( hyperpac )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) // test mode only?
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* 500002.w */
+ PORT_START("DSW2") /* 500002.w */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1016,7 +1016,7 @@ static INPUT_PORTS_START( hyperpac )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) // test mode only?
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* 500004.w */
+ PORT_START("SYSTEM") /* 500004.w */
PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -1028,7 +1028,7 @@ static INPUT_PORTS_START( hyperpac )
INPUT_PORTS_END
static INPUT_PORTS_START( cookbib2 )
- PORT_START /* 500000.w */
+ PORT_START("DSW1") /* 500000.w */
PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1059,7 +1059,7 @@ static INPUT_PORTS_START( cookbib2 )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) // test mode only?
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* 500002.w */
+ PORT_START("DSW2") /* 500002.w */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1093,7 +1093,7 @@ static INPUT_PORTS_START( cookbib2 )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) // test mode only?
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* 500004.w */
+ PORT_START("SYSTEM") /* 500004.w */
PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -1105,7 +1105,7 @@ static INPUT_PORTS_START( cookbib2 )
INPUT_PORTS_END
static INPUT_PORTS_START( cookbib3 )
- PORT_START /* 500000.w */
+ PORT_START("DSW1") /* 500000.w */
PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1137,7 +1137,7 @@ static INPUT_PORTS_START( cookbib3 )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) // test mode only?
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* 500002.w */
+ PORT_START("DSW2") /* 500002.w */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1171,7 +1171,7 @@ static INPUT_PORTS_START( cookbib3 )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) // test mode only?
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* 500004.w */
+ PORT_START("SYSTEM") /* 500004.w */
PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -1183,7 +1183,7 @@ static INPUT_PORTS_START( cookbib3 )
INPUT_PORTS_END
static INPUT_PORTS_START( moremore )
- PORT_START /* 500000.w */
+ PORT_START("DSW1") /* 500000.w */
PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1215,7 +1215,7 @@ static INPUT_PORTS_START( moremore )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) // test mode only?
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* 500002.w */
+ PORT_START("DSW2") /* 500002.w */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1249,7 +1249,7 @@ static INPUT_PORTS_START( moremore )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) // test mode only?
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* 500004.w */
+ PORT_START("SYSTEM") /* 500004.w */
PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -1261,7 +1261,7 @@ static INPUT_PORTS_START( moremore )
INPUT_PORTS_END
static INPUT_PORTS_START( toppyrap )
- PORT_START /* 500000.w */
+ PORT_START("DSW1") /* 500000.w */
PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1292,7 +1292,7 @@ static INPUT_PORTS_START( toppyrap )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) // test mode only?
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* 500002.w */
+ PORT_START("DSW2") /* 500002.w */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x03, "3" )
@@ -1324,7 +1324,7 @@ static INPUT_PORTS_START( toppyrap )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) // test mode only?
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* 500004.w */
+ PORT_START("SYSTEM") /* 500004.w */
PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -1336,7 +1336,7 @@ static INPUT_PORTS_START( toppyrap )
INPUT_PORTS_END
static INPUT_PORTS_START( finalttr )
- PORT_START /* 500001 */
+ PORT_START("DSW1") /* 500001 */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0001, DEF_STR( On ) )
@@ -1370,7 +1370,7 @@ static INPUT_PORTS_START( finalttr )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Must be low or game stops! */
/* probably VBlank */
- PORT_START /* 500003 */
+ PORT_START("DSW2") /* 500003 */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1403,7 +1403,7 @@ static INPUT_PORTS_START( finalttr )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* 500005 */
+ PORT_START("SYSTEM") /* 500005 */
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 )
diff --git a/src/mame/drivers/solomon.c b/src/mame/drivers/solomon.c
index 57086368930..26c67ab27b4 100644
--- a/src/mame/drivers/solomon.c
+++ b/src/mame/drivers/solomon.c
@@ -91,7 +91,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( solomon )
- PORT_START /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -101,7 +101,7 @@ static INPUT_PORTS_START( solomon )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -111,7 +111,7 @@ static INPUT_PORTS_START( solomon )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* COIN */
+ PORT_START("SYSTEM") /* COIN */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -121,7 +121,7 @@ static INPUT_PORTS_START( solomon )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -144,7 +144,7 @@ static INPUT_PORTS_START( solomon )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_3C ) )
- PORT_START /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x00, DEF_STR( Normal ) )
diff --git a/src/mame/drivers/sonson.c b/src/mame/drivers/sonson.c
index 28f083af45d..2682a14b0bf 100644
--- a/src/mame/drivers/sonson.c
+++ b/src/mame/drivers/sonson.c
@@ -110,7 +110,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( sonson )
- PORT_START /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -120,7 +120,7 @@ static INPUT_PORTS_START( sonson )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_START /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -130,7 +130,7 @@ static INPUT_PORTS_START( sonson )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_START /* IN2 */
+ PORT_START("SYSTEM") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
@@ -140,7 +140,7 @@ static INPUT_PORTS_START( sonson )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_START /* DSW0 */
+ PORT_START("DSW1") /* DSW0 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -167,7 +167,7 @@ static INPUT_PORTS_START( sonson )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* DSW1 */
+ PORT_START("DSW2") /* DSW1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
diff --git a/src/mame/drivers/spacefb.c b/src/mame/drivers/spacefb.c
index 994b7b956b9..195888e0412 100644
--- a/src/mame/drivers/spacefb.c
+++ b/src/mame/drivers/spacefb.c
@@ -242,7 +242,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( spacefb )
- PORT_START /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -252,7 +252,7 @@ static INPUT_PORTS_START( spacefb )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 )
- PORT_START /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -262,7 +262,7 @@ static INPUT_PORTS_START( spacefb )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START /* Coin - Start */
+ PORT_START("SYSTEM") /* Coin - Start */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -272,7 +272,7 @@ static INPUT_PORTS_START( spacefb )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE ) /* Test ? */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START /* DSW0 */
+ PORT_START("DSW") /* DSW0 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW:1,2")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -295,7 +295,7 @@ INPUT_PORTS_END
/* same as Space Firebird, except for the difficulty switch */
static INPUT_PORTS_START( spacedem )
- PORT_START /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -305,7 +305,7 @@ static INPUT_PORTS_START( spacedem )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 )
- PORT_START /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -315,7 +315,7 @@ static INPUT_PORTS_START( spacedem )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START /* Coin - Start */
+ PORT_START("SYSTEM") /* Coin - Start */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -325,7 +325,7 @@ static INPUT_PORTS_START( spacedem )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE ) /* Test ? */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START /* DSW0 */
+ PORT_START("DSW") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
diff --git a/src/mame/drivers/spaceg.c b/src/mame/drivers/spaceg.c
index b1f496e07c1..bfb9c913591 100644
--- a/src/mame/drivers/spaceg.c
+++ b/src/mame/drivers/spaceg.c
@@ -323,7 +323,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( spaceg )
- PORT_START_TAG("9800")
+ PORT_START("9800")
PORT_DIPUNUSED( 0x01, IP_ACTIVE_HIGH ) /* was related to coinage */
PORT_DIPUNKNOWN( 0x02, IP_ACTIVE_HIGH ) /* check code at 0x127d - when bases are supposed to disappear */
PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Lives ) )
@@ -342,20 +342,20 @@ static INPUT_PORTS_START( spaceg )
PORT_DIPSETTING( 0x40, "40000" )
PORT_DIPSETTING( 0xc0, "50000" )
- PORT_START_TAG("9801")
+ PORT_START("9801")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_START_TAG("9802")
+ PORT_START("9802")
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_START2 )
- PORT_START_TAG("9805") /* player 1 */
+ PORT_START("9805") /* player 1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
- PORT_START_TAG("9806") /* player 2 */
+ PORT_START("9806") /* player 2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
INPUT_PORTS_END
diff --git a/src/mame/drivers/spbactn.c b/src/mame/drivers/spbactn.c
index 75e532eb36d..3fa06b047fa 100644
--- a/src/mame/drivers/spbactn.c
+++ b/src/mame/drivers/spbactn.c
@@ -216,7 +216,7 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( spbactn )
- PORT_START /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -226,7 +226,7 @@ static INPUT_PORTS_START( spbactn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -236,7 +236,7 @@ static INPUT_PORTS_START( spbactn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN2 */
+ PORT_START("SYSTEM") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 ) // Press mulitple times for multiple players
@@ -246,7 +246,7 @@ static INPUT_PORTS_START( spbactn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 3C_1C ) )
@@ -271,7 +271,7 @@ static INPUT_PORTS_START( spbactn )
PORT_DIPSETTING( 0x80, "4" )
PORT_DIPSETTING( 0x40, "5" )
- PORT_START /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
diff --git a/src/mame/drivers/spcforce.c b/src/mame/drivers/spcforce.c
index 9a3b7a973b6..1894cef7f68 100644
--- a/src/mame/drivers/spcforce.c
+++ b/src/mame/drivers/spcforce.c
@@ -123,7 +123,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( spcforce )
- PORT_START /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) )
@@ -147,7 +147,7 @@ static INPUT_PORTS_START( spcforce )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -157,7 +157,7 @@ static INPUT_PORTS_START( spcforce )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
- PORT_START /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -170,7 +170,7 @@ INPUT_PORTS_END
/* same as spcforce, but no cocktail mode */
static INPUT_PORTS_START( spcforc2 )
- PORT_START /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) )
@@ -194,7 +194,7 @@ static INPUT_PORTS_START( spcforc2 )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -204,7 +204,7 @@ static INPUT_PORTS_START( spcforc2 )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
- PORT_START /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_SERVICE_NO_TOGGLE( 0x08, IP_ACTIVE_LOW )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_VBLANK )
INPUT_PORTS_END
diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c
index c81c9bf87d0..ff7b4fc7470 100644
--- a/src/mame/drivers/spdodgeb.c
+++ b/src/mame/drivers/spdodgeb.c
@@ -306,7 +306,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( spdodgeb )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* mcu63701_busy flag */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -319,7 +319,7 @@ static INPUT_PORTS_START( spdodgeb )
PORT_DIPSETTING( 0x40, DEF_STR( Hard ))
PORT_DIPSETTING( 0x00, DEF_STR( Very_Hard ))
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
@@ -345,7 +345,7 @@ static INPUT_PORTS_START( spdodgeb )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -355,7 +355,7 @@ static INPUT_PORTS_START( spdodgeb )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -365,7 +365,7 @@ static INPUT_PORTS_START( spdodgeb )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
diff --git a/src/mame/drivers/speedatk.c b/src/mame/drivers/speedatk.c
index 819e58a36d8..e99c571f867 100644
--- a/src/mame/drivers/speedatk.c
+++ b/src/mame/drivers/speedatk.c
@@ -186,7 +186,7 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( speedatk )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_SERVICE( 0x01, IP_ACTIVE_HIGH )
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -209,7 +209,7 @@ static INPUT_PORTS_START( speedatk )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_5C ) )
PORT_DIPSETTING( 0xc0, "1 Coin/10 Credits" )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) //P1 A
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) //P1 B
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) //P1 C
@@ -223,7 +223,7 @@ static INPUT_PORTS_START( speedatk )
PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x800, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(2)
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) //P2 A
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) //P2 B
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) //P2 C
diff --git a/src/mame/drivers/speedbal.c b/src/mame/drivers/speedbal.c
index ea10b73df0a..c1d4c41642f 100644
--- a/src/mame/drivers/speedbal.c
+++ b/src/mame/drivers/speedbal.c
@@ -110,7 +110,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( speedbal )
- PORT_START /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x06, "70000 200000 1M" )
PORT_DIPSETTING( 0x07, "70000 200000" )
@@ -134,7 +134,7 @@ static INPUT_PORTS_START( speedbal )
PORT_DIPSETTING( 0x40, "Difficult" )
PORT_DIPSETTING( 0x00, "Very Difficult" )
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_3C ) )
@@ -157,7 +157,7 @@ static INPUT_PORTS_START( speedbal )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW , IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW , IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW , IPT_BUTTON4 )
@@ -167,7 +167,7 @@ static INPUT_PORTS_START( speedbal )
PORT_BIT( 0x40, IP_ACTIVE_LOW , IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW , IPT_COIN1 )
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW , IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW , IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW , IPT_BUTTON4 ) PORT_COCKTAIL
diff --git a/src/mame/drivers/speedspn.c b/src/mame/drivers/speedspn.c
index 734641e87e5..94404276be4 100644
--- a/src/mame/drivers/speedspn.c
+++ b/src/mame/drivers/speedspn.c
@@ -175,7 +175,7 @@ ADDRESS_MAP_END
/*** INPUT PORT **************************************************************/
static INPUT_PORTS_START( speedspn )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -185,7 +185,7 @@ static INPUT_PORTS_START( speedspn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START /* Player 1 Inputs */
+ PORT_START("P1") /* Player 1 Inputs */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -195,7 +195,7 @@ static INPUT_PORTS_START( speedspn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
- PORT_START /* Player 2 Inputs */
+ PORT_START("P2") /* Player 2 Inputs */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
@@ -205,7 +205,7 @@ static INPUT_PORTS_START( speedspn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
- PORT_START /* Dips */
+ PORT_START("DSW1") /* Dips */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x01, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
@@ -241,7 +241,7 @@ static INPUT_PORTS_START( speedspn )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ) )
- PORT_START /* Dips */
+ PORT_START("DSW2") /* Dips */
PORT_DIPNAME( 0x01, 0x01, "World Cup" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
diff --git a/src/mame/drivers/speglsht.c b/src/mame/drivers/speglsht.c
index c5b0e35cc7e..687ed10c2be 100644
--- a/src/mame/drivers/speglsht.c
+++ b/src/mame/drivers/speglsht.c
@@ -166,8 +166,7 @@ static ADDRESS_MAP_START( speglsht_mem, ADDRESS_SPACE_PROGRAM, 32 )
ADDRESS_MAP_END
static INPUT_PORTS_START( speglsht )
-
-PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
@@ -175,11 +174,11 @@ PORT_START
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
+ PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xffff0000, IP_ACTIVE_LOW, IPT_UNUSED )
-PORT_START
+ PORT_START("IN1")
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0003, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0004, DEF_STR( 2C_1C ) )
@@ -237,7 +236,7 @@ PORT_START
PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x10000000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x20000000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
+ PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
INPUT_PORTS_END
static GFXDECODE_START( speglsht )
diff --git a/src/mame/drivers/spiders.c b/src/mame/drivers/spiders.c
index 4852e289328..0eb259ba556 100644
--- a/src/mame/drivers/spiders.c
+++ b/src/mame/drivers/spiders.c
@@ -596,7 +596,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( spiders )
/* PIA1 PA0 - PA7 */
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_HIGH )
@@ -607,14 +607,14 @@ static INPUT_PORTS_START( spiders )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SERVICE2 )
/* PIA1 PB0 - PB7 */
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW1") /* IN2, DSW1 */
+ PORT_START("DSW1") /* IN2, DSW1 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) )
@@ -624,7 +624,7 @@ static INPUT_PORTS_START( spiders )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW2") /* IN3, DSW2 */
+ PORT_START("DSW2") /* IN3, DSW2 */
PORT_DIPNAME( 0x03, 0x03, "Play Mode" ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x00, "A A'" )
PORT_DIPSETTING( 0x01, "A B'" )
@@ -647,7 +647,7 @@ static INPUT_PORTS_START( spiders )
PORT_DIPSETTING( 0x00, "First Screen" )
PORT_DIPSETTING( 0x80, "Every Screen" )
- PORT_START_TAG("DSW3") /* IN4, DSW3 */
+ PORT_START("DSW3") /* IN4, DSW3 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW3:1")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -673,7 +673,7 @@ static INPUT_PORTS_START( spiders )
PORT_DIPSETTING( 0xc0, "6" )
PORT_DIPSETTING( 0xe0, "7" )
- PORT_START_TAG("XHATCH") /* connected to PIA1 CB1 input */
+ PORT_START("XHATCH") /* connected to PIA1 CB1 input */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("PS1 (Crosshatch)") PORT_CODE(KEYCODE_F1)
INPUT_PORTS_END
diff --git a/src/mame/drivers/splash.c b/src/mame/drivers/splash.c
index 9317d0b17c8..a1576ef635e 100644
--- a/src/mame/drivers/splash.c
+++ b/src/mame/drivers/splash.c
@@ -251,7 +251,7 @@ static ADDRESS_MAP_START( funystrp_writemem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
static INPUT_PORTS_START( splash )
- PORT_START /* DSW #1 */
+ PORT_START("DSW1") /* DSW #1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x06, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
@@ -279,7 +279,7 @@ static INPUT_PORTS_START( splash )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x00, "1C/1C or Free Play (if Coin A too)" )
- PORT_START /* DSW #2 */
+ PORT_START("DSW2") /* DSW #2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -301,7 +301,7 @@ static INPUT_PORTS_START( splash )
PORT_DIPSETTING( 0x40, DEF_STR( Normal ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START /* 1P INPUTS & COINSW */
+ PORT_START("P1") /* 1P INPUTS & COINSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -311,7 +311,7 @@ static INPUT_PORTS_START( splash )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START /* 2P INPUTS & STARTSW */
+ PORT_START("P2") /* 2P INPUTS & STARTSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
@@ -323,7 +323,7 @@ static INPUT_PORTS_START( splash )
INPUT_PORTS_END
static INPUT_PORTS_START( funystrp )
- PORT_START /* DSW #1 */
+ PORT_START("DSW1") /* DSW #1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x06, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
@@ -351,7 +351,7 @@ static INPUT_PORTS_START( funystrp )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x00, "1C/1C or Free Play (if Coin A too)" )
- PORT_START /* DSW #2 */
+ PORT_START("DSW2") /* DSW #2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -375,7 +375,7 @@ static INPUT_PORTS_START( funystrp )
PORT_DIPSETTING( 0x80, "Soft" )
PORT_DIPSETTING( 0x00, DEF_STR( Hard ) )
- PORT_START /* 1P INPUTS & COINSW */
+ PORT_START("P1") /* 1P INPUTS & COINSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -385,7 +385,7 @@ static INPUT_PORTS_START( funystrp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START /* 2P INPUTS & STARTSW */
+ PORT_START("P2") /* 2P INPUTS & STARTSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/sprcros2.c b/src/mame/drivers/sprcros2.c
index 69a20da3dfb..55b33684d94 100644
--- a/src/mame/drivers/sprcros2.c
+++ b/src/mame/drivers/sprcros2.c
@@ -181,7 +181,7 @@ static ADDRESS_MAP_START( sprcros2_s_writeport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( sprcros2 )
- PORT_START /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -191,7 +191,7 @@ static INPUT_PORTS_START( sprcros2 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -201,7 +201,7 @@ static INPUT_PORTS_START( sprcros2 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START /* IN2 */
+ PORT_START("EXTRA") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -210,7 +210,7 @@ static INPUT_PORTS_START( sprcros2 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START /* IN3 */
+ PORT_START("DSW1") /* IN3 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x07, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x06, DEF_STR( 2C_1C ) )
@@ -222,7 +222,7 @@ static INPUT_PORTS_START( sprcros2 )
PORT_DIPSETTING( 0x05, DEF_STR( 1C_6C ) )
PORT_BIT( 0xf8, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START /* IN4 */
+ PORT_START("DSW2") /* IN4 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
diff --git a/src/mame/drivers/sprint2.c b/src/mame/drivers/sprint2.c
index a8b60587c88..245404ade01 100644
--- a/src/mame/drivers/sprint2.c
+++ b/src/mame/drivers/sprint2.c
@@ -283,7 +283,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( sprint2 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, "Tracks on Demo" )
PORT_DIPSETTING( 0x00, "Easy Track Only" )
PORT_DIPSETTING( 0x01, "Cycle 12 Tracks" )
@@ -307,7 +307,7 @@ static INPUT_PORTS_START( sprint2 )
PORT_DIPSETTING( 0x40, "120 seconds" )
PORT_DIPSETTING( 0x00, "150 seconds" )
- PORT_START_TAG("INA") /* input A */
+ PORT_START("INA") /* input A */
PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_UNUSED ) /* P1 1st gear */
PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_UNUSED ) /* P2 1st gear */
PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_UNUSED ) /* P1 2nd gear */
@@ -315,7 +315,7 @@ static INPUT_PORTS_START( sprint2 )
PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_UNUSED ) /* P1 3rd gear */
PORT_BIT (0x20, IP_ACTIVE_LOW, IPT_UNUSED ) /* P2 3rd gear */
- PORT_START_TAG("INB") /* input B */
+ PORT_START("INB") /* input B */
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Player 1 Gas") PORT_PLAYER(1)
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Player 2 Gas") PORT_PLAYER(2)
PORT_SERVICE( 0x04, IP_ACTIVE_LOW )
@@ -324,38 +324,38 @@ static INPUT_PORTS_START( sprint2 )
PORT_BIT (0x20, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Track Select") PORT_CODE(KEYCODE_SPACE)
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("GEAR_P1")
+ PORT_START("GEAR_P1")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Player 1 Gear 1") PORT_CODE(KEYCODE_Z) PORT_PLAYER(1)
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Player 1 Gear 2") PORT_CODE(KEYCODE_X) PORT_PLAYER(1)
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Player 1 Gear 3") PORT_CODE(KEYCODE_C) PORT_PLAYER(1)
PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Player 1 Gear 4") PORT_CODE(KEYCODE_V) PORT_PLAYER(1)
- PORT_START_TAG("GEAR_P2")
+ PORT_START("GEAR_P2")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Player 2 Gear 1") PORT_CODE(KEYCODE_Q) PORT_PLAYER(2)
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Player 2 Gear 2") PORT_CODE(KEYCODE_W) PORT_PLAYER(2)
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Player 2 Gear 3") PORT_CODE(KEYCODE_E) PORT_PLAYER(2)
PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Player 2 Gear 4") PORT_CODE(KEYCODE_R) PORT_PLAYER(2)
- PORT_START_TAG("DIAL_P1")
+ PORT_START("DIAL_P1")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("DIAL_P2")
+ PORT_START("DIAL_P2")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("MOTOR1")
+ PORT_START("MOTOR1")
PORT_ADJUSTER( 30, "Motor 1 RPM" )
- PORT_START_TAG("MOTOR2")
+ PORT_START("MOTOR2")
PORT_ADJUSTER( 40, "Motor 2 RPM" )
INPUT_PORTS_END
static INPUT_PORTS_START( sprint1 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, "Change Track" )
PORT_DIPSETTING( 0x01, "Every Lap" )
PORT_DIPSETTING( 0x00, "Every 2 Laps" )
@@ -379,9 +379,9 @@ static INPUT_PORTS_START( sprint1 )
PORT_DIPSETTING( 0x40, "120 seconds" )
PORT_DIPSETTING( 0x00, "150 seconds" )
- PORT_START_TAG("INA") /* input A */
+ PORT_START("INA") /* input A */
- PORT_START_TAG("INB") /* input B */
+ PORT_START("INB") /* input B */
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) /* 1st gear */
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) /* 2nd gear */
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) /* 3rd gear */
@@ -389,30 +389,30 @@ static INPUT_PORTS_START( sprint1 )
PORT_SERVICE( 0x10, IP_ACTIVE_LOW )
PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("GEAR_P1")
+ PORT_START("GEAR_P1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Gear 1") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Gear 2") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Gear 3") PORT_CODE(KEYCODE_C)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Gear 4") PORT_CODE(KEYCODE_V)
- PORT_START_TAG("GEAR_P2")
+ PORT_START("GEAR_P2")
- PORT_START_TAG("DIAL_P1")
+ PORT_START("DIAL_P1")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START_TAG("DIAL_P2")
+ PORT_START("DIAL_P2")
- PORT_START_TAG("MOTOR")
+ PORT_START("MOTOR")
PORT_ADJUSTER( 30, "Motor RPM" )
INPUT_PORTS_END
static INPUT_PORTS_START( dominos )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x01, "Points to Win" )
PORT_DIPSETTING( 0x03, "6" )
PORT_DIPSETTING( 0x02, "5" )
@@ -435,13 +435,13 @@ static INPUT_PORTS_START( dominos )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("INA") /* input A */
+ PORT_START("INA") /* input A */
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
- PORT_START_TAG("INB") /* input B */
+ PORT_START("INB") /* input B */
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
@@ -450,11 +450,11 @@ static INPUT_PORTS_START( dominos )
PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_START2 )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("R23")
+ PORT_START("R23")
PORT_ADJUSTER( 50, "R23 - Tone Freq" )
INPUT_PORTS_END
diff --git a/src/mame/drivers/sprint4.c b/src/mame/drivers/sprint4.c
index 9e0a53016db..a59828e0078 100644
--- a/src/mame/drivers/sprint4.c
+++ b/src/mame/drivers/sprint4.c
@@ -270,14 +270,14 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( sprint4 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Track Select") PORT_CODE(KEYCODE_SPACE)
- PORT_START_TAG("COLLISION")
+ PORT_START("COLLISION")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Player 1 Gas") PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM( get_collision, (void *)0 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Player 2 Gas") PORT_PLAYER(2)
@@ -287,7 +287,7 @@ static INPUT_PORTS_START( sprint4 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Player 4 Gas") PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM( get_collision, (void *)3 )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -297,7 +297,7 @@ static INPUT_PORTS_START( sprint4 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4 )
- PORT_START_TAG("DIP")
+ PORT_START("DIP")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Language )) PORT_DIPLOCATION("DIP:8,7")
PORT_DIPSETTING( 0x00, DEF_STR( German ))
PORT_DIPSETTING( 0x01, DEF_STR( French ))
@@ -315,7 +315,7 @@ static INPUT_PORTS_START( sprint4 )
PORT_DIPSETTING( 0xd0, "120 seconds" )
PORT_DIPSETTING( 0xe0, "150 seconds" )
- PORT_START_TAG("ANALOG")
+ PORT_START("ANALOG")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM( get_wheel, (void *)0)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM( get_lever, (void *)0)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM( get_wheel, (void *)1)
@@ -325,52 +325,52 @@ static INPUT_PORTS_START( sprint4 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM( get_wheel, (void *)3)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM( get_lever, (void *)3)
- PORT_START_TAG("WHEEL1")
+ PORT_START("WHEEL1")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(16) PORT_PLAYER(1)
- PORT_START_TAG("WHEEL2")
+ PORT_START("WHEEL2")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(16) PORT_PLAYER(2)
- PORT_START_TAG("WHEEL3")
+ PORT_START("WHEEL3")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(16) PORT_PLAYER(3)
- PORT_START_TAG("WHEEL4")
+ PORT_START("WHEEL4")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(16) PORT_PLAYER(4)
- PORT_START_TAG("LEVER1")
+ PORT_START("LEVER1")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Player 1 Gear 1") PORT_CODE(KEYCODE_Z) PORT_PLAYER(1)
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Player 1 Gear 2") PORT_CODE(KEYCODE_X) PORT_PLAYER(1)
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Player 1 Gear 3") PORT_CODE(KEYCODE_C) PORT_PLAYER(1)
PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Player 1 Gear 4") PORT_CODE(KEYCODE_V) PORT_PLAYER(1)
- PORT_START_TAG("LEVER2")
+ PORT_START("LEVER2")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Player 2 Gear 1") PORT_CODE(KEYCODE_Q) PORT_PLAYER(2)
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Player 2 Gear 2") PORT_CODE(KEYCODE_W) PORT_PLAYER(2)
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Player 2 Gear 3") PORT_CODE(KEYCODE_E) PORT_PLAYER(2)
PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Player 2 Gear 4") PORT_CODE(KEYCODE_R) PORT_PLAYER(2)
- PORT_START_TAG("LEVER3")
+ PORT_START("LEVER3")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Player 3 Gear 1") PORT_CODE(KEYCODE_Y) PORT_PLAYER(3)
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Player 3 Gear 2") PORT_CODE(KEYCODE_U) PORT_PLAYER(3)
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Player 3 Gear 3") PORT_CODE(KEYCODE_I) PORT_PLAYER(3)
PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Player 3 Gear 4") PORT_CODE(KEYCODE_O) PORT_PLAYER(3)
- PORT_START_TAG("LEVER4")
+ PORT_START("LEVER4")
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Player 4 Gear 1") PORT_PLAYER(3)
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Player 4 Gear 2") PORT_PLAYER(3)
PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Player 4 Gear 3") PORT_PLAYER(3)
PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Player 4 Gear 4") PORT_PLAYER(3)
- PORT_START_TAG("MOTOR1")
+ PORT_START("MOTOR1")
PORT_ADJUSTER( 35, "Motor 1 RPM" )
- PORT_START_TAG("MOTOR2")
+ PORT_START("MOTOR2")
PORT_ADJUSTER( 40, "Motor 2 RPM" )
- PORT_START_TAG("MOTOR3")
+ PORT_START("MOTOR3")
PORT_ADJUSTER( 35, "Motor 3 RPM" )
- PORT_START_TAG("MOTOR4")
+ PORT_START("MOTOR4")
PORT_ADJUSTER( 40, "Motor 4 RPM" )
INPUT_PORTS_END
diff --git a/src/mame/drivers/sprint8.c b/src/mame/drivers/sprint8.c
index e9ac9defb02..6dd4e25071a 100644
--- a/src/mame/drivers/sprint8.c
+++ b/src/mame/drivers/sprint8.c
@@ -147,7 +147,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( sprint8 )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P1 */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P1 */
@@ -157,7 +157,7 @@ static INPUT_PORTS_START( sprint8 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P2 */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P2 */
@@ -167,7 +167,7 @@ static INPUT_PORTS_START( sprint8 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P3 */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P3 */
@@ -177,7 +177,7 @@ static INPUT_PORTS_START( sprint8 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P4")
+ PORT_START("P4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P4 */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P4 */
@@ -187,7 +187,7 @@ static INPUT_PORTS_START( sprint8 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P5")
+ PORT_START("P5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN5 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P5 */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P5 */
@@ -197,7 +197,7 @@ static INPUT_PORTS_START( sprint8 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("P6")
+ PORT_START("P6")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN6 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P6 */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P6 */
@@ -207,7 +207,7 @@ static INPUT_PORTS_START( sprint8 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P7")
+ PORT_START("P7")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN7 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P7 */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P7 */
@@ -217,7 +217,7 @@ static INPUT_PORTS_START( sprint8 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P8")
+ PORT_START("P8")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN8 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P8 */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P8 */
@@ -227,31 +227,31 @@ static INPUT_PORTS_START( sprint8 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DIAL1")
+ PORT_START("DIAL1")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("DIAL2")
+ PORT_START("DIAL2")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("DIAL3")
+ PORT_START("DIAL3")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(3)
- PORT_START_TAG("DIAL4")
+ PORT_START("DIAL4")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(4)
- PORT_START_TAG("DIAL5")
+ PORT_START("DIAL5")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(5)
- PORT_START_TAG("DIAL6")
+ PORT_START("DIAL6")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(6)
- PORT_START_TAG("DIAL7")
+ PORT_START("DIAL7")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(7)
- PORT_START_TAG("DIAL8")
+ PORT_START("DIAL8")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(8)
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_DIPNAME( 0x0f, 0x08, "Play Time" )
PORT_DIPSETTING( 0x0f, "60 seconds" )
PORT_DIPSETTING( 0x0e, "69 seconds" )
@@ -271,10 +271,10 @@ static INPUT_PORTS_START( sprint8 )
PORT_DIPSETTING( 0x00, "189 seconds" )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Track Select") PORT_CODE(KEYCODE_SPACE)
- PORT_START_TAG("VBLANK")
+ PORT_START("VBLANK")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
INPUT_PORTS_END
@@ -282,7 +282,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( sprint8p )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P1 */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P1 */
@@ -292,7 +292,7 @@ static INPUT_PORTS_START( sprint8p )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P2 */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P2 */
@@ -302,7 +302,7 @@ static INPUT_PORTS_START( sprint8p )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P3 */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P3 */
@@ -312,7 +312,7 @@ static INPUT_PORTS_START( sprint8p )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P4")
+ PORT_START("P4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P4 */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P4 */
@@ -322,7 +322,7 @@ static INPUT_PORTS_START( sprint8p )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P5")
+ PORT_START("P5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN5 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P5 */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P5 */
@@ -332,7 +332,7 @@ static INPUT_PORTS_START( sprint8p )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("P6")
+ PORT_START("P6")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN6 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P6 */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P6 */
@@ -342,7 +342,7 @@ static INPUT_PORTS_START( sprint8p )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P7")
+ PORT_START("P7")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN7 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P7 */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P7 */
@@ -352,7 +352,7 @@ static INPUT_PORTS_START( sprint8p )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P8")
+ PORT_START("P8")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN8 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P8 */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P8 */
@@ -362,43 +362,43 @@ static INPUT_PORTS_START( sprint8p )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DIAL1")
+ PORT_START("DIAL1")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("DIAL2")
+ PORT_START("DIAL2")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("DIAL3")
+ PORT_START("DIAL3")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(3)
- PORT_START_TAG("DIAL4")
+ PORT_START("DIAL4")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(4)
- PORT_START_TAG("DIAL5")
+ PORT_START("DIAL5")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(5)
- PORT_START_TAG("DIAL6")
+ PORT_START("DIAL6")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(6)
- PORT_START_TAG("DIAL7")
+ PORT_START("DIAL7")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(7)
- PORT_START_TAG("DIAL8")
+ PORT_START("DIAL8")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(8)
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_DIPNAME( 0x03, 0x03, "Play Time" )
PORT_DIPSETTING( 0x00, "54 seconds" )
PORT_DIPSETTING( 0x01, "108 seconds" )
PORT_DIPSETTING( 0x03, "216 seconds" )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x01, "Play Mode" )
PORT_DIPSETTING( 0x00, "Chase" )
PORT_DIPSETTING( 0x01, "Tag" )
- PORT_START_TAG("VBLANK")
+ PORT_START("VBLANK")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
INPUT_PORTS_END
diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c
index 2d754051d55..bed4a2b7dba 100644
--- a/src/mame/drivers/spy.c
+++ b/src/mame/drivers/spy.c
@@ -398,7 +398,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( spy )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -408,7 +408,7 @@ static INPUT_PORTS_START( spy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 */
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -418,7 +418,7 @@ static INPUT_PORTS_START( spy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 */
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -454,7 +454,7 @@ static INPUT_PORTS_START( spy )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -477,7 +477,7 @@ static INPUT_PORTS_START( spy )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c
index 35315f906c6..f700e18070f 100644
--- a/src/mame/drivers/srmp2.c
+++ b/src/mame/drivers/srmp2.c
@@ -611,7 +611,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( seta_mjctrl )
- PORT_START_TAG("KEY0") /* KEY MATRIX INPUT (3) */
+ PORT_START("KEY0") /* KEY MATRIX INPUT (3) */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
@@ -622,7 +622,7 @@ static INPUT_PORTS_START( seta_mjctrl )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY1") /* KEY MATRIX INPUT (4) */
+ PORT_START("KEY1") /* KEY MATRIX INPUT (4) */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_K )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_G )
@@ -633,7 +633,7 @@ static INPUT_PORTS_START( seta_mjctrl )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY2") /* KEY MATRIX INPUT (5) */
+ PORT_START("KEY2") /* KEY MATRIX INPUT (5) */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_D )
@@ -644,7 +644,7 @@ static INPUT_PORTS_START( seta_mjctrl )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_MAHJONG_M )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3") /* KEY MATRIX INPUT (6) */
+ PORT_START("KEY3") /* KEY MATRIX INPUT (6) */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_J )
@@ -657,7 +657,7 @@ static INPUT_PORTS_START( seta_mjctrl )
INPUT_PORTS_END
static INPUT_PORTS_START( srmp2 )
- PORT_START_TAG("SYSTEM") /* Coinage (0) */
+ PORT_START("SYSTEM") /* Coinage (0) */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -668,7 +668,7 @@ static INPUT_PORTS_START( srmp2 )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -694,7 +694,7 @@ static INPUT_PORTS_START( srmp2 )
PORT_DIPSETTING( 0x20, "7" )
PORT_DIPSETTING( 0x00, "8 (Hard)" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Free_Play ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -719,7 +719,7 @@ static INPUT_PORTS_START( srmp2 )
PORT_INCLUDE( seta_mjctrl )
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE3 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -733,7 +733,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( srmp3 )
- PORT_START_TAG("SYSTEM") /* Coinage (0) */
+ PORT_START("SYSTEM") /* Coinage (0) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -743,7 +743,7 @@ static INPUT_PORTS_START( srmp3 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -769,7 +769,7 @@ static INPUT_PORTS_START( srmp3 )
PORT_DIPSETTING( 0x20, "7" )
PORT_DIPSETTING( 0x00, "8 (Hard)" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Free_Play ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -794,7 +794,7 @@ static INPUT_PORTS_START( srmp3 )
PORT_INCLUDE( seta_mjctrl )
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -807,7 +807,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mjyuugi )
- PORT_START_TAG("SYSTEM") /* Coinage (0) */
+ PORT_START("SYSTEM") /* Coinage (0) */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -818,7 +818,7 @@ static INPUT_PORTS_START( mjyuugi )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x03, "2" )
@@ -844,7 +844,7 @@ static INPUT_PORTS_START( mjyuugi )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -869,7 +869,7 @@ static INPUT_PORTS_START( mjyuugi )
PORT_INCLUDE( seta_mjctrl )
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE3 )
PORT_DIPNAME( 0x0004, 0x0004, "Debug Mode (Cheat)")
@@ -882,7 +882,7 @@ static INPUT_PORTS_START( mjyuugi )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW3-1") /* [Debug switch] */
+ PORT_START("DSW3-1") /* [Debug switch] */
PORT_DIPNAME( 0x0001, 0x0001, "Debug 0 (Cheat)")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -897,7 +897,7 @@ static INPUT_PORTS_START( mjyuugi )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_BIT( 0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW3-2") /* [Debug switch] */
+ PORT_START("DSW3-2") /* [Debug switch] */
PORT_DIPNAME( 0x0001, 0x0001, "Debug 4 (Cheat)")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -914,7 +914,7 @@ static INPUT_PORTS_START( mjyuugi )
INPUT_PORTS_END
static INPUT_PORTS_START( ponchin )
- PORT_START_TAG("SYSTEM") /* Coinage (0) */
+ PORT_START("SYSTEM") /* Coinage (0) */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -925,7 +925,7 @@ static INPUT_PORTS_START( ponchin )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x06, "1 (Easy)" )
PORT_DIPSETTING( 0x05, "2" )
@@ -950,7 +950,7 @@ static INPUT_PORTS_START( ponchin )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -975,7 +975,7 @@ static INPUT_PORTS_START( ponchin )
PORT_INCLUDE( seta_mjctrl )
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE3 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -986,7 +986,7 @@ static INPUT_PORTS_START( ponchin )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW3-1") /* [Debug switch] */
+ PORT_START("DSW3-1") /* [Debug switch] */
PORT_DIPNAME( 0x0001, 0x0001, "Debug 0 (Cheat)")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1001,7 +1001,7 @@ static INPUT_PORTS_START( ponchin )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_BIT( 0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW3-2") /* [Debug switch] */
+ PORT_START("DSW3-2") /* [Debug switch] */
PORT_DIPNAME( 0x0001, 0x0001, "Debug 4 (Cheat)")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c
index 3107f5e0811..fc69eb51e33 100644
--- a/src/mame/drivers/srmp5.c
+++ b/src/mame/drivers/srmp5.c
@@ -218,7 +218,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( srmp5 )
- PORT_START
+ PORT_START("IN0")
PORT_DIPNAME( 0x0001, 0x0001, "0-0" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -261,7 +261,7 @@ static INPUT_PORTS_START( srmp5 )
PORT_DIPNAME( 0x2000, 0x2000, "0-d" )
PORT_DIPSETTING( 0x2000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x4000, 0x4000, "0-e" )
+ PORT_DIPNAME( 0x4000, 0x4000, "0-e" )
PORT_DIPSETTING( 0x4000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_DIPNAME( 0x8000, 0x8000, "0-f" )
@@ -309,14 +309,14 @@ static INPUT_PORTS_START( srmp5 )
PORT_DIPNAME( 0x20000000, 0x20000000, "0-1d" )
PORT_DIPSETTING( 0x20000000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
- PORT_DIPNAME( 0x40000000, 0x40000000, "0-1e" )
+ PORT_DIPNAME( 0x40000000, 0x40000000, "0-1e" )
PORT_DIPSETTING( 0x40000000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
PORT_DIPNAME( 0x80000000, 0x80000000, "0-1f" )
PORT_DIPSETTING( 0x80000000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN1")
PORT_DIPNAME( 0x0001, 0x0001, "1-0" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -359,7 +359,7 @@ static INPUT_PORTS_START( srmp5 )
PORT_DIPNAME( 0x2000, 0x2000, "1-d" )
PORT_DIPSETTING( 0x2000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x4000, 0x4000, "1-e" )
+ PORT_DIPNAME( 0x4000, 0x4000, "1-e" )
PORT_DIPSETTING( 0x4000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_DIPNAME( 0x8000, 0x8000, "1-f" )
@@ -408,14 +408,14 @@ static INPUT_PORTS_START( srmp5 )
PORT_DIPNAME( 0x20000000, 0x20000000, "1-1d" )
PORT_DIPSETTING( 0x20000000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
- PORT_DIPNAME( 0x40000000, 0x40000000, "1-1e" )
+ PORT_DIPNAME( 0x40000000, 0x40000000, "1-1e" )
PORT_DIPSETTING( 0x40000000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
PORT_DIPNAME( 0x80000000, 0x80000000, "1-1f" )
PORT_DIPSETTING( 0x80000000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
-PORT_START
+ PORT_START("IN2")
PORT_DIPNAME( 0x0001, 0x0001, "2-0" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -455,14 +455,13 @@ PORT_START
PORT_DIPNAME( 0x2000, 0x2000, "2-d" )
PORT_DIPSETTING( 0x2000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x4000, 0x4000, "2-e" )
+ PORT_DIPNAME( 0x4000, 0x4000, "2-e" )
PORT_DIPSETTING( 0x4000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_DIPNAME( 0x8000, 0x8000, "2-f" )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
-
PORT_DIPNAME( 0x00010000, 0x00010000, "2-10" )
PORT_DIPSETTING( 0x00010000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -505,14 +504,14 @@ PORT_START
PORT_DIPNAME( 0x20000000, 0x20000000, "2-1d" )
PORT_DIPSETTING( 0x20000000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
- PORT_DIPNAME( 0x40000000, 0x40000000, "2-1e" )
+ PORT_DIPNAME( 0x40000000, 0x40000000, "2-1e" )
PORT_DIPSETTING( 0x40000000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
PORT_DIPNAME( 0x80000000, 0x80000000, "2-1f" )
PORT_DIPSETTING( 0x80000000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN3")
PORT_DIPNAME( 0x0001, 0x0001, "3-0" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -555,7 +554,7 @@ PORT_START
PORT_DIPNAME( 0x2000, 0x2000, "3-d" )
PORT_DIPSETTING( 0x2000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x4000, 0x4000, "3-e" )
+ PORT_DIPNAME( 0x4000, 0x4000, "3-e" )
PORT_DIPSETTING( 0x4000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_DIPNAME( 0x8000, 0x8000, "3-f" )
@@ -604,7 +603,7 @@ PORT_START
PORT_DIPNAME( 0x20000000, 0x20000000, "3-1d" )
PORT_DIPSETTING( 0x20000000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
- PORT_DIPNAME( 0x40000000, 0x40000000, "3-1e" )
+ PORT_DIPNAME( 0x40000000, 0x40000000, "3-1e" )
PORT_DIPSETTING( 0x40000000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
PORT_DIPNAME( 0x80000000, 0x80000000, "3-1f" )
diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c
index 161d39ed723..d0b6421ba09 100644
--- a/src/mame/drivers/srmp6.c
+++ b/src/mame/drivers/srmp6.c
@@ -578,7 +578,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( srmp6 )
- PORT_START_TAG("KEY0")
+ PORT_START("KEY0")
PORT_BIT( 0xfe01, IP_ACTIVE_LOW, IPT_UNUSED ) // explicitely discarded
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_E )
@@ -589,7 +589,7 @@ static INPUT_PORTS_START( srmp6 )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
PORT_SERVICE_NO_TOGGLE( 0x0100, IP_ACTIVE_LOW )
- PORT_START_TAG("KEY1")
+ PORT_START("KEY1")
PORT_BIT( 0xfe41, IP_ACTIVE_LOW, IPT_UNUSED ) // explicitely discarded
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_F )
@@ -598,7 +598,7 @@ static INPUT_PORTS_START( srmp6 )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
PORT_BIT( 0x0180, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY2")
+ PORT_START("KEY2")
PORT_BIT( 0xfe41, IP_ACTIVE_LOW, IPT_UNUSED ) // explicitely discarded
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_C )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_G )
@@ -607,7 +607,7 @@ static INPUT_PORTS_START( srmp6 )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
PORT_BIT( 0x0180, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("KEY3")
+ PORT_START("KEY3")
PORT_BIT( 0xfe61, IP_ACTIVE_LOW, IPT_UNUSED ) // explicitely discarded
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_D )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_H )
@@ -615,7 +615,7 @@ static INPUT_PORTS_START( srmp6 )
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
PORT_BIT( 0x0180, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW") /* 16-bit DSW1+DSW2 */
+ PORT_START("DSW") /* 16-bit DSW1+DSW2 */
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) ) // DSW1
PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) )
diff --git a/src/mame/drivers/srumbler.c b/src/mame/drivers/srumbler.c
index 35f921c6c60..11b667ac9b6 100644
--- a/src/mame/drivers/srumbler.c
+++ b/src/mame/drivers/srumbler.c
@@ -127,7 +127,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( srumbler )
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -137,7 +137,7 @@ static INPUT_PORTS_START( srumbler )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -147,7 +147,7 @@ static INPUT_PORTS_START( srumbler )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -157,7 +157,7 @@ static INPUT_PORTS_START( srumbler )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* DSW0 */
+ PORT_START("DSW1") /* DSW0 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
@@ -181,7 +181,7 @@ static INPUT_PORTS_START( srumbler )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW1 */
+ PORT_START("DSW2") /* DSW1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
diff --git a/src/mame/drivers/ssfindo.c b/src/mame/drivers/ssfindo.c
index 8e2b1e6cbab..2aede0bf958 100644
--- a/src/mame/drivers/ssfindo.c
+++ b/src/mame/drivers/ssfindo.c
@@ -528,10 +528,10 @@ static MACHINE_RESET( ssfindo )
}
static INPUT_PORTS_START( ssfindo )
- PORT_START_TAG("PS7500")
+ PORT_START("PS7500")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED ) // IPT_START2 ??
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -541,7 +541,7 @@ static INPUT_PORTS_START( ssfindo )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -549,7 +549,7 @@ static INPUT_PORTS_START( ssfindo )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, "Test Mode" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -578,13 +578,13 @@ INPUT_PORTS_END
static INPUT_PORTS_START( ppcar )
- PORT_START_TAG("PS7500")
+ PORT_START("PS7500")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c
index 6f405ab6539..ecae1a698b1 100644
--- a/src/mame/drivers/sshangha.c
+++ b/src/mame/drivers/sshangha.c
@@ -202,7 +202,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( sshangha )
- PORT_START_TAG("P1") /* Player 1 controls (0xfec047.b) */
+ PORT_START("P1") /* Player 1 controls (0xfec047.b) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -212,7 +212,7 @@ static INPUT_PORTS_START( sshangha )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_NAME("P1 Help")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 controls (0xfec046.b) */
+ PORT_START("P2") /* Player 2 controls (0xfec046.b) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -222,7 +222,7 @@ static INPUT_PORTS_START( sshangha )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("P2 Help")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("SYSTEM") /* Credits */
+ PORT_START("SYSTEM") /* Credits */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -234,7 +234,7 @@ static INPUT_PORTS_START( sshangha )
/* Dips seem inverted with respect to other Deco games */
- PORT_START_TAG("DSW1") /* Dip switch bank 1 (0xfec04a.b, inverted bits order) */
+ PORT_START("DSW1") /* Dip switch bank 1 (0xfec04a.b, inverted bits order) */
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Demo_Sounds ) ) // To be confirmed
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
@@ -264,7 +264,7 @@ static INPUT_PORTS_START( sshangha )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )PORT_CONDITION("DSW1",0x10,PORTCOND_NOTEQUALS,0x10)//Mode 2
PORT_DIPSETTING( 0x01, DEF_STR( 1C_4C ) )PORT_CONDITION("DSW1",0x10,PORTCOND_NOTEQUALS,0x10)//Mode 2
- PORT_START_TAG("DSW2") /* Dip switch bank 2 (0xfec04b.b, inverted bits order) */
+ PORT_START("DSW2") /* Dip switch bank 2 (0xfec04b.b, inverted bits order) */
PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x40, DEF_STR( Easy ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Normal ) )
diff --git a/src/mame/drivers/ssingles.c b/src/mame/drivers/ssingles.c
index d568eabd78a..fb4ca1320e1 100644
--- a/src/mame/drivers/ssingles.c
+++ b/src/mame/drivers/ssingles.c
@@ -187,14 +187,14 @@ static ADDRESS_MAP_START( ssingles_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( ssingles )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) //must be LOW
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON4 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON3 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
@@ -203,7 +203,7 @@ static INPUT_PORTS_START( ssingles )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) )
@@ -228,7 +228,7 @@ static INPUT_PORTS_START( ssingles )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Unk 6" )
PORT_DIPSETTING( 0x01, "Pos 1" )
PORT_DIPSETTING( 0x03, "Pos 2" )
diff --git a/src/mame/drivers/sslam.c b/src/mame/drivers/sslam.c
index aa660d02b1a..405cf34f949 100644
--- a/src/mame/drivers/sslam.c
+++ b/src/mame/drivers/sslam.c
@@ -501,7 +501,7 @@ ADDRESS_MAP_END
/* Input Ports */
static INPUT_PORTS_START( sslam )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -511,7 +511,7 @@ static INPUT_PORTS_START( sslam )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN4 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -521,7 +521,7 @@ static INPUT_PORTS_START( sslam )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -531,7 +531,7 @@ static INPUT_PORTS_START( sslam )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
@@ -541,7 +541,7 @@ static INPUT_PORTS_START( sslam )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(4)
@@ -551,7 +551,7 @@ static INPUT_PORTS_START( sslam )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x07, "Coin(s) per Player" ) PORT_DIPLOCATION("SW2:1,2,3")
PORT_DIPSETTING( 0x07, "1" )
PORT_DIPSETTING( 0x06, "2" )
@@ -577,7 +577,7 @@ static INPUT_PORTS_START( sslam )
PORT_DIPSETTING( 0x80, "Common" )
PORT_DIPSETTING( 0x00, "Individual" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:1,2") // 0x000522 = 0x00400e
PORT_DIPSETTING( 0x03, "0" )
PORT_DIPSETTING( 0x02, "1" )
@@ -603,7 +603,7 @@ static INPUT_PORTS_START( sslam )
INPUT_PORTS_END
static INPUT_PORTS_START( powerbls )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -613,7 +613,7 @@ static INPUT_PORTS_START( powerbls )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -623,7 +623,7 @@ static INPUT_PORTS_START( powerbls )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -633,7 +633,7 @@ static INPUT_PORTS_START( powerbls )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
PORT_DIPSETTING( 0x02, DEF_STR( Hard ) )
@@ -657,7 +657,7 @@ static INPUT_PORTS_START( powerbls )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3")
PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_4C ) )
diff --git a/src/mame/drivers/ssozumo.c b/src/mame/drivers/ssozumo.c
index c0751091380..3823874ca8c 100644
--- a/src/mame/drivers/ssozumo.c
+++ b/src/mame/drivers/ssozumo.c
@@ -112,7 +112,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( ssozumo )
- PORT_START_TAG("P1") /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -122,7 +122,7 @@ static INPUT_PORTS_START( ssozumo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("P2") /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -132,7 +132,7 @@ static INPUT_PORTS_START( ssozumo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("DSW2") /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x01, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hard ) )
@@ -158,7 +158,7 @@ static INPUT_PORTS_START( ssozumo )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
diff --git a/src/mame/drivers/sspeedr.c b/src/mame/drivers/sspeedr.c
index fedcefbf0da..a949f340997 100644
--- a/src/mame/drivers/sspeedr.c
+++ b/src/mame/drivers/sspeedr.c
@@ -154,15 +154,15 @@ static const UINT32 sspeedr_controller_table[] =
static INPUT_PORTS_START( sspeedr )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x3f, 0x00, IPT_POSITIONAL ) PORT_POSITIONS(64) PORT_REMAP_TABLE(sspeedr_controller_table) PORT_WRAPS PORT_SENSITIVITY(25) PORT_KEYDELTA(10)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
/* The gas pedal is adjusted physically so the encoder is at position 2 when the pedal is not pressed. */
/* It also only uses half of the encoder. */
PORT_BIT( 0x1f, 0x00, IPT_POSITIONAL ) PORT_POSITIONS(30) PORT_REMAP_TABLE(sspeedr_controller_table + 2) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -181,7 +181,7 @@ static INPUT_PORTS_START( sspeedr )
PORT_DIPSETTING( 0xA0, "RAM/ROM Test" )
PORT_DIPSETTING( 0xE0, "Accelerator Adjustment" )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_TOGGLE /* gear shift lever */
diff --git a/src/mame/drivers/ssrj.c b/src/mame/drivers/ssrj.c
index c1f39e9f73b..7aa06c88715 100644
--- a/src/mame/drivers/ssrj.c
+++ b/src/mame/drivers/ssrj.c
@@ -92,16 +92,16 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( ssrj )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0xe0, 0x00, IPT_PEDAL ) PORT_MINMAX(0,0xe0) PORT_SENSITIVITY(50) PORT_KEYDELTA(0x20)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(4) PORT_REVERSE
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xf, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* code @ $eef , tested when controls = type4 */
PORT_DIPNAME( 0x30, 0x00, DEF_STR( Difficulty ) ) /* ??? code @ $62c */
PORT_DIPSETTING( 0x10, DEF_STR( Easy ) )
@@ -115,7 +115,7 @@ static INPUT_PORTS_START( ssrj )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x06, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/sstrangr.c b/src/mame/drivers/sstrangr.c
index 72fb97b0104..fcca7f7bd22 100644
--- a/src/mame/drivers/sstrangr.c
+++ b/src/mame/drivers/sstrangr.c
@@ -143,7 +143,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( sstrangr )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x01, "Extra Play" )
PORT_DIPSETTING( 0x00, "Never" )
PORT_DIPSETTING( 0x01, "3000" )
@@ -160,7 +160,7 @@ static INPUT_PORTS_START( sstrangr )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -172,7 +172,7 @@ static INPUT_PORTS_START( sstrangr )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
- PORT_START_TAG("EXT") /* External switches */
+ PORT_START("EXT") /* External switches */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -210,7 +210,7 @@ MACHINE_DRIVER_END
/* color version of Space Stranger, board has Stranger 2 written on it */
static INPUT_PORTS_START( sstrngr2 )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x01, "Extra Play" )
PORT_DIPSETTING( 0x00, "Never" )
PORT_DIPSETTING( 0x01, "3000" )
@@ -229,7 +229,7 @@ static INPUT_PORTS_START( sstrngr2 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -241,7 +241,7 @@ static INPUT_PORTS_START( sstrngr2 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1)
- PORT_START_TAG("EXT") /* External switches */
+ PORT_START("EXT") /* External switches */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_DIPNAME( 0x02, 0x00, "Player's Bullet Speed (Cheat)" )
PORT_DIPSETTING( 0x00, "Slow" )
diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c
index 10e8bdf36d5..b131fab8c5e 100644
--- a/src/mame/drivers/ssv.c
+++ b/src/mame/drivers/ssv.c
@@ -1188,13 +1188,13 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( ssv_joystick )
- PORT_START_TAG("DSW1") // IN0 - $210002
+ PORT_START("DSW1") // IN0 - $210002
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Modified below */
- PORT_START_TAG("DSW2") // IN1 - $210004
+ PORT_START("DSW2") // IN1 - $210004
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Modified below */
- PORT_START_TAG("P1") // IN2 - $210008
+ PORT_START("P1") // IN2 - $210008
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -1204,7 +1204,7 @@ static INPUT_PORTS_START( ssv_joystick )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_START_TAG("P2") // IN3 - $21000a
+ PORT_START("P2") // IN3 - $21000a
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
@@ -1214,7 +1214,7 @@ static INPUT_PORTS_START( ssv_joystick )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
- PORT_START_TAG("SYSTEM") // IN4 - $21000c
+ PORT_START("SYSTEM") // IN4 - $21000c
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(10)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(10)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1231,7 +1231,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( ssv_mahjong )
PORT_INCLUDE(ssv_joystick)
- PORT_START_TAG("KEY0") // IN5 - $800002(0)
+ PORT_START("KEY0") // IN5 - $800002(0)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
@@ -1241,7 +1241,7 @@ static INPUT_PORTS_START( ssv_mahjong )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY1") // IN6 - $800002(1)
+ PORT_START("KEY1") // IN6 - $800002(1)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
@@ -1251,7 +1251,7 @@ static INPUT_PORTS_START( ssv_mahjong )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY2") // IN7 - $800002(2)
+ PORT_START("KEY2") // IN7 - $800002(2)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_N )
@@ -1261,7 +1261,7 @@ static INPUT_PORTS_START( ssv_mahjong )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3") // IN8 - $800002(3)
+ PORT_START("KEY3") // IN8 - $800002(3)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_M )
@@ -1278,7 +1278,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( ssv_quiz )
- PORT_START_TAG("DSW1") // IN0 - $210002
+ PORT_START("DSW1") // IN0 - $210002
PORT_DIPUNUSED_DIPLOC( 0x0001, 0x0001, "DSW1:1" ) /* Manual states this dip is "Unused" */
PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION( "DSW1:2" )
PORT_DIPSETTING( 0x0002, DEF_STR( Off ) )
@@ -1290,7 +1290,7 @@ static INPUT_PORTS_START( ssv_quiz )
SSV_COINAGE_BASIC( 4, 0x03, DEF_STR( Coin_A ), "DSW1:5,6" )
PORT_BIT( 0x00c0, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Modified below */
- PORT_START_TAG("DSW2") // IN1 - $210004
+ PORT_START("DSW2") // IN1 - $210004
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) PORT_DIPLOCATION( "DSW2:1,2" )
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) ) /* 15 sec */
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) ) /* 12 sec */
@@ -1298,7 +1298,7 @@ static INPUT_PORTS_START( ssv_quiz )
PORT_DIPSETTING( 0x0000, DEF_STR( Hardest ) ) /* 8 sec */
PORT_BIT( 0x00fc, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Modified below */
- PORT_START_TAG("P1") // IN2 - $210008
+ PORT_START("P1") // IN2 - $210008
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1308,7 +1308,7 @@ static INPUT_PORTS_START( ssv_quiz )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_START_TAG("P2") // IN3 - $21000a
+ PORT_START("P2") // IN3 - $21000a
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1318,7 +1318,7 @@ static INPUT_PORTS_START( ssv_quiz )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START_TAG("SYSTEM") // IN4 - $21000c
+ PORT_START("SYSTEM") // IN4 - $21000c
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(10)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(10)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1488,10 +1488,10 @@ static INPUT_PORTS_START( eaglshot )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "DSW2:8" )
- PORT_START_TAG("TRACKX") // IN5 - trackball x ($d00000)
+ PORT_START("TRACKX") // IN5 - trackball x ($d00000)
PORT_BIT( 0x0fff, 0x0000, IPT_TRACKBALL_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_RESET PORT_PLAYER(1)
- PORT_START_TAG("TRACKY") // IN6 - trackball y ($d00000)
+ PORT_START("TRACKY") // IN6 - trackball y ($d00000)
PORT_BIT( 0x0fff, 0x0000, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_RESET PORT_PLAYER(1)
INPUT_PORTS_END
@@ -1554,16 +1554,16 @@ static INPUT_PORTS_START( gdfs )
PORT_DIPSETTING( 0x0080, "Light" )
PORT_DIPSETTING( 0x0000, "Heavy" )
- PORT_START_TAG("GUNX1") // IN5 - $540000(0)
+ PORT_START("GUNX1") // IN5 - $540000(0)
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_SENSITIVITY(35) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("GUNY1") // IN6 - $540000(1)
+ PORT_START("GUNY1") // IN6 - $540000(1)
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_SENSITIVITY(35) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("GUNX2") // IN7 - $540000(2)
+ PORT_START("GUNX2") // IN7 - $540000(2)
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_SENSITIVITY(35) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("GUNY2") // IN8 - $540000(3)
+ PORT_START("GUNY2") // IN8 - $540000(3)
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_SENSITIVITY(35) PORT_KEYDELTA(10) PORT_PLAYER(2)
INPUT_PORTS_END
@@ -1573,7 +1573,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( hypreact )
- PORT_START_TAG("DSW1") // IN0 - $210002
+ PORT_START("DSW1") // IN0 - $210002
SSV_COINAGE_STANDARD( 0, 0x07, DEF_STR( Coin_A ), "DSWA:1,2,3" )
SSV_COINAGE_STANDARD( 3, 0x07, DEF_STR( Coin_B ), "DSWA:4,5,6" )
PORT_DIPNAME( 0x0040, 0x0040, "Half Coins To Continue" ) PORT_DIPLOCATION( "DSWA:7" )
@@ -1583,7 +1583,7 @@ static INPUT_PORTS_START( hypreact )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("DSW2") // IN1 - $210004
+ PORT_START("DSW2") // IN1 - $210004
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION( "DSWB:1" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1606,7 +1606,7 @@ static INPUT_PORTS_START( hypreact )
PORT_DIPSETTING( 0x0040, DEF_STR( Yes ) )
PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "DSWB:8" )
- PORT_START_TAG("P1") // IN2 - $210008 (used in joystick mode)
+ PORT_START("P1") // IN2 - $210008 (used in joystick mode)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) PORT_NAME("P1 Mahjong Chi (Joy Mode)")
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) PORT_NAME("P1 Mahjong Pon (Joy Mode)")
@@ -1616,7 +1616,7 @@ static INPUT_PORTS_START( hypreact )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
- PORT_START_TAG("P2") // IN3 - $21000a (used in joystick mode)
+ PORT_START("P2") // IN3 - $21000a (used in joystick mode)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_NAME("P1 Mahjong Reach (Joy Mode)")
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_NAME("P1 Mahjong Ron (Joy Mode)")
@@ -1626,14 +1626,14 @@ static INPUT_PORTS_START( hypreact )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM") // IN4 - $21000c
+ PORT_START("SYSTEM") // IN4 - $21000c
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(10)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(10)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) // service coin & bet
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x00f0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY0") // IN5 - $c00000(0)
+ PORT_START("KEY0") // IN5 - $c00000(0)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_I )
@@ -1642,7 +1642,7 @@ static INPUT_PORTS_START( hypreact )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY1") // IN6 - $c00000(1)
+ PORT_START("KEY1") // IN6 - $c00000(1)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_J )
@@ -1651,7 +1651,7 @@ static INPUT_PORTS_START( hypreact )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY2") // IN7 - $c00000(2)
+ PORT_START("KEY2") // IN7 - $c00000(2)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_C )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_K )
@@ -1659,7 +1659,7 @@ static INPUT_PORTS_START( hypreact )
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
PORT_BIT( 0xffe0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3") // IN8 - $c00000(3)
+ PORT_START("KEY3") // IN8 - $c00000(3)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_D )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_L )
@@ -1708,7 +1708,7 @@ static INPUT_PORTS_START( hypreac2 )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "DSWB:8" )
- PORT_START_TAG("KEY0") // IN5 - $500000(0)
+ PORT_START("KEY0") // IN5 - $500000(0)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_I )
@@ -1717,7 +1717,7 @@ static INPUT_PORTS_START( hypreac2 )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY1") // IN6 - $500000(1)
+ PORT_START("KEY1") // IN6 - $500000(1)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_J )
@@ -1725,7 +1725,7 @@ static INPUT_PORTS_START( hypreac2 )
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
PORT_BIT( 0xffe0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY2") // IN7 - $500000(2)
+ PORT_START("KEY2") // IN7 - $500000(2)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_C )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_K )
@@ -1733,7 +1733,7 @@ static INPUT_PORTS_START( hypreac2 )
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
PORT_BIT( 0xffe0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3") // IN8 - $500000(3)
+ PORT_START("KEY3") // IN8 - $500000(3)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_D )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_L )
@@ -1967,7 +1967,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( meosism )
- PORT_START_TAG("DSW1") // IN0 - $210002
+ PORT_START("DSW1") // IN0 - $210002
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Coinage ) ) PORT_DIPLOCATION( "DSW1:1,2" )
PORT_DIPSETTING( 0x0003, "1 Medal/1 Credit" )
PORT_DIPSETTING( 0x0001, "1 Medal/5 Credits" )
@@ -1992,7 +1992,7 @@ static INPUT_PORTS_START( meosism )
PORT_DIPSETTING( 0x0080, DEF_STR( Low ) )
PORT_DIPSETTING( 0x0000, DEF_STR( High ) )
- PORT_START_TAG("DSW2") // IN1 - $210004
+ PORT_START("DSW2") // IN1 - $210004
PORT_DIPNAME( 0x0003, 0x0003, "Game Rate" ) PORT_DIPLOCATION( "DSW2:1,2" )
PORT_DIPSETTING( 0x0000, "80%" )
PORT_DIPSETTING( 0x0002, "85%" )
@@ -2011,7 +2011,7 @@ static INPUT_PORTS_START( meosism )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("P1") // IN2 - $210008
+ PORT_START("P1") // IN2 - $210008
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON4 ) //bet
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) //stop/r
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) //stop/c
@@ -2021,7 +2021,7 @@ static INPUT_PORTS_START( meosism )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_START1 ) //start
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) //-
- PORT_START_TAG("P2") // IN3 - $21000a
+ PORT_START("P2") // IN3 - $21000a
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) //-
PORT_SERVICE_NO_TOGGLE( 0x0002, IP_ACTIVE_LOW )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) //-
@@ -2031,7 +2031,7 @@ static INPUT_PORTS_START( meosism )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) //-
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) //-
- PORT_START_TAG("SYSTEM") // IN4 - $21000c
+ PORT_START("SYSTEM") // IN4 - $21000c
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(10)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(10)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) //service coin
@@ -2157,7 +2157,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( srmp7 )
- PORT_START_TAG("DSW1") // IN0 - $210002
+ PORT_START("DSW1") // IN0 - $210002
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) ) PORT_DIPLOCATION( "DSW1:1,2,3" )
PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) )
@@ -2177,7 +2177,7 @@ static INPUT_PORTS_START( srmp7 )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0080, DEF_STR( On ) )
- PORT_START_TAG("DSW2") // IN1 - $210004
+ PORT_START("DSW2") // IN1 - $210004
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Difficulty ) ) PORT_DIPLOCATION( "DSW2:1,2,3" )
PORT_DIPSETTING( 0x0006, DEF_STR( Easiest ) )
PORT_DIPSETTING( 0x0005, DEF_STR( Easier ) )
@@ -2201,13 +2201,13 @@ static INPUT_PORTS_START( srmp7 )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "DSW2:8" )
- PORT_START_TAG("P1") // IN2 - $210008
+ PORT_START("P1") // IN2 - $210008
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2") // IN3 - $21000a
+ PORT_START("P2") // IN3 - $21000a
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM") // IN4 - $21000c
+ PORT_START("SYSTEM") // IN4 - $21000c
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(10)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(10)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2215,7 +2215,7 @@ static INPUT_PORTS_START( srmp7 )
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) // tested
PORT_BIT( 0x00e0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY0") // IN6 - $600000(0)
+ PORT_START("KEY0") // IN6 - $600000(0)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
@@ -2225,7 +2225,7 @@ static INPUT_PORTS_START( srmp7 )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY1") // IN7 - $600000(1)
+ PORT_START("KEY1") // IN7 - $600000(1)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_N )
@@ -2235,7 +2235,7 @@ static INPUT_PORTS_START( srmp7 )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY2") // IN8 - $600000(2)
+ PORT_START("KEY2") // IN8 - $600000(2)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_M )
@@ -2245,7 +2245,7 @@ static INPUT_PORTS_START( srmp7 )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3") // IN5 - $600000(3)
+ PORT_START("KEY3") // IN5 - $600000(3)
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
@@ -2333,7 +2333,7 @@ static INPUT_PORTS_START( survarts )
PORT_DIPSETTING( 0x0080, "Heavy" )
PORT_DIPSETTING( 0x0000, "Heaviest" )
- PORT_START_TAG("ADD_BUTTONS") // IN5 - $500008
+ PORT_START("ADD_BUTTONS") // IN5 - $500008
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1)
@@ -2386,10 +2386,10 @@ static INPUT_PORTS_START( sxyreact )
PORT_SERVICE_DIPLOC( 0x0040, IP_ACTIVE_LOW, "DSW2:7" )
PORT_DIPUNUSED_DIPLOC( 0x0080, 0x0080, "DSW2:8" )
- PORT_START_TAG("SERVICE") // IN5 - $500002
+ PORT_START("SERVICE") // IN5 - $500002
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SERVICE2 ) // ball switch on -> handle motor off
- PORT_START_TAG("PADDLE") // IN6 - $500004
+ PORT_START("PADDLE") // IN6 - $500004
PORT_BIT( 0xff, 0x00, IPT_PADDLE ) PORT_MINMAX(0,0xcf) PORT_SENSITIVITY(15) PORT_KEYDELTA(15) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M)
INPUT_PORTS_END
diff --git a/src/mame/drivers/st0016.c b/src/mame/drivers/st0016.c
index 101b12f3dbd..251f8ed6901 100644
--- a/src/mame/drivers/st0016.c
+++ b/src/mame/drivers/st0016.c
@@ -160,7 +160,7 @@ ADDRESS_MAP_END
*
*************************************/
static INPUT_PORTS_START( st0016 )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -170,7 +170,7 @@ static INPUT_PORTS_START( st0016 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -180,16 +180,16 @@ static INPUT_PORTS_START( st0016 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x08, IP_ACTIVE_LOW)
- PORT_START_TAG("UNK")
+ PORT_START("UNK")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused ? */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -215,7 +215,7 @@ static INPUT_PORTS_START( st0016 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/stactics.c b/src/mame/drivers/stactics.c
index 99a7f840eda..355b1304c04 100644
--- a/src/mame/drivers/stactics.c
+++ b/src/mame/drivers/stactics.c
@@ -209,7 +209,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( stactics )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON7 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON6 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON5 )
@@ -219,7 +219,7 @@ static INPUT_PORTS_START( stactics )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(get_motor_not_ready, 0)
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 2C_1C ) )
@@ -245,7 +245,7 @@ static INPUT_PORTS_START( stactics )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x07, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(get_rng, 0)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(stactics_get_frame_count_d3, 0)
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -255,7 +255,7 @@ static INPUT_PORTS_START( stactics )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN3") /* IN3 */
+ PORT_START("IN3") /* IN3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(stactics_get_shot_standby, 0)
PORT_DIPNAME( 0x04, 0x04, "Number of Barriers" )
@@ -271,7 +271,7 @@ static INPUT_PORTS_START( stactics )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(stactics_get_not_shot_arrive, 0)
- PORT_START_TAG("FAKE") /* FAKE */
+ PORT_START("FAKE") /* FAKE */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
INPUT_PORTS_END
diff --git a/src/mame/drivers/stadhero.c b/src/mame/drivers/stadhero.c
index e2dbbe12750..3273ec85491 100644
--- a/src/mame/drivers/stadhero.c
+++ b/src/mame/drivers/stadhero.c
@@ -113,7 +113,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( stadhero )
- PORT_START_TAG("P1") /* 0x30c001 : Player 1 controls */
+ PORT_START("P1") /* 0x30c001 : Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -123,7 +123,7 @@ static INPUT_PORTS_START( stadhero )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* 0x30c000 : Player 2 controls */
+ PORT_START("P2") /* 0x30c000 : Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -133,7 +133,7 @@ static INPUT_PORTS_START( stadhero )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("COIN") /* 0x30c002 & 0x30c003 : Credits, start buttons */
+ PORT_START("COIN") /* 0x30c002 & 0x30c003 : Credits, start buttons */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* related to music/sound */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* related to music/sound */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* related to music/sound */
@@ -143,7 +143,7 @@ static INPUT_PORTS_START( stadhero )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW1") /* 0x30c005 : Dip switch bank 1 */
+ PORT_START("DSW1") /* 0x30c005 : Dip switch bank 1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -163,7 +163,7 @@ static INPUT_PORTS_START( stadhero )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW2") /* 0x30c004 : Dip switch bank 2 */
+ PORT_START("DSW2") /* 0x30c004 : Dip switch bank 2 */
PORT_DIPNAME( 0x03, 0x03, "Time (1P Vs CPU)" ) /* Table at 0x0014f6 */
PORT_DIPSETTING( 0x02, "600" )
PORT_DIPSETTING( 0x03, "500" )
diff --git a/src/mame/drivers/starcrus.c b/src/mame/drivers/starcrus.c
index 50611e0a392..00eaa784152 100644
--- a/src/mame/drivers/starcrus.c
+++ b/src/mame/drivers/starcrus.c
@@ -69,42 +69,42 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( starcrus )
- PORT_START /* player 1 */
- PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY /* ccw */
- PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* engine */
- PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY /* cw */
- PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_BUTTON3 ) /* torpedo */
- PORT_BIT (0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) /* phaser */
- PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START /* player 2 */
- PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2) /* ccw */
- PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) /* engine */
- PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2) /* cw */
- PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) /* torpedo */
- PORT_BIT (0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) /* phaser */
- PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START
- PORT_DIPNAME ( 0x03, 0x02, DEF_STR( Game_Time ) )
- PORT_DIPSETTING ( 0x03, "60 secs" )
- PORT_DIPSETTING ( 0x02, "90 secs" )
- PORT_DIPSETTING ( 0x01, "120 secs" )
- PORT_DIPSETTING ( 0x00, "150 secs" )
- PORT_DIPNAME ( 0x04, 0x00, DEF_STR( Coinage ))
- PORT_DIPSETTING ( 0x04, DEF_STR( 2C_1C ))
- PORT_DIPSETTING ( 0x00, DEF_STR( 1C_1C ))
- PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_DIPNAME ( 0x20, 0x20, "Mode" )
- PORT_DIPSETTING ( 0x20, DEF_STR( Standard ) )
- PORT_DIPSETTING ( 0x00, DEF_STR( Alternate ) )
- PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_START("P1") /* player 1 */
+ PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY /* ccw */
+ PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* engine */
+ PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY /* cw */
+ PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_BUTTON3 ) /* torpedo */
+ PORT_BIT (0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) /* phaser */
+ PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START("P2") /* player 2 */
+ PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2) /* ccw */
+ PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) /* engine */
+ PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2) /* cw */
+ PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) /* torpedo */
+ PORT_BIT (0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) /* phaser */
+ PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START("DSW")
+ PORT_DIPNAME ( 0x03, 0x02, DEF_STR( Game_Time ) )
+ PORT_DIPSETTING ( 0x03, "60 secs" )
+ PORT_DIPSETTING ( 0x02, "90 secs" )
+ PORT_DIPSETTING ( 0x01, "120 secs" )
+ PORT_DIPSETTING ( 0x00, "150 secs" )
+ PORT_DIPNAME ( 0x04, 0x00, DEF_STR( Coinage ))
+ PORT_DIPSETTING ( 0x04, DEF_STR( 2C_1C ))
+ PORT_DIPSETTING ( 0x00, DEF_STR( 1C_1C ))
+ PORT_BIT (0x08, IP_ACTIVE_LOW, IPT_COIN2 )
+ PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_COIN1 )
+ PORT_DIPNAME ( 0x20, 0x20, "Mode" )
+ PORT_DIPSETTING ( 0x20, DEF_STR( Standard ) )
+ PORT_DIPSETTING ( 0x00, DEF_STR( Alternate ) )
+ PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT (0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
diff --git a/src/mame/drivers/starfire.c b/src/mame/drivers/starfire.c
index 19be21a9252..3a7c62aa34a 100644
--- a/src/mame/drivers/starfire.c
+++ b/src/mame/drivers/starfire.c
@@ -166,7 +166,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( starfire )
- PORT_START_TAG("DSW") /* DSW0 */
+ PORT_START("DSW") /* DSW0 */
PORT_DIPNAME( 0x03, 0x00, "Time" )
PORT_DIPSETTING( 0x00, "90 Sec" )
PORT_DIPSETTING( 0x01, "80 Sec" )
@@ -188,7 +188,7 @@ static INPUT_PORTS_START( starfire )
PORT_DIPSETTING( 0x40, "fixed length+fire" )
PORT_SERVICE( 0x80, IP_ACTIVE_HIGH )
- PORT_START_TAG("SYSTEM") /* IN1 */
+ PORT_START("SYSTEM") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 )
@@ -198,19 +198,19 @@ static INPUT_PORTS_START( starfire )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("STICKX") /* IN2 */
+ PORT_START("STICKX") /* IN2 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START_TAG("STICKY") /* IN3 */
+ PORT_START("STICKY") /* IN3 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE
- PORT_START_TAG("STICKZ") /* IN4 */ /* throttle */
+ PORT_START("STICKZ") /* IN4 */ /* throttle */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Z ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_REVERSE
INPUT_PORTS_END
static INPUT_PORTS_START( fireone )
- PORT_START_TAG("DSW") /* DSW0 */
+ PORT_START("DSW") /* DSW0 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, "2 Coins/1 Player" )
PORT_DIPSETTING( 0x02, "2 Coins/1 or 2 Players" )
@@ -231,7 +231,7 @@ static INPUT_PORTS_START( fireone )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_HIGH )
- PORT_START_TAG("SYSTEM") /* IN1 */
+ PORT_START("SYSTEM") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
@@ -241,12 +241,12 @@ static INPUT_PORTS_START( fireone )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("P1") /* IN2 */
+ PORT_START("P1") /* IN2 */
PORT_BIT( 0x3f, 0x20, IPT_PADDLE ) PORT_MINMAX(0,63) PORT_SENSITIVITY(50) PORT_KEYDELTA(1) PORT_PLAYER(1)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_START_TAG("P2") /* IN3 */
+ PORT_START("P2") /* IN3 */
PORT_BIT( 0x3f, 0x20, IPT_PADDLE ) PORT_MINMAX(0,63) PORT_SENSITIVITY(50) PORT_KEYDELTA(1) PORT_PLAYER(2)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
diff --git a/src/mame/drivers/starshp1.c b/src/mame/drivers/starshp1.c
index 918a53d63ed..87d5d56454b 100644
--- a/src/mame/drivers/starshp1.c
+++ b/src/mame/drivers/starshp1.c
@@ -190,7 +190,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( starshp1 )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* SWA1? */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -202,12 +202,12 @@ static INPUT_PORTS_START( starshp1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_TOGGLE
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("VBLANK")
+ PORT_START("VBLANK")
PORT_BIT( 0x3f, IP_ACTIVE_HIGH, IPT_UNUSED ) /* analog in */
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("COINAGE")
+ PORT_START("COINAGE")
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_UNUSED ) /* collision latch */
PORT_DIPNAME( 0x70, 0x20, DEF_STR( Coinage ))
PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ))
@@ -215,16 +215,16 @@ static INPUT_PORTS_START( starshp1 )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_2C ))
PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) /* ground */
- PORT_START_TAG("PLAYTIME")
+ PORT_START("PLAYTIME")
PORT_DIPNAME( 0x3f, 0x20, "Play Time" ) /* potentiometer */
PORT_DIPSETTING( 0x00, "60 Seconds" )
PORT_DIPSETTING( 0x20, "90 Seconds" )
PORT_DIPSETTING( 0x3f, "120 Seconds" )
- PORT_START_TAG("STICKY")
+ PORT_START("STICKY")
PORT_BIT( 0x3f, 0x20, IPT_AD_STICK_Y ) PORT_MINMAX(0,63) PORT_SENSITIVITY(10) PORT_KEYDELTA(10) PORT_REVERSE
- PORT_START_TAG("STICKX")
+ PORT_START("STICKX")
PORT_BIT( 0x3f, 0x20, IPT_AD_STICK_X ) PORT_MINMAX(0,63) PORT_SENSITIVITY(10) PORT_KEYDELTA(10) PORT_REVERSE
INPUT_PORTS_END
diff --git a/src/mame/drivers/starwars.c b/src/mame/drivers/starwars.c
index b9ef0982aca..bfda9c074a5 100644
--- a/src/mame/drivers/starwars.c
+++ b/src/mame/drivers/starwars.c
@@ -212,7 +212,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( starwars )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -222,7 +222,7 @@ static INPUT_PORTS_START( starwars )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_BUTTON4 )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT ( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Diagnostic Step") PORT_CODE(KEYCODE_F1)
@@ -234,7 +234,7 @@ static INPUT_PORTS_START( starwars )
/* Bit 7 is VG_HALT - see machine/starwars.c */
PORT_BIT ( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME(0x03, 0x00, "Starting Shields" )
PORT_DIPSETTING ( 0x00, "6" )
PORT_DIPSETTING ( 0x01, "7" )
@@ -257,7 +257,7 @@ static INPUT_PORTS_START( starwars )
PORT_DIPSETTING ( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING ( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME(0x03, 0x02, DEF_STR( Coinage ) )
PORT_DIPSETTING ( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING ( 0x02, DEF_STR( 1C_1C ) )
@@ -280,16 +280,16 @@ static INPUT_PORTS_START( starwars )
PORT_DIPSETTING ( 0x00, DEF_STR( None ) )
/* 0xc0 and 0xe0 None */
- PORT_START_TAG("STICKY") /* IN4 */
+ PORT_START("STICKY") /* IN4 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(70) PORT_KEYDELTA(30)
- PORT_START_TAG("STICKX") /* IN5 */
+ PORT_START("STICKX") /* IN5 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(30)
INPUT_PORTS_END
static INPUT_PORTS_START( esb )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -299,7 +299,7 @@ static INPUT_PORTS_START( esb )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_BUTTON4 )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT ( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Diagnostic Step") PORT_CODE(KEYCODE_F1)
@@ -311,7 +311,7 @@ static INPUT_PORTS_START( esb )
/* Bit 7 is VG_HALT - see machine/starwars.c */
PORT_BIT ( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME(0x03, 0x03, "Starting Shields" )
PORT_DIPSETTING ( 0x01, "2" )
PORT_DIPSETTING ( 0x00, "3" )
@@ -334,7 +334,7 @@ static INPUT_PORTS_START( esb )
PORT_DIPSETTING ( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING ( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME(0x03, 0x02, DEF_STR( Coinage ) )
PORT_DIPSETTING ( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING ( 0x02, DEF_STR( 1C_1C ) )
@@ -357,10 +357,10 @@ static INPUT_PORTS_START( esb )
PORT_DIPSETTING ( 0xe0, DEF_STR( None ) )
/* 0xc0 and 0x00 None */
- PORT_START_TAG("STICKY") /* IN4 */
+ PORT_START("STICKY") /* IN4 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(70) PORT_KEYDELTA(30)
- PORT_START_TAG("STICKX") /* IN5 */
+ PORT_START("STICKX") /* IN5 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(30)
INPUT_PORTS_END
diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c
index a13c4cb1a46..56063d33026 100644
--- a/src/mame/drivers/statriv2.c
+++ b/src/mame/drivers/statriv2.c
@@ -414,18 +414,18 @@ static ADDRESS_MAP_START( hangman_readport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( statriv2 )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_NAME("Play All")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Play 10000")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Button A")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Button B")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Button C")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Button D")
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_NAME("Play All")
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Play 10000")
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Button A")
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Button B")
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Button C")
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Button D")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Play 1000")
+ PORT_START("IN1")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Play 1000")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -442,18 +442,18 @@ static INPUT_PORTS_START( statriv2 )
INPUT_PORTS_END
static INPUT_PORTS_START( statriv4 )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_NAME("Play All")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Play 10000")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Button A")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Button B")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Button C")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Button D")
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_NAME("Play All")
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Play 10000")
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Button A")
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Button B")
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Button C")
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Button D")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Play 1000")
+ PORT_START("IN1")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Play 1000")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -468,18 +468,18 @@ static INPUT_PORTS_START( statriv4 )
INPUT_PORTS_END
static INPUT_PORTS_START( supertr2 )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_NAME("Play All")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Play 10000")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Button A")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Button B")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Button C")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Button D")
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_NAME("Play All")
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Play 10000")
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Button A")
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Button B")
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Button C")
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Button D")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Play 1000")
+ PORT_START("IN1")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Play 1000")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -490,10 +490,10 @@ static INPUT_PORTS_START( supertr2 )
INPUT_PORTS_END
static INPUT_PORTS_START( quaquiz2 )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_NAME("Play All")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Play 10000")
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_NAME("Play All")
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Play 10000")
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_IMPULSE(1) PORT_NAME("Button A")
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_IMPULSE(1) PORT_NAME("Button B")
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_IMPULSE(1) PORT_NAME("Button C")
@@ -502,8 +502,8 @@ static INPUT_PORTS_START( quaquiz2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Play 1000")
+ PORT_START("IN1")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Play 1000")
PORT_DIPNAME( 0x02, 0x00, "Port $21 bit 1" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x02, DEF_STR( On ) )
@@ -522,7 +522,7 @@ static INPUT_PORTS_START( quaquiz2 )
INPUT_PORTS_END
static INPUT_PORTS_START( hangman )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_IMPULSE(8)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_IMPULSE(8) PORT_NAME("Choose")
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_IMPULSE(8) PORT_NAME("Right")
@@ -532,7 +532,7 @@ static INPUT_PORTS_START( hangman )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_IMPULSE(8) PORT_NAME("Spinner")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_IMPULSE(8) PORT_NAME("Left")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_IMPULSE(8)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(8)
@@ -552,18 +552,18 @@ static INPUT_PORTS_START( hangman )
INPUT_PORTS_END
static INPUT_PORTS_START( sextriv )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_NAME("Play All")
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Play 10000")
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Button A")
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Button B")
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Button C")
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Button D")
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_NAME("Play All")
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Play 10000")
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Button A")
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Button B")
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Button C")
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Button D")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Play 1000")
+ PORT_START("IN1")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Play 1000")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/stfight.c b/src/mame/drivers/stfight.c
index deb8f13e5ca..8d16e88b96f 100644
--- a/src/mame/drivers/stfight.c
+++ b/src/mame/drivers/stfight.c
@@ -287,7 +287,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( stfight )
- PORT_START_TAG("P1") /* PLAYER 1 */
+ PORT_START("P1") /* PLAYER 1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -297,7 +297,7 @@ static INPUT_PORTS_START( stfight )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2") /* PLAYER 2 */
+ PORT_START("P2") /* PLAYER 2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -307,12 +307,12 @@ static INPUT_PORTS_START( stfight )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("START") /* START BUTTONS */
+ PORT_START("START") /* START BUTTONS */
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xe7, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x07, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
@@ -335,7 +335,7 @@ static INPUT_PORTS_START( stfight )
PORT_DIPSETTING( 0x80, "Red" )
PORT_DIPSETTING( 0x00, "Blue" )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -358,7 +358,7 @@ static INPUT_PORTS_START( stfight )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("COIN") /* COIN MECH */
+ PORT_START("COIN") /* COIN MECH */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(2)
INPUT_PORTS_END
diff --git a/src/mame/drivers/stlforce.c b/src/mame/drivers/stlforce.c
index e31fa96c824..c29d33a5047 100644
--- a/src/mame/drivers/stlforce.c
+++ b/src/mame/drivers/stlforce.c
@@ -128,7 +128,7 @@ static ADDRESS_MAP_START( stlforce_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
static INPUT_PORTS_START( stlforce )
- PORT_START_TAG("INPUT")
+ PORT_START("INPUT")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -146,7 +146,7 @@ static INPUT_PORTS_START( stlforce )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/strnskil.c b/src/mame/drivers/strnskil.c
index 95981114823..b305afd9526 100644
--- a/src/mame/drivers/strnskil.c
+++ b/src/mame/drivers/strnskil.c
@@ -133,7 +133,7 @@ ADDRESS_MAP_END
/****************************************************************************/
static INPUT_PORTS_START( strnskil )
- PORT_START /* dsw1 */
+ PORT_START("DSW1") /* dsw1 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -164,7 +164,7 @@ static INPUT_PORTS_START( strnskil )
PORT_DIPSETTING( 0xe0, "1C 2C / 1C 6C" )
PORT_DIPSETTING( 0xf0, DEF_STR( Free_Play ) )
- PORT_START /* dsw2 */
+ PORT_START("DSW2") /* dsw2 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x00, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x01, DEF_STR( Hard ) )
@@ -190,7 +190,7 @@ static INPUT_PORTS_START( strnskil )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* d804 */
+ PORT_START("P1") /* d804 */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 )
@@ -200,7 +200,7 @@ static INPUT_PORTS_START( strnskil )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
- PORT_START /* d805 */
+ PORT_START("P2") /* d805 */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -210,7 +210,7 @@ static INPUT_PORTS_START( strnskil )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* d803 */
+ PORT_START("SYSTEM") /* d803 */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_SERVICE( 0x20, IP_ACTIVE_HIGH )
@@ -222,7 +222,7 @@ static INPUT_PORTS_START( strnskil )
INPUT_PORTS_END
static INPUT_PORTS_START( banbam )
- PORT_START /* dsw1 */
+ PORT_START("DSW1") /* dsw1 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "5" )
@@ -251,7 +251,7 @@ static INPUT_PORTS_START( banbam )
PORT_DIPSETTING( 0xe0, "1C 2C / 1C 6C" )
PORT_DIPSETTING( 0xf0, DEF_STR( Free_Play ) )
- PORT_START /* dsw2 */
+ PORT_START("DSW2") /* dsw2 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -268,7 +268,7 @@ static INPUT_PORTS_START( banbam )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW2:7" )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW2:8" )
- PORT_START /* d804 */
+ PORT_START("P1") /* d804 */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -278,7 +278,7 @@ static INPUT_PORTS_START( banbam )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
- PORT_START /* d805 */
+ PORT_START("P2") /* d805 */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -288,7 +288,7 @@ static INPUT_PORTS_START( banbam )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
- PORT_START /* d803 */
+ PORT_START("SYSTEM") /* d803 */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_SERVICE( 0x20, IP_ACTIVE_HIGH )
diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c
index 8e00a7a298f..920967a21f0 100644
--- a/src/mame/drivers/stv.c
+++ b/src/mame/drivers/stv.c
@@ -2067,7 +2067,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(_n_)
static INPUT_PORTS_START( stv )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "PDR1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2093,7 +2093,7 @@ static INPUT_PORTS_START( stv )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, "PDR2" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2119,20 +2119,20 @@ static INPUT_PORTS_START( stv )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("P1")
+ PORT_START("P1")
STV_PLAYER_INPUTS(1, BUTTON1, BUTTON2, BUTTON3, BUTTON4)
- PORT_START_TAG("P2")
+ PORT_START("P2")
STV_PLAYER_INPUTS(2, BUTTON1, BUTTON2, BUTTON3, BUTTON4)
/*
- PORT_START_TAG("P3")
+ PORT_START("P3")
STV_PLAYER_INPUTS(3, BUTTON1, BUTTON2, BUTTON3, BUTTON4)
- PORT_START_TAG("P4")
+ PORT_START("P4")
STV_PLAYER_INPUTS(4, BUTTON1, BUTTON2, BUTTON3, BUTTON4)
*/
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
@@ -2143,11 +2143,11 @@ static INPUT_PORTS_START( stv )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("2P Push Switch") PORT_CODE(KEYCODE_8)
/* This *might* be unused... */
- PORT_START_TAG("UNUSED")
+ PORT_START("UNUSED")
PORT_BIT ( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
/* Extra button layout,used by Power Instinct 3 & Suikoenbu */
- PORT_START_TAG("EXTRA")
+ PORT_START("EXTRA")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1)
@@ -2159,7 +2159,7 @@ static INPUT_PORTS_START( stv )
/* We don't need these, AFAIK the country code doesn't work either... */
#if 0
- PORT_START_TAG("FAKE") //7
+ PORT_START("FAKE") //7
PORT_DIPNAME( 0x0f, 0x01, "Country" )
PORT_DIPSETTING( 0x01, DEF_STR( Japan ) )
PORT_DIPSETTING( 0x02, "Asia Ntsc" )
@@ -2170,7 +2170,7 @@ static INPUT_PORTS_START( stv )
PORT_DIPSETTING( 0x0c, "Europe/Other Pal" )
PORT_DIPSETTING( 0x0d, "Sud America Pal" )
- PORT_START_TAG("PAD1A") /* Pad data 1a */
+ PORT_START("PAD1A") /* Pad data 1a */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("B") PORT_CODE(KEYCODE_U)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("C") PORT_CODE(KEYCODE_Y)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("A") PORT_CODE(KEYCODE_T)
@@ -2180,7 +2180,7 @@ static INPUT_PORTS_START( stv )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Left") PORT_CODE(KEYCODE_J)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Right") PORT_CODE(KEYCODE_L)
- PORT_START_TAG("PAD1B") /* Pad data 1b */
+ PORT_START("PAD1B") /* Pad data 1b */
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("L trig") PORT_CODE(KEYCODE_A)
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Z") PORT_CODE(KEYCODE_Q)
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Y") PORT_CODE(KEYCODE_W)
@@ -2193,11 +2193,11 @@ static INPUT_PORTS_START( critcrsh )
PORT_INCLUDE( stv )
/* IN 7 */
- PORT_START_TAG("LIGHTX") /* mask default type sens delta min max */
+ PORT_START("LIGHTX") /* mask default type sens delta min max */
PORT_BIT( 0x3f, 0x00, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX(0,0x3f) PORT_SENSITIVITY(50) PORT_KEYDELTA(1) PORT_PLAYER(1)
/* IN 8 */
- PORT_START_TAG("LIGHTY")
+ PORT_START("LIGHTY")
PORT_BIT( 0x3f, 0x00, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_MINMAX(0x0,0x3f) PORT_SENSITIVITY(50) PORT_KEYDELTA(1) PORT_PLAYER(1)
INPUT_PORTS_END
@@ -2207,7 +2207,7 @@ static INPUT_PORTS_START( stvmp )
PORT_INCLUDE( stv )
/* Mahjong panel/player 1 side */
- PORT_START_TAG("KEY0") /*7*/
+ PORT_START("KEY0") /*7*/
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2217,7 +2217,7 @@ static INPUT_PORTS_START( stvmp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_M )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_I )
- PORT_START_TAG("KEY1") /*8*/
+ PORT_START("KEY1") /*8*/
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2227,7 +2227,7 @@ static INPUT_PORTS_START( stvmp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_N )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_J )
- PORT_START_TAG("KEY2") /*9*/
+ PORT_START("KEY2") /*9*/
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2237,7 +2237,7 @@ static INPUT_PORTS_START( stvmp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_K )
- PORT_START_TAG("KEY3") /*10*/
+ PORT_START("KEY3") /*10*/
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2247,7 +2247,7 @@ static INPUT_PORTS_START( stvmp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_L )
- PORT_START_TAG("KEY4") /*11*/
+ PORT_START("KEY4") /*11*/
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2258,7 +2258,7 @@ static INPUT_PORTS_START( stvmp )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
/* Mahjong panel/player 2 side */
- PORT_START_TAG("KEY5") /*12*/
+ PORT_START("KEY5") /*12*/
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2268,7 +2268,7 @@ static INPUT_PORTS_START( stvmp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_M ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_PLAYER(2)
- PORT_START_TAG("KEY6") /*13*/
+ PORT_START("KEY6") /*13*/
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2278,7 +2278,7 @@ static INPUT_PORTS_START( stvmp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_N ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_PLAYER(2)
- PORT_START_TAG("KEY7") /*14*/
+ PORT_START("KEY7") /*14*/
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2288,7 +2288,7 @@ static INPUT_PORTS_START( stvmp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_K ) PORT_PLAYER(2)
- PORT_START_TAG("KEY8") /*15*/
+ PORT_START("KEY8") /*15*/
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2298,7 +2298,7 @@ static INPUT_PORTS_START( stvmp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_PLAYER(2)
- PORT_START_TAG("KEY9") /*16*/
+ PORT_START("KEY9") /*16*/
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/subs.c b/src/mame/drivers/subs.c
index 92f5bd09946..805a6b1c0d7 100644
--- a/src/mame/drivers/subs.c
+++ b/src/mame/drivers/subs.c
@@ -84,7 +84,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( subs )
- PORT_START_TAG("DSW") /* OPTIONS */
+ PORT_START("DSW") /* OPTIONS */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -109,14 +109,14 @@ static INPUT_PORTS_START( subs )
PORT_DIPSETTING( 0xc0, "3:30 Minutes" )
PORT_DIPSETTING( 0xe0, "4:00 Minutes" )
- PORT_START_TAG("IN0") /* IN1 */
+ PORT_START("IN0") /* IN1 */
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Diag Step */
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Diag Hold */
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_TILT ) /* Slam */
PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) /* Spare */
PORT_BIT ( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Filled in with steering information */
- PORT_START_TAG("IN1") /* IN2 */
+ PORT_START("IN1") /* IN2 */
PORT_BIT ( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT ( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -126,10 +126,10 @@ static INPUT_PORTS_START( subs )
PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("DIAL2") /* IN3 */
+ PORT_START("DIAL2") /* IN3 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_PLAYER(2)
- PORT_START_TAG("DIAL1") /* IN4 */
+ PORT_START("DIAL1") /* IN4 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20)
INPUT_PORTS_END
diff --git a/src/mame/drivers/subsino.c b/src/mame/drivers/subsino.c
index 2d6af01b5be..f2e91bef6a9 100644
--- a/src/mame/drivers/subsino.c
+++ b/src/mame/drivers/subsino.c
@@ -150,7 +150,7 @@ ADDRESS_MAP_END
INPUT_PORTS_START( smoto )
- PORT_START_TAG( "DSW1" )
+ PORT_START( "DSW1" )
PORT_DIPUNKNOWN( 0x01, 0x01 )
PORT_DIPUNKNOWN( 0x02, 0x02 )
PORT_DIPUNKNOWN( 0x04, 0x04 )
@@ -160,7 +160,7 @@ INPUT_PORTS_START( smoto )
PORT_DIPUNKNOWN( 0x40, 0x40 )
PORT_DIPUNKNOWN( 0x80, 0x80 )
- PORT_START_TAG( "DSW2" )
+ PORT_START( "DSW2" )
PORT_DIPUNKNOWN( 0x01, 0x01 )
PORT_DIPUNKNOWN( 0x02, 0x02 )
PORT_DIPUNKNOWN( 0x04, 0x04 )
@@ -170,7 +170,7 @@ INPUT_PORTS_START( smoto )
PORT_DIPUNKNOWN( 0x40, 0x40 )
PORT_DIPUNKNOWN( 0x80, 0x80 )
- PORT_START_TAG( "DSW3" )
+ PORT_START( "DSW3" )
PORT_DIPUNKNOWN( 0x01, 0x01 )
PORT_DIPUNKNOWN( 0x02, 0x02 )
PORT_DIPUNKNOWN( 0x04, 0x04 )
@@ -180,7 +180,7 @@ INPUT_PORTS_START( smoto )
PORT_DIPUNKNOWN( 0x40, 0x40 )
PORT_DIPUNKNOWN( 0x80, 0x80 )
- PORT_START_TAG( "DSW4" )
+ PORT_START( "DSW4" )
PORT_DIPUNKNOWN( 0x01, 0x01 )
PORT_DIPUNKNOWN( 0x02, 0x02 )
PORT_DIPUNKNOWN( 0x04, 0x04 )
@@ -190,7 +190,7 @@ INPUT_PORTS_START( smoto )
PORT_DIPUNKNOWN( 0x40, 0x40 )
PORT_DIPUNKNOWN( 0x80, 0x80 )
- PORT_START_TAG( "INA" )
+ PORT_START( "INA" )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) // 1
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) // 2 ->
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) // 3 <-
@@ -200,7 +200,7 @@ INPUT_PORTS_START( smoto )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 ) // bet (power->speed)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG( "INB" )
+ PORT_START( "INB" )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) // coin
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -210,7 +210,7 @@ INPUT_PORTS_START( smoto )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG( "INC" )
+ PORT_START( "INC" )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START4 ) // take
diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c
index 5a2a688356c..3322a9695f5 100644
--- a/src/mame/drivers/suna16.c
+++ b/src/mame/drivers/suna16.c
@@ -491,19 +491,19 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( bssoccer )
- PORT_START // IN0 - $a00001.b - Player 1
+ PORT_START("P1") // IN0 - $a00001.b - Player 1
JOY(1)
- PORT_START // IN1 - $a00003.b - Player 2
+ PORT_START("P2") // IN1 - $a00003.b - Player 2
JOY(2)
- PORT_START // IN2 - $a00005.b - Player 3
+ PORT_START("P3") // IN2 - $a00005.b - Player 3
JOY(3)
- PORT_START // IN3 - $a00007.b - Player 4
+ PORT_START("P4") // IN3 - $a00007.b - Player 4
JOY(4)
- PORT_START // IN4 - $a00008.w - DSW x 2
+ PORT_START("DSW1") // IN4 - $a00008.w - DSW x 2
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) )
@@ -547,7 +547,7 @@ static INPUT_PORTS_START( bssoccer )
PORT_DIPSETTING( 0x4000, "2:00" )
PORT_DIPSETTING( 0x0000, "2:15" )
- PORT_START // IN5 - $a0000b.b - Coins
+ PORT_START("DSW2") // IN5 - $a0000b.b - Coins
PORT_DIPNAME( 0x0001, 0x0001, "Copyright" ) // these 4 are shown in test mode
PORT_DIPSETTING( 0x0001, "Distributer Unico" )
PORT_DIPSETTING( 0x0000, "All Rights Reserved" )
@@ -574,7 +574,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( uballoon )
- PORT_START // IN0 - $600000.w - Player 1
+ PORT_START("P1") // IN0 - $600000.w - Player 1
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -592,7 +592,7 @@ static INPUT_PORTS_START( uballoon )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START // IN1 - $600002.w - Player 2
+ PORT_START("P2") // IN1 - $600002.w - Player 2
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -613,7 +613,7 @@ static INPUT_PORTS_START( uballoon )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START // IN2 - $600005.b - DSW 1
+ PORT_START("DSW1") // IN2 - $600005.b - DSW 1
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) )
@@ -635,7 +635,7 @@ static INPUT_PORTS_START( uballoon )
PORT_DIPSETTING( 0x0000, DEF_STR( Hardest ) )
PORT_SERVICE( 0x0080, IP_ACTIVE_LOW )
- PORT_START // IN3 - $600007.b - DSW 2
+ PORT_START("DSW2") // IN3 - $600007.b - DSW 2
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -668,7 +668,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( sunaq )
- PORT_START // Player 1
+ PORT_START("P1") // Player 1
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -679,7 +679,7 @@ static INPUT_PORTS_START( sunaq )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START // Player 2
+ PORT_START("P2") // Player 2
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
@@ -689,7 +689,7 @@ static INPUT_PORTS_START( sunaq )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START // Single 8 switch DSW
+ PORT_START("DSW1") // Single 8 switch DSW
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) )
@@ -720,7 +720,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( bestbest )
- PORT_START // IN0 - 500000.w - Player 1
+ PORT_START("P1") // IN0 - 500000.w - Player 1
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -738,7 +738,7 @@ static INPUT_PORTS_START( bestbest )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START // IN1 - 500002.w - Player 2
+ PORT_START("P2") // IN1 - 500002.w - Player 2
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -756,7 +756,7 @@ static INPUT_PORTS_START( bestbest )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START // IN2 - 500004.w - DSW x 2
+ PORT_START("DSW1") // IN2 - 500004.w - DSW x 2
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) )
diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c
index 21973f1ac04..928a6dcafae 100644
--- a/src/mame/drivers/suna8.c
+++ b/src/mame/drivers/suna8.c
@@ -1140,13 +1140,13 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( hardhead )
- PORT_START_TAG("P1") // Player 1 - $da00 (ip = 0)
+ PORT_START("P1") // Player 1 - $da00 (ip = 0)
JOY(1)
- PORT_START_TAG("P2") // Player 2 - $da00 (ip = 1)
+ PORT_START("P2") // Player 2 - $da00 (ip = 1)
JOY(2)
- PORT_START_TAG("DSW1") // DSW 1 - $da00 (ip = 2)
+ PORT_START("DSW1") // DSW 1 - $da00 (ip = 2)
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1172,7 +1172,7 @@ static INPUT_PORTS_START( hardhead )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") //DSW 2 - $da00 (ip = 3)
+ PORT_START("DSW2") //DSW 2 - $da00 (ip = 3)
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1204,13 +1204,13 @@ INPUT_PORTS_END
static INPUT_PORTS_START( rranger )
- PORT_START_TAG("P1") // Player 1 - $c002
+ PORT_START("P1") // Player 1 - $c002
JOY(1)
- PORT_START_TAG("P2") // Player 2 - $c003
+ PORT_START("P2") // Player 2 - $c003
JOY(2)
- PORT_START_TAG("DSW1") //DSW 1 - $c280
+ PORT_START("DSW1") //DSW 1 - $c280
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
@@ -1235,7 +1235,7 @@ static INPUT_PORTS_START( rranger )
PORT_DIPSETTING( 0x40, DEF_STR( Harder ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_START_TAG("DSW2") // DSW 2 - $c2c0
+ PORT_START("DSW2") // DSW 2 - $c2c0
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1269,13 +1269,13 @@ INPUT_PORTS_END
static INPUT_PORTS_START( brickzn )
- PORT_START_TAG("P1") // Player 1 - $c100
+ PORT_START("P1") // Player 1 - $c100
JOY(1)
- PORT_START_TAG("P2") // Player 2 - $c101
+ PORT_START("P2") // Player 2 - $c101
JOY(2)
- PORT_START_TAG("DSW1") // DSW 1 - $c102
+ PORT_START("DSW1") // DSW 1 - $c102
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) // rom 38:b840
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
@@ -1302,7 +1302,7 @@ static INPUT_PORTS_START( brickzn )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") // DSW 2 - $c103
+ PORT_START("DSW2") // DSW 2 - $c103
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1327,10 +1327,10 @@ static INPUT_PORTS_START( brickzn )
PORT_DIPSETTING( 0x40, "4" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_START_TAG("TRACK1") // Player 1 - $c108
+ PORT_START("TRACK1") // Player 1 - $c108
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(0) PORT_REVERSE
- PORT_START_TAG("TRACK2") // Player 2 - $c10c
+ PORT_START("TRACK2") // Player 2 - $c10c
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(0) PORT_REVERSE
INPUT_PORTS_END
@@ -1342,13 +1342,13 @@ INPUT_PORTS_END
static INPUT_PORTS_START( hardhea2 )
- PORT_START_TAG("P1") // Player 1 - $c000
+ PORT_START("P1") // Player 1 - $c000
JOY(1)
- PORT_START_TAG("P2") // Player 2 - $c001
+ PORT_START("P2") // Player 2 - $c001
JOY(2)
- PORT_START_TAG("DSW1") // DSW 1 - $c002
+ PORT_START("DSW1") // DSW 1 - $c002
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
@@ -1372,7 +1372,7 @@ static INPUT_PORTS_START( hardhea2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") // DSW 2 - $c003
+ PORT_START("DSW2") // DSW 2 - $c003
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1397,7 +1397,7 @@ static INPUT_PORTS_START( hardhea2 )
PORT_DIPSETTING( 0x40, "4" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_START_TAG("BUTTONS") // Buttons - $c080
+ PORT_START("BUTTONS") // Buttons - $c080
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1416,13 +1416,13 @@ INPUT_PORTS_END
static INPUT_PORTS_START( sparkman )
- PORT_START_TAG("P1") // Player 1 - $c000
+ PORT_START("P1") // Player 1 - $c000
JOY(1)
- PORT_START_TAG("P2") // Player 2 - $c001
+ PORT_START("P2") // Player 2 - $c001
JOY(2)
- PORT_START_TAG("DSW1") // DSW 1 - $c002
+ PORT_START("DSW1") // DSW 1 - $c002
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
@@ -1446,7 +1446,7 @@ static INPUT_PORTS_START( sparkman )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") // DSW 2 - $c003
+ PORT_START("DSW2") // DSW 2 - $c003
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1471,7 +1471,7 @@ static INPUT_PORTS_START( sparkman )
PORT_DIPSETTING( 0x40, "4" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_START_TAG("BUTTONS") // Buttons - $c080
+ PORT_START("BUTTONS") // Buttons - $c080
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c
index 08ac638330a..afff5149f90 100644
--- a/src/mame/drivers/supbtime.c
+++ b/src/mame/drivers/supbtime.c
@@ -153,7 +153,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( supbtime )
- PORT_START_TAG("P1") /* Player 1 controls */
+ PORT_START("P1") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -163,7 +163,7 @@ static INPUT_PORTS_START( supbtime )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 controls */
+ PORT_START("P2") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -173,7 +173,7 @@ static INPUT_PORTS_START( supbtime )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("COIN") /* Credits */
+ PORT_START("COIN") /* Credits */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -183,7 +183,7 @@ static INPUT_PORTS_START( supbtime )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* Dip switch bank 1 - inverted with respect to other Deco games */
+ PORT_START("DSW1") /* Dip switch bank 1 - inverted with respect to other Deco games */
PORT_DIPNAME( 0xe0, 0xe0, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ) )
@@ -209,7 +209,7 @@ static INPUT_PORTS_START( supbtime )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* Dip switch bank 2 */
+ PORT_START("DSW2") /* Dip switch bank 2 */
PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x80, "1" )
PORT_DIPSETTING( 0x00, "2" )
@@ -235,7 +235,7 @@ static INPUT_PORTS_START( supbtime )
INPUT_PORTS_END
static INPUT_PORTS_START( chinatwn )
- PORT_START_TAG("P1") /* Player 1 controls */
+ PORT_START("P1") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -245,7 +245,7 @@ static INPUT_PORTS_START( chinatwn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* button 3 - unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 controls */
+ PORT_START("P2") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -255,7 +255,7 @@ static INPUT_PORTS_START( chinatwn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("COIN") /* Credits */
+ PORT_START("COIN") /* Credits */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -265,7 +265,7 @@ static INPUT_PORTS_START( chinatwn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* Dip switch bank 1 - inverted with respect to other Deco games */
+ PORT_START("DSW1") /* Dip switch bank 1 - inverted with respect to other Deco games */
PORT_DIPNAME( 0xe0, 0xe0, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ) )
@@ -291,7 +291,7 @@ static INPUT_PORTS_START( chinatwn )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* Dip switch bank 2 */
+ PORT_START("DSW2") /* Dip switch bank 2 */
PORT_DIPNAME( 0xc0, 0xc0, "Time" )
PORT_DIPSETTING( 0x00, "1500" )
PORT_DIPSETTING( 0x80, "2000" )
diff --git a/src/mame/drivers/supdrapo.c b/src/mame/drivers/supdrapo.c
index 4f6b795dea3..3b55d0fab8a 100644
--- a/src/mame/drivers/supdrapo.c
+++ b/src/mame/drivers/supdrapo.c
@@ -82,7 +82,7 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( supdrapo )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) //win
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) //cancel
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) //deal
@@ -92,7 +92,7 @@ static INPUT_PORTS_START( supdrapo )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 ) // 2 scores
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 ) // 1 score
- PORT_START
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON10 ) PORT_PLAYER(1) //hold 5 p1
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON10 ) PORT_PLAYER(1) //hold 4 p1
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON10 ) PORT_PLAYER(1) //hold 3 p1
@@ -102,7 +102,7 @@ static INPUT_PORTS_START( supdrapo )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_PLAYER(1) //red p1
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_PLAYER(1) //double p1
- PORT_START
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) //win
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) //cancel
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) //deal
@@ -112,7 +112,7 @@ static INPUT_PORTS_START( supdrapo )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 ) // 2 scores
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 ) // 1 score
- PORT_START
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) //hold 5 p2
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) //hold 4 p2
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) //hold 3 p2
@@ -122,7 +122,7 @@ static INPUT_PORTS_START( supdrapo )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 ) // red p2
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 ) // double p2
- PORT_START
+ PORT_START("IN4")
PORT_DIPNAME( 0x01, 0x00, "4-1" ) //select player 1
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -146,8 +146,7 @@ static INPUT_PORTS_START( supdrapo )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
-
- PORT_START
+ PORT_START("IN5")
PORT_DIPNAME( 0x01, 0x00, "5-1" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -173,7 +172,7 @@ static INPUT_PORTS_START( supdrapo )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN6")
PORT_DIPNAME( 0x01, 0x00, "6-1" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -199,7 +198,7 @@ static INPUT_PORTS_START( supdrapo )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN7")
PORT_DIPNAME( 0x01, 0x00, "7-1" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -224,7 +223,6 @@ static INPUT_PORTS_START( supdrapo )
PORT_DIPNAME( 0x80, 0x00, "7-8" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
-
INPUT_PORTS_END
static const gfx_layout charlayout =
diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c
index d9f1346e8b2..3839584e647 100644
--- a/src/mame/drivers/superchs.c
+++ b/src/mame/drivers/superchs.c
@@ -273,7 +273,7 @@ ADDRESS_MAP_END
/***********************************************************/
static INPUT_PORTS_START( superchs )
- PORT_START_TAG("SYSTEM") /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -291,7 +291,7 @@ static INPUT_PORTS_START( superchs )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("INPUT") /* IN1 */
+ PORT_START("INPUT") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -309,19 +309,19 @@ static INPUT_PORTS_START( superchs )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Brake")
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("WHEEL") /* IN 2, steering wheel */
+ PORT_START("WHEEL") /* IN 2, steering wheel */
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("ACCEL") /* IN 3, accel [effectively also brake for the upright] */
+ PORT_START("ACCEL") /* IN 3, accel [effectively also brake for the upright] */
PORT_BIT( 0xff, 0x00, IPT_AD_STICK_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("SOUND") /* IN 4, sound volume */
+ PORT_START("SOUND") /* IN 4, sound volume */
PORT_BIT( 0xff, 0x00, IPT_AD_STICK_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("UNKNOWN") /* IN 5, unknown */
+ PORT_START("UNKNOWN") /* IN 5, unknown */
PORT_BIT( 0xff, 0x00, IPT_AD_STICK_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("FAKE") /* IN 6, inputs and DSW all fake */
+ PORT_START("FAKE") /* IN 6, inputs and DSW all fake */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1)
diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c
index c4234a9bb1b..f860902cc57 100644
--- a/src/mame/drivers/superdq.c
+++ b/src/mame/drivers/superdq.c
@@ -241,7 +241,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( superdq )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -251,7 +251,7 @@ static INPUT_PORTS_START( superdq )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) /* Service button */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT ) /* TEST button */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -261,7 +261,7 @@ static INPUT_PORTS_START( superdq )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -285,7 +285,7 @@ static INPUT_PORTS_START( superdq )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c
index 3823c60b196..9adf2208e56 100644
--- a/src/mame/drivers/superqix.c
+++ b/src/mame/drivers/superqix.c
@@ -615,7 +615,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( pbillian )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x03, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
@@ -641,7 +641,7 @@ static INPUT_PORTS_START( pbillian )
PORT_DIPSETTING( 0x80, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -664,7 +664,7 @@ static INPUT_PORTS_START( pbillian )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
@@ -674,7 +674,7 @@ static INPUT_PORTS_START( pbillian )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL )
- PORT_START_TAG("BUTTONS")
+ PORT_START("BUTTONS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) // high score initials
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) // fire (M powerup) + high score initials
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL // high score initials
@@ -684,23 +684,23 @@ static INPUT_PORTS_START( pbillian )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) // mcu status (pending mcu->z80)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) // mcu status (pending z80->mcu)
- PORT_START_TAG("PADDLE1")
+ PORT_START("PADDLE1")
PORT_BIT( 0x3f, 0x00, IPT_PADDLE_V ) PORT_MINMAX(0,0x3f) PORT_SENSITIVITY(30) PORT_KEYDELTA(3) PORT_CENTERDELTA(0) PORT_REVERSE
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 )
- PORT_START_TAG("DIAL1")
+ PORT_START("DIAL1")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10)
- PORT_START_TAG("PADDLE2")
+ PORT_START("PADDLE2")
PORT_BIT( 0x3f, 0x00, IPT_PADDLE_V ) PORT_MINMAX(0,0x3f) PORT_SENSITIVITY(30) PORT_KEYDELTA(3) PORT_CENTERDELTA(0) PORT_REVERSE PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("DIAL2")
+ PORT_START("DIAL2")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_COCKTAIL
INPUT_PORTS_END
static INPUT_PORTS_START( hotsmash )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -724,7 +724,7 @@ static INPUT_PORTS_START( hotsmash )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, "Difficulty vs. CPU" )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -748,7 +748,7 @@ static INPUT_PORTS_START( hotsmash )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
@@ -758,17 +758,17 @@ static INPUT_PORTS_START( hotsmash )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) // mcu status (0 = pending mcu->z80)
- PORT_START_TAG("DIAL1")
+ PORT_START("DIAL1")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(15) PORT_KEYDELTA(30) PORT_CENTERDELTA(0) PORT_PLAYER(1)
- PORT_START_TAG("DIAL2")
+ PORT_START("DIAL2")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(15) PORT_KEYDELTA(30) PORT_CENTERDELTA(0) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( superqix )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -792,7 +792,7 @@ static INPUT_PORTS_START( superqix )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ))
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSW2") /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -814,7 +814,7 @@ static INPUT_PORTS_START( superqix )
PORT_DIPSETTING( 0x40, "80%" )
PORT_DIPSETTING( 0x00, "85%" )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -824,7 +824,7 @@ static INPUT_PORTS_START( superqix )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) // Z80 status (pending z80->mcu)
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
@@ -834,7 +834,7 @@ static INPUT_PORTS_START( superqix )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_VBLANK ) /* ??? */
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c
index 18f10063164..7d54b0c63d9 100644
--- a/src/mame/drivers/supertnk.c
+++ b/src/mame/drivers/supertnk.c
@@ -326,7 +326,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( supertnk )
- PORT_START
+ PORT_START("JOYS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -336,7 +336,7 @@ static INPUT_PORTS_START( supertnk )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_START
+ PORT_START("INPUTS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -346,7 +346,7 @@ static INPUT_PORTS_START( supertnk )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -372,7 +372,7 @@ static INPUT_PORTS_START( supertnk )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START
+ PORT_START("UNK")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c
index be13afc804d..76673da5b6a 100644
--- a/src/mame/drivers/suprgolf.c
+++ b/src/mame/drivers/suprgolf.c
@@ -109,7 +109,7 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( suprgolf )
- PORT_START /* PLAY1 */
+ PORT_START("P1") /* PLAY1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -119,7 +119,7 @@ static INPUT_PORTS_START( suprgolf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) /* CNT */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) /* SEL */
- PORT_START /* PLAY2 */
+ PORT_START("P2") /* PLAY2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -129,8 +129,7 @@ static INPUT_PORTS_START( suprgolf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) /* CNT */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) /* SEL */
-
- PORT_START /* 8bit */
+ PORT_START("IN2") /* 8bit */
PORT_DIPNAME( 0x01, 0x01, "2" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -156,7 +155,7 @@ static INPUT_PORTS_START( suprgolf )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* 8bit */
+ PORT_START("SYSTEM") /* 8bit */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) /* 1P */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) /* POW */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) /* 1P */
@@ -170,7 +169,7 @@ static INPUT_PORTS_START( suprgolf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START /* 8bit */
+ PORT_START("IN4") /* 8bit */
PORT_DIPNAME( 0x01, 0x01, "4" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -196,7 +195,7 @@ static INPUT_PORTS_START( suprgolf )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* 8bit */
+ PORT_START("DSW0") /* 8bit */
PORT_DIPNAME( 0x01, 0x01, "DSW0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -222,7 +221,7 @@ static INPUT_PORTS_START( suprgolf )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* 8bit */
+ PORT_START("DSW1") /* 8bit */
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x02, "DSW1" )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
diff --git a/src/mame/drivers/suprloco.c b/src/mame/drivers/suprloco.c
index 57c310e2425..b08d546ae78 100644
--- a/src/mame/drivers/suprloco.c
+++ b/src/mame/drivers/suprloco.c
@@ -66,7 +66,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( suprloco )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW)
@@ -75,7 +75,7 @@ static INPUT_PORTS_START( suprloco )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -84,7 +84,7 @@ static INPUT_PORTS_START( suprloco )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -93,7 +93,7 @@ static INPUT_PORTS_START( suprloco )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x07, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x06, DEF_STR( 4C_1C ) )
@@ -118,7 +118,7 @@ static INPUT_PORTS_START( suprloco )
PORT_DIPSETTING( 0x80, "4" )
PORT_DIPSETTING( 0xc0, "5" )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x00, "20000" )
PORT_DIPSETTING( 0x01, "30000" )
diff --git a/src/mame/drivers/suprnova.c b/src/mame/drivers/suprnova.c
index 23e2a8d50f1..eb9c5df9fbb 100644
--- a/src/mame/drivers/suprnova.c
+++ b/src/mame/drivers/suprnova.c
@@ -503,7 +503,7 @@ static INTERRUPT_GEN(skns_interrupt)
static INPUT_PORTS_START( skns ) /* 3 buttons, 2 players */
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -513,7 +513,7 @@ static INPUT_PORTS_START( skns ) /* 3 buttons, 2 players */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -523,7 +523,7 @@ static INPUT_PORTS_START( skns ) /* 3 buttons, 2 players */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -533,19 +533,19 @@ static INPUT_PORTS_START( skns ) /* 3 buttons, 2 players */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* IN3 */
+ PORT_START("IN3") /* IN3 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("Paddle A") /* Paddle A */
+ PORT_START("Paddle A") /* Paddle A */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("Paddle B") /* Paddle B */
+ PORT_START("Paddle B") /* Paddle B */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("Paddle C") /* Paddle C */
+ PORT_START("Paddle C") /* Paddle C */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW") /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x02, DEF_STR(Flip_Screen) ) // This port affects 0x040191c8 function
PORT_DIPSETTING( 0x02, DEF_STR(Off) )
@@ -569,14 +569,14 @@ static INPUT_PORTS_START( skns ) /* 3 buttons, 2 players */
PORT_DIPSETTING( 0x00, "Freezes the game")
PORT_DIPSETTING( 0x80, "Right value")
- PORT_START_TAG("Paddle D") /* Paddle D */
+ PORT_START("Paddle D") /* Paddle D */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( skns_1p ) /* 2 buttons, 1 player */
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -591,12 +591,12 @@ static INPUT_PORTS_START( skns_1p ) /* 2 buttons, 1 player */
that allows to play them in two player mode
via a cable-network connection (untestable)
Service mode test shows only P1 inputs */
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
/* same as above, coin 2 and start 2 are untestable
in ryouran and teljan. So I left disabled for now */
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
//PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -608,19 +608,19 @@ static INPUT_PORTS_START( skns_1p ) /* 2 buttons, 1 player */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* IN3 */
+ PORT_START("IN3") /* IN3 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("Paddle A") /* Paddle A */
+ PORT_START("Paddle A") /* Paddle A */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("Paddle B") /* Paddle B */
+ PORT_START("Paddle B") /* Paddle B */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("Paddle C") /* Paddle C */
+ PORT_START("Paddle C") /* Paddle C */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW") /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x02, DEF_STR(Flip_Screen) ) // This port affects 0x040191c8 function
PORT_DIPSETTING( 0x02, DEF_STR(Off) )
@@ -644,7 +644,7 @@ static INPUT_PORTS_START( skns_1p ) /* 2 buttons, 1 player */
PORT_DIPSETTING( 0x00, "Freezes the game")
PORT_DIPSETTING( 0x80, "Right value")
- PORT_START_TAG("Paddle D") /* Paddle D */
+ PORT_START("Paddle D") /* Paddle D */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/suprridr.c b/src/mame/drivers/suprridr.c
index 468a8639f1f..01a5018755d 100644
--- a/src/mame/drivers/suprridr.c
+++ b/src/mame/drivers/suprridr.c
@@ -237,17 +237,17 @@ static CUSTOM_INPUT( suprridr_control_r )
static INPUT_PORTS_START( suprridr )
- PORT_START /* IN0 */
+ PORT_START("INPUTS") /* IN0 */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(suprridr_control_r, 0)
- PORT_START /* IN1 */
+ PORT_START("SYSTEM") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* DSW0 */
+ PORT_START("DSW1") /* DSW0 */
PORT_DIPNAME( 0x07, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -272,7 +272,7 @@ static INPUT_PORTS_START( suprridr )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG(SUPRRIDR_P1_CONTROL_PORT_TAG)
+ PORT_START(SUPRRIDR_P1_CONTROL_PORT_TAG)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -280,7 +280,7 @@ static INPUT_PORTS_START( suprridr )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG(SUPRRIDR_P2_CONTROL_PORT_TAG)
+ PORT_START(SUPRRIDR_P2_CONTROL_PORT_TAG)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNKNOWN )
diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c
index 7dd7ef9189b..9622c67f9c0 100644
--- a/src/mame/drivers/suprslam.c
+++ b/src/mame/drivers/suprslam.c
@@ -197,7 +197,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( suprslam )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -207,7 +207,7 @@ static INPUT_PORTS_START( suprslam )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
- PORT_START /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -217,7 +217,7 @@ static INPUT_PORTS_START( suprslam )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 ) // Only in "test mode"
@@ -227,7 +227,7 @@ static INPUT_PORTS_START( suprslam )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START /* DSW */
+ PORT_START("DSW1") /* DSW */
PORT_DIPNAME( 0x0001, 0x0001, "Coin Slots" )
PORT_DIPSETTING( 0x0001, "Common" )
PORT_DIPSETTING( 0x0000, "Separate" )
@@ -253,7 +253,7 @@ static INPUT_PORTS_START( suprslam )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START /* DSW */
+ PORT_START("DSW2") /* DSW */
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c
index 991b6b05764..d10b0aba6bb 100644
--- a/src/mame/drivers/surpratk.c
+++ b/src/mame/drivers/surpratk.c
@@ -123,7 +123,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( surpratk )
- PORT_START /* PLAYER 1 INPUTS */
+ PORT_START("P1") /* PLAYER 1 INPUTS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -133,7 +133,7 @@ static INPUT_PORTS_START( surpratk )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* PLAYER 2 INPUTS */
+ PORT_START("P2") /* PLAYER 2 INPUTS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -143,7 +143,7 @@ static INPUT_PORTS_START( surpratk )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* DSW #1 */
+ PORT_START("DSW1") /* DSW #1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -179,7 +179,7 @@ static INPUT_PORTS_START( surpratk )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "No Use" )
- PORT_START /* DSW #2 */
+ PORT_START("DSW2") /* DSW #2 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -203,7 +203,7 @@ static INPUT_PORTS_START( surpratk )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW #3 */
+ PORT_START("DSW3") /* DSW #3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c
index 94d43421b40..22882472b10 100644
--- a/src/mame/drivers/system1.c
+++ b/src/mame/drivers/system1.c
@@ -463,7 +463,7 @@ ADDRESS_MAP_END
PORT_DIPSETTING( 0x00, "Port $10" )
static INPUT_PORTS_START( starjack )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -473,7 +473,7 @@ static INPUT_PORTS_START( starjack )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -483,13 +483,13 @@ static INPUT_PORTS_START( starjack )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -515,7 +515,7 @@ static INPUT_PORTS_START( starjack )
INPUT_PORTS_END
static INPUT_PORTS_START( starjacs )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -525,7 +525,7 @@ static INPUT_PORTS_START( starjacs )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -535,13 +535,13 @@ static INPUT_PORTS_START( starjacs )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -566,7 +566,7 @@ static INPUT_PORTS_START( starjacs )
INPUT_PORTS_END
static INPUT_PORTS_START( regulus )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -576,7 +576,7 @@ static INPUT_PORTS_START( regulus )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -586,13 +586,13 @@ static INPUT_PORTS_START( regulus )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -620,7 +620,7 @@ INPUT_PORTS_END
/* Same as 'regulus', but no DEF_STR( Allow_Continue ) Dip Switch */
static INPUT_PORTS_START( reguluso )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -630,7 +630,7 @@ static INPUT_PORTS_START( reguluso )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -640,13 +640,13 @@ static INPUT_PORTS_START( reguluso )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -673,7 +673,7 @@ static INPUT_PORTS_START( reguluso )
INPUT_PORTS_END
static INPUT_PORTS_START( upndown )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -683,7 +683,7 @@ static INPUT_PORTS_START( upndown )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -693,13 +693,13 @@ static INPUT_PORTS_START( upndown )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -725,7 +725,7 @@ static INPUT_PORTS_START( upndown )
INPUT_PORTS_END
static INPUT_PORTS_START( mrviking )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -735,7 +735,7 @@ static INPUT_PORTS_START( mrviking )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -745,13 +745,13 @@ static INPUT_PORTS_START( mrviking )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -777,7 +777,7 @@ INPUT_PORTS_END
/* Same as 'mrviking', but no "Maximum Credits" Dip Switch and "Difficulty" Dip Switch is
handled by bit 7 instead of bit 6 (so bit 6 is unused) */
static INPUT_PORTS_START( mrvikngj )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -787,7 +787,7 @@ static INPUT_PORTS_START( mrvikngj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -797,13 +797,13 @@ static INPUT_PORTS_START( mrvikngj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -829,7 +829,7 @@ static INPUT_PORTS_START( mrvikngj )
INPUT_PORTS_END
static INPUT_PORTS_START( swat )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -839,7 +839,7 @@ static INPUT_PORTS_START( swat )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -849,13 +849,13 @@ static INPUT_PORTS_START( swat )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -882,7 +882,7 @@ static INPUT_PORTS_START( swat )
INPUT_PORTS_END
static INPUT_PORTS_START( flicky )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -892,7 +892,7 @@ static INPUT_PORTS_START( flicky )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -902,13 +902,13 @@ static INPUT_PORTS_START( flicky )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -932,7 +932,7 @@ static INPUT_PORTS_START( flicky )
INPUT_PORTS_END
static INPUT_PORTS_START( wmatch )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_UP ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_8WAY
@@ -942,7 +942,7 @@ static INPUT_PORTS_START( wmatch )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_8WAY PORT_COCKTAIL
@@ -952,7 +952,7 @@ static INPUT_PORTS_START( wmatch )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
@@ -962,10 +962,10 @@ static INPUT_PORTS_START( wmatch )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) /* TURN P1 */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL /* TURN P2 */
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -990,7 +990,7 @@ static INPUT_PORTS_START( wmatch )
INPUT_PORTS_END
static INPUT_PORTS_START( bullfgt )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -1000,7 +1000,7 @@ static INPUT_PORTS_START( bullfgt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -1010,13 +1010,13 @@ static INPUT_PORTS_START( bullfgt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1040,7 +1040,7 @@ static INPUT_PORTS_START( bullfgt )
INPUT_PORTS_END
static INPUT_PORTS_START( spatter )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -1050,7 +1050,7 @@ static INPUT_PORTS_START( spatter )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -1060,13 +1060,13 @@ static INPUT_PORTS_START( spatter )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1090,7 +1090,7 @@ static INPUT_PORTS_START( spatter )
INPUT_PORTS_END
static INPUT_PORTS_START( pitfall2 )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -1100,7 +1100,7 @@ static INPUT_PORTS_START( pitfall2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -1110,13 +1110,13 @@ static INPUT_PORTS_START( pitfall2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1143,7 +1143,7 @@ static INPUT_PORTS_START( pitfall2 )
INPUT_PORTS_END
static INPUT_PORTS_START( pitfallu )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -1153,7 +1153,7 @@ static INPUT_PORTS_START( pitfallu )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -1163,13 +1163,13 @@ static INPUT_PORTS_START( pitfallu )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1195,7 +1195,7 @@ static INPUT_PORTS_START( pitfallu )
INPUT_PORTS_END
static INPUT_PORTS_START( seganinj )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -1205,7 +1205,7 @@ static INPUT_PORTS_START( seganinj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -1215,13 +1215,13 @@ static INPUT_PORTS_START( seganinj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1246,7 +1246,7 @@ static INPUT_PORTS_START( seganinj )
INPUT_PORTS_END
static INPUT_PORTS_START( imsorry )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -1256,7 +1256,7 @@ static INPUT_PORTS_START( imsorry )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -1266,13 +1266,13 @@ static INPUT_PORTS_START( imsorry )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1296,7 +1296,7 @@ static INPUT_PORTS_START( imsorry )
INPUT_PORTS_END
static INPUT_PORTS_START( teddybb )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -1306,7 +1306,7 @@ static INPUT_PORTS_START( teddybb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -1316,13 +1316,13 @@ static INPUT_PORTS_START( teddybb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1346,7 +1346,7 @@ static INPUT_PORTS_START( teddybb )
INPUT_PORTS_END
static INPUT_PORTS_START( hvymetal )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -1356,7 +1356,7 @@ static INPUT_PORTS_START( hvymetal )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -1366,13 +1366,13 @@ static INPUT_PORTS_START( hvymetal )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW0") /* DSW1 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1398,7 +1398,7 @@ static INPUT_PORTS_START( hvymetal )
INPUT_PORTS_END
static INPUT_PORTS_START( myhero )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -1408,7 +1408,7 @@ static INPUT_PORTS_START( myhero )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -1418,13 +1418,13 @@ static INPUT_PORTS_START( myhero )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1448,7 +1448,7 @@ static INPUT_PORTS_START( myhero )
INPUT_PORTS_END
static INPUT_PORTS_START( shtngmst )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
/*
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -1460,7 +1460,7 @@ static INPUT_PORTS_START( shtngmst )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
*/
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
/*
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -1472,10 +1472,10 @@ static INPUT_PORTS_START( shtngmst )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
*/
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x01, 0x01, "DSW1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1501,10 +1501,10 @@ static INPUT_PORTS_START( shtngmst )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
DSW1_PORT
- PORT_START /* trigger is in here */
+ PORT_START("TRIGGER") /* trigger is in here */
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -1512,13 +1512,13 @@ static INPUT_PORTS_START( shtngmst )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* 1c */
+ PORT_START("GUNX") /* 1c */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START /* 1d */
+ PORT_START("GUNY") /* 1d */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, -1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1) PORT_REVERSE
- PORT_START /* 18 */
+ PORT_START("18") /* 18 */
/* what is this? check the game code... */
PORT_DIPNAME( 0x01, 0x01, "port 18" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
@@ -1548,7 +1548,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( chplft )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -1558,7 +1558,7 @@ static INPUT_PORTS_START( chplft )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -1568,10 +1568,10 @@ static INPUT_PORTS_START( chplft )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW B:1")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1596,12 +1596,12 @@ static INPUT_PORTS_START( chplft )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
DSW1_PORT
INPUT_PORTS_END
static INPUT_PORTS_START( 4dwarrio )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -1611,7 +1611,7 @@ static INPUT_PORTS_START( 4dwarrio )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -1621,13 +1621,13 @@ static INPUT_PORTS_START( 4dwarrio )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1652,7 +1652,7 @@ static INPUT_PORTS_START( 4dwarrio )
INPUT_PORTS_END
static INPUT_PORTS_START( brain )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -1662,7 +1662,7 @@ static INPUT_PORTS_START( brain )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -1672,13 +1672,13 @@ static INPUT_PORTS_START( brain )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1705,7 +1705,7 @@ static INPUT_PORTS_START( brain )
INPUT_PORTS_END
static INPUT_PORTS_START( gardia )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -1715,7 +1715,7 @@ static INPUT_PORTS_START( gardia )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -1725,13 +1725,13 @@ static INPUT_PORTS_START( gardia )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1757,7 +1757,7 @@ static INPUT_PORTS_START( gardia )
INPUT_PORTS_END
static INPUT_PORTS_START( raflesia )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -1767,7 +1767,7 @@ static INPUT_PORTS_START( raflesia )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -1777,13 +1777,13 @@ static INPUT_PORTS_START( raflesia )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1807,7 +1807,7 @@ static INPUT_PORTS_START( raflesia )
INPUT_PORTS_END
static INPUT_PORTS_START( wboy )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -1817,7 +1817,7 @@ static INPUT_PORTS_START( wboy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -1827,13 +1827,13 @@ static INPUT_PORTS_START( wboy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW B:1")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1860,7 +1860,7 @@ static INPUT_PORTS_START( wboy )
INPUT_PORTS_END
static INPUT_PORTS_START( wboy3 )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -1870,7 +1870,7 @@ static INPUT_PORTS_START( wboy3 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -1880,13 +1880,13 @@ static INPUT_PORTS_START( wboy3 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW B:1")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1913,7 +1913,7 @@ static INPUT_PORTS_START( wboy3 )
INPUT_PORTS_END
static INPUT_PORTS_START( wboysys2 )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -1923,7 +1923,7 @@ static INPUT_PORTS_START( wboysys2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -1933,10 +1933,10 @@ static INPUT_PORTS_START( wboysys2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW1") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW B:1")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1961,13 +1961,13 @@ static INPUT_PORTS_START( wboysys2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW1 */
+ PORT_START("DSW0") /* DSW1 */
DSW1_PORT
INPUT_PORTS_END
/* same as wboy, additional Energy Consumption switch */
static INPUT_PORTS_START( wbdeluxe )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Has to be 0 otherwise the game resets */
/* if you die after level 1. */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -1978,7 +1978,7 @@ static INPUT_PORTS_START( wbdeluxe )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -1988,13 +1988,13 @@ static INPUT_PORTS_START( wbdeluxe )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
DSW1_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW B:1")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -2021,7 +2021,7 @@ static INPUT_PORTS_START( wbdeluxe )
INPUT_PORTS_END
static INPUT_PORTS_START( wboyu )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -2031,7 +2031,7 @@ static INPUT_PORTS_START( wboyu )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -2041,10 +2041,10 @@ static INPUT_PORTS_START( wboyu )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW1") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -2069,7 +2069,7 @@ static INPUT_PORTS_START( wboyu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW1 */
+ PORT_START("DSW0") /* DSW1 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -2141,13 +2141,13 @@ Useful addresses:
*/
static INPUT_PORTS_START( blockgal )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(60) PORT_KEYDELTA(15) PORT_REVERSE
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(60) PORT_KEYDELTA(15) PORT_REVERSE PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2157,7 +2157,7 @@ static INPUT_PORTS_START( blockgal )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START /* DSW0 */
+ PORT_START("DSW1") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -2181,12 +2181,12 @@ static INPUT_PORTS_START( blockgal )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START /* DSW1 */
+ PORT_START("DSW0") /* DSW1 */
DSW1_PORT
INPUT_PORTS_END
static INPUT_PORTS_START( tokisens )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -2196,7 +2196,7 @@ static INPUT_PORTS_START( tokisens )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -2206,10 +2206,10 @@ static INPUT_PORTS_START( tokisens )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW0 */
+ PORT_START("DSW1") /* DSW0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -2234,12 +2234,12 @@ static INPUT_PORTS_START( tokisens )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW1 */
+ PORT_START("DSW0") /* DSW1 */
DSW1_PORT
INPUT_PORTS_END
static INPUT_PORTS_START( wbml )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -2249,7 +2249,7 @@ static INPUT_PORTS_START( wbml )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -2259,10 +2259,10 @@ static INPUT_PORTS_START( wbml )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -2287,12 +2287,12 @@ static INPUT_PORTS_START( wbml )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
DSW1_PORT
INPUT_PORTS_END
static INPUT_PORTS_START( noboranb )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) // shot
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) // fly
@@ -2302,7 +2302,7 @@ static INPUT_PORTS_START( noboranb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL // shot
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL // fly
@@ -2312,7 +2312,7 @@ static INPUT_PORTS_START( noboranb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
@@ -2322,7 +2322,7 @@ static INPUT_PORTS_START( noboranb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -2345,7 +2345,7 @@ static INPUT_PORTS_START( noboranb )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x02, "2" )
PORT_DIPSETTING( 0x03, "3" )
@@ -2377,7 +2377,7 @@ INPUT_PORTS_END
*/
static INPUT_PORTS_START( ufosensi )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -2387,7 +2387,7 @@ static INPUT_PORTS_START( ufosensi )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -2397,10 +2397,10 @@ static INPUT_PORTS_START( ufosensi )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
IN0_PORT
- PORT_START /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x00, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x01, DEF_STR( Normal ) )
@@ -2424,7 +2424,7 @@ static INPUT_PORTS_START( ufosensi )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c
index 6bb4462159d..34332582f3b 100644
--- a/src/mame/drivers/system16.c
+++ b/src/mame/drivers/system16.c
@@ -540,7 +540,7 @@ static void set_bg_page( int data )
/***************************************************************************/
static INPUT_PORTS_START( sys16_common )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -550,7 +550,7 @@ static INPUT_PORTS_START( sys16_common )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -560,7 +560,7 @@ static INPUT_PORTS_START( sys16_common )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW)
@@ -570,7 +570,7 @@ static INPUT_PORTS_START( sys16_common )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -613,7 +613,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( aliensyn )
PORT_INCLUDE( sys16_common )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW2:1" ) /* Listed as "Unused" */
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:2")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -699,7 +699,7 @@ static DRIVER_INIT( bayrtbl1 )
static INPUT_PORTS_START( bayroute )
PORT_INCLUDE( sys16_common )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -840,7 +840,7 @@ static DRIVER_INIT( dduxbl )
static INPUT_PORTS_START( ddux )
PORT_INCLUDE( sys16_common )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -959,7 +959,7 @@ static DRIVER_INIT( eswatbl )
static INPUT_PORTS_START( eswat )
PORT_INCLUDE( sys16_common )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, "Credits To Start" ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, "1 Credit" )
PORT_DIPSETTING( 0x00, "2 Credits" )
@@ -1068,7 +1068,7 @@ static DRIVER_INIT( fpointbl )
static INPUT_PORTS_START( fpointbl )
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW)
@@ -1078,7 +1078,7 @@ static INPUT_PORTS_START( fpointbl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -1088,7 +1088,7 @@ static INPUT_PORTS_START( fpointbl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -1098,7 +1098,7 @@ static INPUT_PORTS_START( fpointbl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW2:1" ) /* Listed as "Unused" */
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:2")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -1118,7 +1118,7 @@ static INPUT_PORTS_START( fpointbl )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -1284,7 +1284,7 @@ static DRIVER_INIT( goldnabl )
static INPUT_PORTS_START( goldnaxe )
PORT_INCLUDE( sys16_common )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, "Credits Needed" ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, "1 Credit To Start" )
PORT_DIPSETTING( 0x00, "2 Credits To Start" )
@@ -1507,7 +1507,7 @@ static INPUT_PORTS_START( passsht )
PORT_MODIFY("P2")
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_COCKTAIL
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1559,7 +1559,7 @@ static INPUT_PORTS_START( passht4b )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4 )
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
@@ -1569,7 +1569,7 @@ static INPUT_PORTS_START( passht4b )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(3)
- PORT_START_TAG("P4")
+ PORT_START("P4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
@@ -1608,7 +1608,7 @@ MACHINE_DRIVER_END
static INPUT_PORTS_START( shinobi )
PORT_INCLUDE( sys16_common )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1809,7 +1809,7 @@ static DRIVER_INIT( tetrisbl )
static INPUT_PORTS_START( tetris )
PORT_INCLUDE( sys16_common ) /* unconfirmed coinage dip */
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW2:1" ) /* Listed as "Unused" */
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:2")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -1897,7 +1897,7 @@ static READ16_HANDLER( tt_io_service_r )
static INPUT_PORTS_START( tturf )
PORT_INCLUDE( sys16_common )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Continues ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
PORT_DIPSETTING( 0x01, "3" )
@@ -2038,7 +2038,7 @@ MACHINE_DRIVER_END
static INPUT_PORTS_START( wb3b )
PORT_INCLUDE( sys16_common )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW2:1" ) /* Listed as "Unused" */
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:2")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
diff --git a/src/mame/drivers/system18.c b/src/mame/drivers/system18.c
index 2373708601a..1a0d7df05c5 100644
--- a/src/mame/drivers/system18.c
+++ b/src/mame/drivers/system18.c
@@ -1178,7 +1178,7 @@ MACHINE_DRIVER_END
/***************************************************************************/
static INPUT_PORTS_START( astormbl )
- PORT_START_TAG("P1") /* player 1 */
+ PORT_START("P1") /* player 1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 )
@@ -1188,7 +1188,7 @@ static INPUT_PORTS_START( astormbl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- PORT_START_TAG("P2") /* player 2 */
+ PORT_START("P2") /* player 2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
@@ -1198,7 +1198,7 @@ static INPUT_PORTS_START( astormbl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW)
@@ -1208,7 +1208,7 @@ static INPUT_PORTS_START( astormbl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("COINAGE")
+ PORT_START("COINAGE")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -1244,7 +1244,7 @@ static INPUT_PORTS_START( astormbl )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x00, "Free Play (if Coin A too) or 1/1" )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x01, 0x01, "2 Credits to Start" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1270,7 +1270,7 @@ static INPUT_PORTS_START( astormbl )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("P3") /* player 3 */
+ PORT_START("P3") /* player 3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
diff --git a/src/mame/drivers/tagteam.c b/src/mame/drivers/tagteam.c
index b4686dc0a4c..e9f738cc995 100644
--- a/src/mame/drivers/tagteam.c
+++ b/src/mame/drivers/tagteam.c
@@ -98,7 +98,7 @@ static INTERRUPT_GEN( tagteam_interrupt )
}
#define TAGTEAM_PLAYERS\
- PORT_START_TAG("IN0")\
+ PORT_START("IN0")\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY\
@@ -107,7 +107,7 @@ static INTERRUPT_GEN( tagteam_interrupt )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )\
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )\
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )\
- PORT_START_TAG("IN1")\
+ PORT_START("IN1")\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL\
@@ -120,7 +120,7 @@ static INTERRUPT_GEN( tagteam_interrupt )
static INPUT_PORTS_START( bigprowr )
TAGTEAM_PLAYERS
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -141,7 +141,7 @@ static INPUT_PORTS_START( bigprowr )
PORT_DIPSETTING( 0x60, DEF_STR( Cocktail ) ) // "Cocktail, Dual Controls"
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x01, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hard ) )
@@ -171,7 +171,7 @@ INPUT_PORTS_END
/* Same as 'bigprowr', but additional "Coin Mode" Dip Switch */
static INPUT_PORTS_START( tagteam )
TAGTEAM_PLAYERS
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -194,7 +194,7 @@ static INPUT_PORTS_START( tagteam )
PORT_DIPSETTING( 0x60, DEF_STR( Cocktail ) ) // "Cocktail, Dual Controls"
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x01, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hard ) )
diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c
index 7e35567133b..532bb79f031 100644
--- a/src/mame/drivers/tail2nos.c
+++ b/src/mame/drivers/tail2nos.c
@@ -105,7 +105,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( tail2nos )
- PORT_START
+ PORT_START("INPUTS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
@@ -118,12 +118,12 @@ static INPUT_PORTS_START( tail2nos )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT(0x1000, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Test Advance") PORT_CODE(KEYCODE_F1)
+ PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Test Advance") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x000f, 0x0000, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0009, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0008, DEF_STR( 4C_1C ) )
diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c
index 04f33c631e8..ca4b6ef6212 100644
--- a/src/mame/drivers/taito_b.c
+++ b/src/mame/drivers/taito_b.c
@@ -1060,7 +1060,7 @@ ADDRESS_MAP_END
***********************************************************/
#define TAITO_B_SYSTEM_INPUT \
- PORT_START_TAG("IN2") \
+ PORT_START("IN2") \
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT ) \
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) \
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2) \
@@ -1072,11 +1072,11 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( rastsag2 )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_NO_COCKTAIL // all 2 "unused" in manual
TAITO_COINAGE_JAPAN_OLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x0c, "100k only" )
@@ -1095,21 +1095,21 @@ static INPUT_PORTS_START( rastsag2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS( 2 )
TAITO_B_SYSTEM_INPUT
INPUT_PORTS_END
static INPUT_PORTS_START( nastar )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_NO_COCKTAIL
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x0c, "100k only" )
@@ -1128,21 +1128,21 @@ static INPUT_PORTS_START( nastar )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS( 2 )
TAITO_B_SYSTEM_INPUT
INPUT_PORTS_END
static INPUT_PORTS_START( nastarw )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_COCKTAIL
TAITO_COINAGE_US
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x0c, "100k only" )
@@ -1161,21 +1161,21 @@ static INPUT_PORTS_START( nastarw )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS( 2 )
TAITO_B_SYSTEM_INPUT
INPUT_PORTS_END
static INPUT_PORTS_START( masterw )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_COCKTAIL
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x08, "500k, 1000k and 1500k" )
@@ -1194,24 +1194,24 @@ static INPUT_PORTS_START( masterw )
PORT_DIPSETTING( 0x80, "Space Ship" )
PORT_DIPSETTING( 0x00, "Hover Cycle" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS( 2 )
TAITO_B_SYSTEM_INPUT
INPUT_PORTS_END
static INPUT_PORTS_START( crimec )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, "Hi Score" )
PORT_DIPSETTING( 0x01, "Scribble" )
PORT_DIPSETTING( 0x00, "3 Characters" )
TAITO_DSWA_BITS_1_TO_3
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x08, "every 80k" )
@@ -1229,24 +1229,24 @@ static INPUT_PORTS_START( crimec )
PORT_DIPSETTING( 0x80, "8 Times" )
PORT_DIPSETTING( 0xc0, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS( 2 )
TAITO_B_SYSTEM_INPUT
INPUT_PORTS_END
static INPUT_PORTS_START( crimecj )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, "Hi Score" )
PORT_DIPSETTING( 0x01, "Scribble" )
PORT_DIPSETTING( 0x00, "3 Characters" )
TAITO_DSWA_BITS_1_TO_3
TAITO_COINAGE_JAPAN_OLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x08, "every 80k" )
@@ -1264,24 +1264,24 @@ static INPUT_PORTS_START( crimecj )
PORT_DIPSETTING( 0x80, "8 Times" )
PORT_DIPSETTING( 0xc0, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS( 2 )
TAITO_B_SYSTEM_INPUT
INPUT_PORTS_END
static INPUT_PORTS_START( crimecu )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, "Hi Score" )
PORT_DIPSETTING( 0x01, "Scribble" )
PORT_DIPSETTING( 0x00, "3 Characters" )
TAITO_DSWA_BITS_1_TO_3
TAITO_COINAGE_US
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x08, "every 80k" )
@@ -1299,24 +1299,24 @@ static INPUT_PORTS_START( crimecu )
PORT_DIPSETTING( 0x80, "8 Times" )
PORT_DIPSETTING( 0xc0, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS( 2 )
TAITO_B_SYSTEM_INPUT
INPUT_PORTS_END
static INPUT_PORTS_START( tetrist )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
TAITO_DSWA_BITS_1_TO_3
TAITO_COINAGE_JAPAN_OLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -1337,21 +1337,21 @@ static INPUT_PORTS_START( tetrist )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS( 2 )
TAITO_B_SYSTEM_INPUT
INPUT_PORTS_END
static INPUT_PORTS_START( ashura )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_COCKTAIL
TAITO_COINAGE_JAPAN_OLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x08, "every 100k" )
@@ -1370,21 +1370,21 @@ static INPUT_PORTS_START( ashura )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS( 2 )
TAITO_B_SYSTEM_INPUT
INPUT_PORTS_END
static INPUT_PORTS_START( ashurau )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_COCKTAIL
TAITO_COINAGE_US
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x08, "every 100k" )
@@ -1403,10 +1403,10 @@ static INPUT_PORTS_START( ashurau )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS( 2 )
TAITO_B_SYSTEM_INPUT
@@ -1458,7 +1458,7 @@ maximum credit 9 0
*/
static INPUT_PORTS_START( hitice )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, "Cabinet Style" )
PORT_DIPSETTING( 0x01, "4 Players")
PORT_DIPSETTING( 0x00, "2 Players")
@@ -1471,7 +1471,7 @@ static INPUT_PORTS_START( hitice )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_JAPAN_OLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, "Timer count" )
PORT_DIPSETTING( 0x0c, "1 sec = 58/60" )
@@ -1491,7 +1491,7 @@ static INPUT_PORTS_START( hitice )
PORT_DIPSETTING( 0x00, "99" )
PORT_DIPSETTING( 0x80, "9" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -1501,7 +1501,7 @@ static INPUT_PORTS_START( hitice )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1511,7 +1511,7 @@ static INPUT_PORTS_START( hitice )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1521,7 +1521,7 @@ static INPUT_PORTS_START( hitice )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("P3_P4") /* IN5 IN6 */
+ PORT_START("P3_P4") /* IN5 IN6 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -1541,11 +1541,11 @@ static INPUT_PORTS_START( hitice )
INPUT_PORTS_END
static INPUT_PORTS_START( rambo3 )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_NO_COCKTAIL // all 5 "unused" in manual
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -1566,17 +1566,17 @@ static INPUT_PORTS_START( rambo3 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS( 2 )
TAITO_B_SYSTEM_INPUT
INPUT_PORTS_END
static INPUT_PORTS_START( rambo3a )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
TAITO_MACHINE_NO_COCKTAIL
/* Coinage similar to US, but there are some differences */
PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coinage ) )
@@ -1590,7 +1590,7 @@ static INPUT_PORTS_START( rambo3a )
PORT_DIPSETTING( 0xc0, "Same as Start" )
PORT_DIPSETTING( 0x00, "Same as Start or 1C/1C (if Coinage 4C/3C)" )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -1611,7 +1611,7 @@ static INPUT_PORTS_START( rambo3a )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1621,7 +1621,7 @@ static INPUT_PORTS_START( rambo3a )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1631,7 +1631,7 @@ static INPUT_PORTS_START( rambo3a )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1641,16 +1641,16 @@ static INPUT_PORTS_START( rambo3a )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("TRACKX1")
+ PORT_START("TRACKX1")
PORT_BIT( 0xffff, 0x0000, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(70) PORT_KEYDELTA(30) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("TRACKY1")
+ PORT_START("TRACKY1")
PORT_BIT( 0xffff, 0x0000, IPT_TRACKBALL_X ) PORT_SENSITIVITY(70) PORT_KEYDELTA(30) PORT_PLAYER(1)
- PORT_START_TAG("TRACKX2")
+ PORT_START("TRACKX2")
PORT_BIT( 0xffff, 0x0000, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(70) PORT_KEYDELTA(30) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("TRACKY2")
+ PORT_START("TRACKY2")
PORT_BIT( 0xffff, 0x0000, IPT_TRACKBALL_X ) PORT_SENSITIVITY(70) PORT_KEYDELTA(30) PORT_PLAYER(2)
INPUT_PORTS_END
@@ -1659,7 +1659,7 @@ INPUT_PORTS_END
/* Tags below are the ones expected by TC0640FIO_r */
static INPUT_PORTS_START( pbobble ) /* Missing P3&4 controls ! */
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /*unused in test mode*/
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /*unused in test mode*/
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /*unused in test mode*/
@@ -1669,7 +1669,7 @@ static INPUT_PORTS_START( pbobble ) /* Missing P3&4 controls ! */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /*unused in test mode*/
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) /*ok*/
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1679,7 +1679,7 @@ static INPUT_PORTS_START( pbobble ) /* Missing P3&4 controls ! */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(2) /*ok*/
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_IMPULSE(2) /*ok*/
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 )
@@ -1689,7 +1689,7 @@ static INPUT_PORTS_START( pbobble ) /* Missing P3&4 controls ! */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -1699,7 +1699,7 @@ static INPUT_PORTS_START( pbobble ) /* Missing P3&4 controls ! */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /*unused in test mode*/
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1709,7 +1709,7 @@ static INPUT_PORTS_START( pbobble ) /* Missing P3&4 controls ! */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
@@ -1719,7 +1719,7 @@ static INPUT_PORTS_START( pbobble ) /* Missing P3&4 controls ! */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /*unused in test mode*/
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -1731,11 +1731,11 @@ static INPUT_PORTS_START( pbobble ) /* Missing P3&4 controls ! */
INPUT_PORTS_END
static INPUT_PORTS_START( spacedxo )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_COCKTAIL
TAITO_COINAGE_JAPAN_NEW
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, "Match Point" )
PORT_DIPSETTING( 0x08, "4" )
@@ -1754,7 +1754,7 @@ static INPUT_PORTS_START( spacedxo )
PORT_DIPSETTING( 0x80, "Double Company" )
PORT_DIPSETTING( 0x00, "Single Company" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -1764,7 +1764,7 @@ static INPUT_PORTS_START( spacedxo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1774,7 +1774,7 @@ static INPUT_PORTS_START( spacedxo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1784,7 +1784,7 @@ static INPUT_PORTS_START( spacedxo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
@@ -1794,7 +1794,7 @@ static INPUT_PORTS_START( spacedxo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START4 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
@@ -1804,7 +1804,7 @@ static INPUT_PORTS_START( spacedxo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
- PORT_START_TAG("IN5")
+ PORT_START("IN5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_IMPULSE(2)
@@ -1817,7 +1817,7 @@ INPUT_PORTS_END
/* Tags below are the ones expected by TC0640FIO_r */
static INPUT_PORTS_START( qzshowby )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /*unused in test mode*/
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /*unused in test mode*/
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /*unused in test mode*/
@@ -1827,7 +1827,7 @@ static INPUT_PORTS_START( qzshowby )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /*unused in test mode*/
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) /*ok*/
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1837,7 +1837,7 @@ static INPUT_PORTS_START( qzshowby )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(2) /*ok*/
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_IMPULSE(2) /*ok*/
- PORT_START_TAG("IN0") /* IN0 */ /*all OK*/
+ PORT_START("IN0") /* IN0 */ /*all OK*/
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 )
@@ -1847,7 +1847,7 @@ static INPUT_PORTS_START( qzshowby )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4 )
- PORT_START_TAG("IN1") /* IN 1 */ /*all OK*/
+ PORT_START("IN1") /* IN 1 */ /*all OK*/
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* IPT_START1 in test mode */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1857,7 +1857,7 @@ static INPUT_PORTS_START( qzshowby )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2 */ /*all OK*/
+ PORT_START("IN2") /* IN2 */ /*all OK*/
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
@@ -1867,7 +1867,7 @@ static INPUT_PORTS_START( qzshowby )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* IPT_START3 in test mode */
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1877,7 +1877,7 @@ static INPUT_PORTS_START( qzshowby )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(3)
@@ -1889,11 +1889,11 @@ static INPUT_PORTS_START( qzshowby )
INPUT_PORTS_END
static INPUT_PORTS_START( viofight )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_NO_COCKTAIL // all 7 "unused" in manual
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -1914,17 +1914,17 @@ static INPUT_PORTS_START( viofight )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_3_BUTTONS( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS( 2 )
TAITO_B_SYSTEM_INPUT
INPUT_PORTS_END
static INPUT_PORTS_START( silentd ) /* World Version */
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_NO_COCKTAIL /* Listed as "NOT USED" in the manual and only shown as "OFF" */
PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
@@ -1948,7 +1948,7 @@ static INPUT_PORTS_START( silentd ) /* World Version */
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, "Invulnerability (Cheat)" )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -1977,7 +1977,7 @@ static INPUT_PORTS_START( silentd ) /* World Version */
PORT_DIPSETTING( 0x40, "4 Players/1 Machine" ) /* with bit6, shows 4 separate credits */
PORT_DIPSETTING( 0x00, "4 Players/2 Machines" ) /* with bit6 shows 2 separate credits */
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -1987,7 +1987,7 @@ static INPUT_PORTS_START( silentd ) /* World Version */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1997,7 +1997,7 @@ static INPUT_PORTS_START( silentd ) /* World Version */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -2007,7 +2007,7 @@ static INPUT_PORTS_START( silentd ) /* World Version */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
@@ -2017,7 +2017,7 @@ static INPUT_PORTS_START( silentd ) /* World Version */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START4 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
@@ -2027,7 +2027,7 @@ static INPUT_PORTS_START( silentd ) /* World Version */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
- PORT_START_TAG("IN5")
+ PORT_START("IN5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(2) PORT_NAME ("Coin 3 2nd input")/*not sure if this is legal under MAME*/
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_IMPULSE(2)
@@ -2039,11 +2039,11 @@ static INPUT_PORTS_START( silentd ) /* World Version */
INPUT_PORTS_END
static INPUT_PORTS_START( silentdj )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_NO_COCKTAIL /* Listed as "NOT USED" in the manual and only shown as "OFF" */
TAITO_COINAGE_JAPAN_OLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, "Invulnerability (Cheat)" )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -2063,7 +2063,7 @@ static INPUT_PORTS_START( silentdj )
PORT_DIPSETTING( 0x40, "4 Players/1 Machine") /* with bit6, shows 4 separate credits */
PORT_DIPSETTING( 0x00, "4 Players/2 Machines") /* with bit6 shows 2 separate credits */
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -2073,7 +2073,7 @@ static INPUT_PORTS_START( silentdj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -2083,7 +2083,7 @@ static INPUT_PORTS_START( silentdj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -2093,7 +2093,7 @@ static INPUT_PORTS_START( silentdj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
@@ -2103,7 +2103,7 @@ static INPUT_PORTS_START( silentdj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START4 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
@@ -2113,7 +2113,7 @@ static INPUT_PORTS_START( silentdj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
- PORT_START_TAG("IN5")
+ PORT_START("IN5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(2) PORT_NAME ("Coin 3 2nd input")/*not sure if this is legal under MAME*/
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_IMPULSE(2)
@@ -2125,11 +2125,11 @@ static INPUT_PORTS_START( silentdj )
INPUT_PORTS_END
static INPUT_PORTS_START( selfeena )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_NO_COCKTAIL
TAITO_COINAGE_JAPAN_NEW
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x0c, "100k only" )
@@ -2148,7 +2148,7 @@ static INPUT_PORTS_START( selfeena )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -2158,7 +2158,7 @@ static INPUT_PORTS_START( selfeena )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -2168,7 +2168,7 @@ static INPUT_PORTS_START( selfeena )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -2180,11 +2180,11 @@ static INPUT_PORTS_START( selfeena )
INPUT_PORTS_END
static INPUT_PORTS_START( ryujin )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_NO_COCKTAIL
TAITO_COINAGE_JAPAN_NEW
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "1" )
@@ -2204,7 +2204,7 @@ static INPUT_PORTS_START( ryujin )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -2214,7 +2214,7 @@ static INPUT_PORTS_START( ryujin )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -2224,7 +2224,7 @@ static INPUT_PORTS_START( ryujin )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -2236,7 +2236,7 @@ static INPUT_PORTS_START( ryujin )
INPUT_PORTS_END
static INPUT_PORTS_START( sbm )
- PORT_START_TAG("DSWA") /* DSW A *///+-ok
+ PORT_START("DSWA") /* DSW A *///+-ok
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ))
@@ -2259,7 +2259,7 @@ static INPUT_PORTS_START( sbm )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* DSW B */ //+-ok
+ PORT_START("DSWB") /* DSW B */ //+-ok
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -2280,7 +2280,7 @@ static INPUT_PORTS_START( sbm )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)//sound select UP
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)//sound select DOWN
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)//ok (object test)
@@ -2290,7 +2290,7 @@ static INPUT_PORTS_START( sbm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)//BEN IN (ticket dispenser)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)//LADY ????
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )//select; ok (1P in object test)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )//start ; ok (2P in object test)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2300,7 +2300,7 @@ static INPUT_PORTS_START( sbm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT ) //ok
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) //ok
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2) //ok
diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c
index 082cbd79c83..605caa7817c 100644
--- a/src/mame/drivers/taito_f2.c
+++ b/src/mame/drivers/taito_f2.c
@@ -1751,7 +1751,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( finalb )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
/* Not sure how to handle alternate controls */
PORT_DIPNAME( 0x01, 0x01, "Alternate Controls" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
@@ -1765,7 +1765,7 @@ static INPUT_PORTS_START( finalb )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -1786,13 +1786,13 @@ static INPUT_PORTS_START( finalb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_3_BUTTONS_START( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_3_BUTTONS_START( 2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
TAITO_F2_SYSTEM_INPUT /* controls below are DIP selectable */
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) /* 1P sen.sw.? */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) /* 1P ducking? */
@@ -1809,7 +1809,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( dondokod )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1822,7 +1822,7 @@ static INPUT_PORTS_START( dondokod )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x0c, "10k and 100k" )
@@ -1841,13 +1841,13 @@ static INPUT_PORTS_START( dondokod )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS_START( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS_START( 2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
TAITO_F2_SYSTEM_INPUT
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1871,7 +1871,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( megab )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1884,7 +1884,7 @@ static INPUT_PORTS_START( megab )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x0c, "100k only" )
@@ -1903,13 +1903,13 @@ static INPUT_PORTS_START( megab )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS( 2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
TAITO_F2_SYSTEM_INPUT
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
@@ -1926,7 +1926,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( thundfox )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) // all 2 in manual
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1939,7 +1939,7 @@ static INPUT_PORTS_START( thundfox )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, "Timer" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -1959,13 +1959,13 @@ static INPUT_PORTS_START( thundfox )
PORT_DIPSETTING( 0x00, DEF_STR( Single ) )
PORT_DIPSETTING( 0x80, DEF_STR( Dual ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_3_BUTTONS_START( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_3_BUTTONS_START( 2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
TAITO_F2_SYSTEM_INPUT
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1989,7 +1989,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( cameltry )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -2002,7 +2002,7 @@ static INPUT_PORTS_START( cameltry )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_US
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, "Start remain time" )
PORT_DIPSETTING( 0x00, "35" )
@@ -2021,7 +2021,7 @@ static INPUT_PORTS_START( cameltry )
PORT_DIPSETTING( 0x80, DEF_STR( Single ) )
PORT_DIPSETTING( 0x00, DEF_STR( Dual ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2031,7 +2031,7 @@ static INPUT_PORTS_START( cameltry )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2041,17 +2041,17 @@ static INPUT_PORTS_START( cameltry )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
TAITO_F2_SYSTEM_INPUT
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("PADDLE1") /* Paddle A */
+ PORT_START("PADDLE1") /* Paddle A */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_PLAYER(1)
- PORT_START_TAG("PADDLE2") /* Paddle B */
+ PORT_START("PADDLE2") /* Paddle B */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_PLAYER(2)
INPUT_PORTS_END
@@ -2063,7 +2063,7 @@ static INPUT_PORTS_START( cameltrj )
INPUT_PORTS_END
static INPUT_PORTS_START( qtorimon )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) // all 5 in manual
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2076,7 +2076,7 @@ static INPUT_PORTS_START( qtorimon )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
TAITO_COINAGE_JAPAN_OLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -2096,7 +2096,7 @@ static INPUT_PORTS_START( qtorimon )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
@@ -2106,7 +2106,7 @@ static INPUT_PORTS_START( qtorimon )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
@@ -2116,7 +2116,7 @@ static INPUT_PORTS_START( qtorimon )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
TAITO_F2_SYSTEM_INPUT
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2125,7 +2125,7 @@ static INPUT_PORTS_START( qtorimon )
INPUT_PORTS_END
static INPUT_PORTS_START( liquidk )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -2138,7 +2138,7 @@ static INPUT_PORTS_START( liquidk )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x0c, "30k and 100k" )
@@ -2157,13 +2157,13 @@ static INPUT_PORTS_START( liquidk )
PORT_DIPSETTING( 0x80, DEF_STR( Single ) )
PORT_DIPSETTING( 0x00, DEF_STR( Dual ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS_START( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS_START( 2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
TAITO_F2_SYSTEM_INPUT
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2180,7 +2180,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mizubaku )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -2193,7 +2193,7 @@ static INPUT_PORTS_START( mizubaku )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_JAPAN_NEW
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x0c, "30k and 100k" )
@@ -2212,13 +2212,13 @@ static INPUT_PORTS_START( mizubaku )
PORT_DIPSETTING( 0x80, DEF_STR( Single ) )
PORT_DIPSETTING( 0x00, DEF_STR( Dual ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS_START( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS_START( 2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
TAITO_F2_SYSTEM_INPUT
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2227,7 +2227,7 @@ static INPUT_PORTS_START( mizubaku )
INPUT_PORTS_END
static INPUT_PORTS_START( ssi )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -2240,7 +2240,7 @@ static INPUT_PORTS_START( ssi )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, "Shields" )
PORT_DIPSETTING( 0x00, DEF_STR( None ))
@@ -2259,13 +2259,13 @@ static INPUT_PORTS_START( ssi )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS_START( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS_START( 2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
TAITO_F2_SYSTEM_INPUT
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2282,20 +2282,20 @@ INPUT_PORTS_END
static INPUT_PORTS_START( growl )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_3_BUTTONS_START( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_3_BUTTONS_START( 2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
TAITO_F2_SYSTEM_INPUT
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) //are "unused" verified from manual?
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2308,7 +2308,7 @@ static INPUT_PORTS_START( growl )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -2328,7 +2328,7 @@ static INPUT_PORTS_START( growl )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -2346,7 +2346,7 @@ static INPUT_PORTS_START( growl )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START4 )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 )
@@ -2373,7 +2373,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( pulirula )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2386,7 +2386,7 @@ static INPUT_PORTS_START( pulirula )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, "Magic" )
PORT_DIPSETTING( 0x0c, "3" )
@@ -2405,13 +2405,13 @@ static INPUT_PORTS_START( pulirula )
PORT_DIPSETTING( 0x00, DEF_STR( Single ) )
PORT_DIPSETTING( 0x80, DEF_STR( Dual ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_3_BUTTONS_START( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_3_BUTTONS_START( 2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
TAITO_F2_SYSTEM_INPUT
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2428,7 +2428,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( qzquest )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -2441,7 +2441,7 @@ static INPUT_PORTS_START( qzquest )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_JAPAN_NEW
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY //??
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -2462,7 +2462,7 @@ static INPUT_PORTS_START( qzquest )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
@@ -2472,7 +2472,7 @@ static INPUT_PORTS_START( qzquest )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
@@ -2482,7 +2482,7 @@ static INPUT_PORTS_START( qzquest )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
TAITO_F2_SYSTEM_INPUT
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2491,7 +2491,7 @@ static INPUT_PORTS_START( qzquest )
INPUT_PORTS_END
static INPUT_PORTS_START( qzchikyu )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -2504,7 +2504,7 @@ static INPUT_PORTS_START( qzchikyu )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_JAPAN_NEW
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY //??
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -2525,7 +2525,7 @@ static INPUT_PORTS_START( qzchikyu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
@@ -2535,7 +2535,7 @@ static INPUT_PORTS_START( qzchikyu )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
@@ -2545,7 +2545,7 @@ static INPUT_PORTS_START( qzchikyu )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
TAITO_F2_SYSTEM_INPUT
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2554,13 +2554,13 @@ static INPUT_PORTS_START( qzchikyu )
INPUT_PORTS_END
static INPUT_PORTS_START( footchmp )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS_START( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS_START( 2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -2570,7 +2570,7 @@ static INPUT_PORTS_START( footchmp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_TILT )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x00, "Game Over Type" ) // 2p simultaneous play
PORT_DIPSETTING( 0x01, "Both Teams' Games Over" )
PORT_DIPSETTING( 0x00, "Losing Team's Game is Over" )
@@ -2583,7 +2583,7 @@ static INPUT_PORTS_START( footchmp )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Game_Time ) )
PORT_DIPSETTING( 0x00, "1.5 Minutes" )
@@ -2602,10 +2602,10 @@ static INPUT_PORTS_START( footchmp )
PORT_DIPSETTING( 0x00, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x80, "European" )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
TAITO_JOY_UDLR_2_BUTTONS_START( 3 )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
TAITO_JOY_UDLR_2_BUTTONS_START( 4 )
INPUT_PORTS_END
@@ -2659,13 +2659,13 @@ static INPUT_PORTS_START( hthero )
INPUT_PORTS_END
static INPUT_PORTS_START( ninjak )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS_START( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS_START( 2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 )
@@ -2675,7 +2675,7 @@ static INPUT_PORTS_START( ninjak )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN4 )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) //is this verified from manual?
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2688,7 +2688,7 @@ static INPUT_PORTS_START( ninjak )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, "Cabinet Type" )
PORT_DIPSETTING( 0x0c, "2 players" )
@@ -2707,10 +2707,10 @@ static INPUT_PORTS_START( ninjak )
PORT_DIPSETTING( 0x00, "1 Player only" )
PORT_DIPSETTING( 0x80, "Multiplayer" )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
TAITO_JOY_UDLR_2_BUTTONS_START( 3 )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
TAITO_JOY_UDLR_2_BUTTONS_START( 4 )
INPUT_PORTS_END
@@ -2730,7 +2730,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( driftout )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) // all 5 in Service Mode
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2743,7 +2743,7 @@ static INPUT_PORTS_START( driftout )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_JAPAN_OLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, "Control" ) /* correct acc. to service mode */
PORT_DIPSETTING( 0x0c, DEF_STR( Joystick ) )
@@ -2763,28 +2763,28 @@ static INPUT_PORTS_START( driftout )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS_START( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* 2P not used? */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
TAITO_F2_SYSTEM_INPUT
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("PADDLE1") /* Paddle A */
+ PORT_START("PADDLE1") /* Paddle A */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("PADDLE2") /* Paddle B */
+ PORT_START("PADDLE2") /* Paddle B */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( gunfront )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) /* Listed as "Unused" */
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2797,7 +2797,7 @@ static INPUT_PORTS_START( gunfront )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x08, "10k and every 80k" )
@@ -2816,13 +2816,13 @@ static INPUT_PORTS_START( gunfront )
PORT_DIPSETTING( 0x00, DEF_STR( Single ) )
PORT_DIPSETTING( 0x80, DEF_STR( Dual ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS_START( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS_START( 2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
TAITO_F2_SYSTEM_INPUT
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2839,7 +2839,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( metalb )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2852,7 +2852,7 @@ static INPUT_PORTS_START( metalb )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x04, "80k and every 160k" )
@@ -2871,13 +2871,13 @@ static INPUT_PORTS_START( metalb )
PORT_DIPSETTING( 0x00, DEF_STR( Single ) )
PORT_DIPSETTING( 0x80, DEF_STR( Dual ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_3_BUTTONS_START( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_3_BUTTONS_START( 2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
TAITO_F2_SYSTEM_INPUT
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2894,13 +2894,13 @@ INPUT_PORTS_END
static INPUT_PORTS_START( deadconx )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS_START( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS_START( 2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service A") PORT_CODE(KEYCODE_9)
@@ -2908,7 +2908,7 @@ static INPUT_PORTS_START( deadconx )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service C") PORT_CODE(KEYCODE_MINUS)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_TILT )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -2921,7 +2921,7 @@ static INPUT_PORTS_START( deadconx )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB") /* DSW B, missing a timer speed maybe? */
+ PORT_START("DSWB") /* DSW B, missing a timer speed maybe? */
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -2951,7 +2951,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( dinorex )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) //are "unused" verified from manual?
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2964,7 +2964,7 @@ static INPUT_PORTS_START( dinorex )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, "Damage" )
PORT_DIPSETTING( 0x08, "Small" )
@@ -2984,13 +2984,13 @@ static INPUT_PORTS_START( dinorex )
PORT_DIPSETTING( 0x00, DEF_STR( Single ) )
PORT_DIPSETTING( 0x80, DEF_STR( Dual ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_3_BUTTONS_START( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_3_BUTTONS_START( 2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
TAITO_F2_SYSTEM_INPUT
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -3007,20 +3007,20 @@ INPUT_PORTS_END
static INPUT_PORTS_START( solfigtr )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_3_BUTTONS_START( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_3_BUTTONS_START( 2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
TAITO_F2_SYSTEM_INPUT
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3033,7 +3033,7 @@ static INPUT_PORTS_START( solfigtr )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -3056,7 +3056,7 @@ static INPUT_PORTS_START( solfigtr )
INPUT_PORTS_END
static INPUT_PORTS_START( koshien )
- PORT_START_TAG("DSWA") /* DSW A, one lets you control fielders ? */
+ PORT_START("DSWA") /* DSW A, one lets you control fielders ? */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3069,7 +3069,7 @@ static INPUT_PORTS_START( koshien )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_JAPAN_NEW
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, "Timer" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -3089,7 +3089,7 @@ static INPUT_PORTS_START( koshien )
PORT_DIPSETTING( 0x00, DEF_STR( Single ) )
PORT_DIPSETTING( 0x80, DEF_STR( Dual ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -3099,14 +3099,14 @@ static INPUT_PORTS_START( koshien )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_F2_SYSTEM_INPUT
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -3118,7 +3118,7 @@ static INPUT_PORTS_START( koshien )
INPUT_PORTS_END
static INPUT_PORTS_START( quizhq )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
@@ -3128,7 +3128,7 @@ static INPUT_PORTS_START( quizhq )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
@@ -3138,14 +3138,14 @@ static INPUT_PORTS_START( quizhq )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
TAITO_F2_SYSTEM_INPUT
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3158,7 +3158,7 @@ static INPUT_PORTS_START( quizhq )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_JAPAN_NEW
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, "Time" )
PORT_DIPSETTING( 0x0c, "5 seconds" )
@@ -3179,7 +3179,7 @@ static INPUT_PORTS_START( quizhq )
INPUT_PORTS_END
static INPUT_PORTS_START( qjinsei )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3192,7 +3192,7 @@ static INPUT_PORTS_START( qjinsei )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_JAPAN_NEW
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -3213,7 +3213,7 @@ static INPUT_PORTS_START( qjinsei )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
@@ -3223,7 +3223,7 @@ static INPUT_PORTS_START( qjinsei )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
@@ -3233,7 +3233,7 @@ static INPUT_PORTS_START( qjinsei )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
TAITO_F2_SYSTEM_INPUT
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -3242,7 +3242,7 @@ static INPUT_PORTS_START( qjinsei )
INPUT_PORTS_END
static INPUT_PORTS_START( qcrayon )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPUNUSED( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -3253,7 +3253,7 @@ static INPUT_PORTS_START( qcrayon )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_JAPAN_NEW
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, "Default Time" ) /* Can be affected ingame by some items and/or player location */
PORT_DIPSETTING( 0x00, "6 seconds" )
@@ -3265,7 +3265,7 @@ static INPUT_PORTS_START( qcrayon )
PORT_DIPUNUSED( 0x40, IP_ACTIVE_LOW )
PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
@@ -3275,7 +3275,7 @@ static INPUT_PORTS_START( qcrayon )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
@@ -3285,7 +3285,7 @@ static INPUT_PORTS_START( qcrayon )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
TAITO_F2_SYSTEM_INPUT
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -3294,7 +3294,7 @@ static INPUT_PORTS_START( qcrayon )
INPUT_PORTS_END
static INPUT_PORTS_START( qcrayon2 )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPUNUSED( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -3305,7 +3305,7 @@ static INPUT_PORTS_START( qcrayon2 )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_JAPAN_NEW
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPUNUSED( 0x04, IP_ACTIVE_LOW ) /* These 2 Dip Switches were designed to change the default timer */
PORT_DIPUNUSED( 0x08, IP_ACTIVE_LOW ) /* but the 10 seconds setting is duplicated 4 times in the tables */
@@ -3316,7 +3316,7 @@ static INPUT_PORTS_START( qcrayon2 )
PORT_DIPSETTING( 0x80, DEF_STR( Joystick ) )
PORT_DIPSETTING( 0x00, "4 Buttons" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
/* Joystick Control */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("DSWB",0x80,PORTCOND_EQUALS,0x80)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("DSWB",0x80,PORTCOND_EQUALS,0x80)
@@ -3336,7 +3336,7 @@ static INPUT_PORTS_START( qcrayon2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_CONDITION("DSWB",0x80,PORTCOND_EQUALS,0x00)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_CONDITION("DSWB",0x80,PORTCOND_EQUALS,0x00)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
/* Joystick Control */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("DSWB",0x80,PORTCOND_EQUALS,0x80)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("DSWB",0x80,PORTCOND_EQUALS,0x80)
@@ -3356,7 +3356,7 @@ static INPUT_PORTS_START( qcrayon2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_CONDITION("DSWB",0x80,PORTCOND_EQUALS,0x00)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_CONDITION("DSWB",0x80,PORTCOND_EQUALS,0x00)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
TAITO_F2_SYSTEM_INPUT
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -3365,7 +3365,7 @@ static INPUT_PORTS_START( qcrayon2 )
INPUT_PORTS_END
static INPUT_PORTS_START( yuyugogo )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3378,7 +3378,7 @@ static INPUT_PORTS_START( yuyugogo )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_JAPAN_NEW
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -3399,7 +3399,7 @@ static INPUT_PORTS_START( yuyugogo )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
@@ -3409,7 +3409,7 @@ static INPUT_PORTS_START( yuyugogo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
@@ -3419,7 +3419,7 @@ static INPUT_PORTS_START( yuyugogo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
TAITO_F2_SYSTEM_INPUT
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -3428,7 +3428,7 @@ static INPUT_PORTS_START( yuyugogo )
INPUT_PORTS_END
static INPUT_PORTS_START( mjnquest )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
@@ -3437,7 +3437,7 @@ static INPUT_PORTS_START( mjnquest )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
@@ -3445,7 +3445,7 @@ static INPUT_PORTS_START( mjnquest )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
@@ -3453,27 +3453,27 @@ static INPUT_PORTS_START( mjnquest )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN5")
+ PORT_START("IN5")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) // ?
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN6")
+ PORT_START("IN6")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3486,7 +3486,7 @@ static INPUT_PORTS_START( mjnquest )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_JAPAN_NEW
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -3509,18 +3509,18 @@ static INPUT_PORTS_START( mjnquest )
INPUT_PORTS_END
static INPUT_PORTS_START( yesnoj ) // apparently no test mode, though text in rom suggests printer test
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_F2_SYSTEM_INPUT
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSWA") /* DSW A ??? */
+ PORT_START("DSWA") /* DSW A ??? */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3546,7 +3546,7 @@ static INPUT_PORTS_START( yesnoj ) // apparently no test mode, though text in
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB") /* DSW B ? */
+ PORT_START("DSWB") /* DSW B ? */
PORT_DIPNAME( 0x01, 0x00, "Results Printer" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c
index c353336537d..09b7a5a39d4 100644
--- a/src/mame/drivers/taito_f3.c
+++ b/src/mame/drivers/taito_f3.c
@@ -195,7 +195,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( f3 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -205,7 +205,7 @@ static INPUT_PORTS_START( f3 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -223,7 +223,7 @@ static INPUT_PORTS_START( f3 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START4 )
- PORT_START_TAG("EEPROM")
+ PORT_START("EEPROM")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* Eprom data bit */
PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -233,13 +233,13 @@ static INPUT_PORTS_START( f3 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN4 )
- PORT_START_TAG("DIAL1")
+ PORT_START("DIAL1")
PORT_BIT( 0xfff, 0x000, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(25) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X) PORT_PLAYER(1)
- PORT_START_TAG("DIAL2")
+ PORT_START("DIAL2")
PORT_BIT( 0xfff, 0x000, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(25) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M) PORT_PLAYER(2)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
@@ -249,7 +249,7 @@ static INPUT_PORTS_START( f3 )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(4)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c
index bb81620bd80..dd745997c91 100644
--- a/src/mame/drivers/taito_h.c
+++ b/src/mame/drivers/taito_h.c
@@ -361,12 +361,12 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( syvalion )
/* 0x200000 (port 0) -> 0x102842.b (-$57be,A5) */
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_COCKTAIL
TAITO_COINAGE_JAPAN_OLD
/* 0x200000 (port 1) -> 0x102843.b (-$57bd,A5) */
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x08, "1000k" )
@@ -383,7 +383,7 @@ static INPUT_PORTS_START( syvalion )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -393,7 +393,7 @@ static INPUT_PORTS_START( syvalion )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -403,29 +403,29 @@ static INPUT_PORTS_START( syvalion )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG(P1TRACKX_PORT_TAG)
+ PORT_START(P1TRACKX_PORT_TAG)
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_RESET PORT_PLAYER(1)
- PORT_START_TAG(P1TRACKY_PORT_TAG)
+ PORT_START(P1TRACKY_PORT_TAG)
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_RESET PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG(P2TRACKX_PORT_TAG)
+ PORT_START(P2TRACKX_PORT_TAG)
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_RESET PORT_PLAYER(2)
- PORT_START_TAG(P2TRACKY_PORT_TAG)
+ PORT_START(P2TRACKY_PORT_TAG)
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_RESET PORT_REVERSE PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( recordbr )
/* 0x200000 (port 0) -> 0x1022e6.b (-$5d1a,A5) */
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_NO_COCKTAIL
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
/* 0x200000 (port 1) -> 0x1022e7.b (-$5d19,A5) */
TAITO_DIFFICULTY
PORT_DIPUNUSED( 0x04, IP_ACTIVE_LOW )
@@ -435,7 +435,7 @@ static INPUT_PORTS_START( recordbr )
PORT_DIPUNUSED( 0x40, IP_ACTIVE_LOW )
PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -445,7 +445,7 @@ static INPUT_PORTS_START( recordbr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* IPT_START3 in service mode */
@@ -455,7 +455,7 @@ static INPUT_PORTS_START( recordbr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -468,7 +468,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( dleague )
/* 0x200000 -> 0x100526.b ($526,A5) */
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Difficulty ) ) /* see notes */
PORT_DIPSETTING( 0x01, "Constant" )
PORT_DIPSETTING( 0x00, "Based on Inning" )
@@ -476,7 +476,7 @@ static INPUT_PORTS_START( dleague )
TAITO_COINAGE_JAPAN_OLD
/* 0x200002 -> 0x100527.b ($527,A5) */
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPUNUSED( 0x01, IP_ACTIVE_LOW ) /* see notes */
PORT_DIPUNUSED( 0x02, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0c, 0x0c, "Extra Credit Needed" ) /* see notes */
@@ -489,7 +489,7 @@ static INPUT_PORTS_START( dleague )
PORT_DIPUNUSED( 0x40, IP_ACTIVE_LOW )
PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -499,10 +499,10 @@ static INPUT_PORTS_START( dleague )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_DUAL_UDLR( 1, 2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c
index ddf96689b73..6b30cba27db 100644
--- a/src/mame/drivers/taito_l.c
+++ b/src/mame/drivers/taito_l.c
@@ -1087,7 +1087,7 @@ ADDRESS_MAP_END
***********************************************************/
#define TAITO_L_SYSTEM_INPUT( type, impulse ) \
- PORT_START_TAG("IN2")\
+ PORT_START("IN2")\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT ) \
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) \
PORT_BIT( 0x04, type, IPT_COIN1 ) PORT_IMPULSE(impulse) \
@@ -1098,11 +1098,11 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
static INPUT_PORTS_START( fhawk )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_COCKTAIL
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) ) // all in manual
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -1122,21 +1122,21 @@ static INPUT_PORTS_START( fhawk )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS( 2 )
TAITO_L_SYSTEM_INPUT( IP_ACTIVE_LOW, 4 )
INPUT_PORTS_END
static INPUT_PORTS_START( fhawkj )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_COCKTAIL
TAITO_COINAGE_JAPAN_OLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) ) // all in manual
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -1156,21 +1156,21 @@ static INPUT_PORTS_START( fhawkj )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS( 2 )
TAITO_L_SYSTEM_INPUT( IP_ACTIVE_LOW, 4 )
INPUT_PORTS_END
static INPUT_PORTS_START( raimais )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_COCKTAIL
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x08, "80k and 160k" )
@@ -1189,22 +1189,22 @@ static INPUT_PORTS_START( raimais )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS( 2 )
TAITO_L_SYSTEM_INPUT( IP_ACTIVE_HIGH, 1 )
INPUT_PORTS_END
static INPUT_PORTS_START( raimaisj )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_COCKTAIL
TAITO_COINAGE_JAPAN_OLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x08, "80k and 160k" )
@@ -1223,21 +1223,21 @@ static INPUT_PORTS_START( raimaisj )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS( 2 )
TAITO_L_SYSTEM_INPUT( IP_ACTIVE_HIGH, 1 )
INPUT_PORTS_END
static INPUT_PORTS_START( champwr )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_NO_COCKTAIL // all 2 in manual
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, "Time" )
PORT_DIPSETTING( 0x08, "2 minutes" )
@@ -1256,7 +1256,7 @@ static INPUT_PORTS_START( champwr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1266,7 +1266,7 @@ static INPUT_PORTS_START( champwr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1276,7 +1276,7 @@ static INPUT_PORTS_START( champwr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -1302,11 +1302,11 @@ static INPUT_PORTS_START( champwru )
INPUT_PORTS_END
static INPUT_PORTS_START( kurikint )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_COCKTAIL
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -1327,10 +1327,10 @@ static INPUT_PORTS_START( kurikint )
PORT_DIPSETTING( 0x80, "5 Times" )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_2_BUTTONS( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_2_BUTTONS( 2 )
TAITO_L_SYSTEM_INPUT( IP_ACTIVE_HIGH, 4 )
@@ -1388,7 +1388,7 @@ static INPUT_PORTS_START( kurikina )
INPUT_PORTS_END
static INPUT_PORTS_START( puzznic )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_COCKTAIL
/* There is no Coin B in the Manuals */
PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coinage ) )
@@ -1403,7 +1403,7 @@ static INPUT_PORTS_START( puzznic )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
/* Difficulty controls the Timer Speed (how many seconds are there in a minute) */
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, "Retries" )
@@ -1423,7 +1423,7 @@ static INPUT_PORTS_START( puzznic )
PORT_DIPSETTING( 0x80, "Stage reset to start/Timer reset to start" )
// PORT_DIPSETTING( 0x00, "No Use" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1433,7 +1433,7 @@ static INPUT_PORTS_START( puzznic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
@@ -1443,7 +1443,7 @@ static INPUT_PORTS_START( puzznic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START_TAG("IN2") /* Not read yet. There is no Coin_B in manual */
+ PORT_START("IN2") /* Not read yet. There is no Coin_B in manual */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1455,14 +1455,14 @@ static INPUT_PORTS_START( puzznic )
INPUT_PORTS_END
static INPUT_PORTS_START( plotting )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, "Play Mode" )
PORT_DIPSETTING( 0x00, "1 Player" )
PORT_DIPSETTING( 0x01, "2 Player" )
TAITO_DSWA_BITS_1_TO_3
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -1482,7 +1482,7 @@ static INPUT_PORTS_START( plotting )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -1492,7 +1492,7 @@ static INPUT_PORTS_START( plotting )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
@@ -1504,14 +1504,14 @@ static INPUT_PORTS_START( plotting )
INPUT_PORTS_END
static INPUT_PORTS_START( palamed )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
TAITO_DSWA_BITS_1_TO_3
TAITO_COINAGE_JAPAN_NEW
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
/* Difficulty controls how fast the dice lines fall*/
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, "Games for VS Victory" )
@@ -1531,7 +1531,7 @@ static INPUT_PORTS_START( palamed )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
@@ -1541,7 +1541,7 @@ static INPUT_PORTS_START( palamed )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1551,7 +1551,7 @@ static INPUT_PORTS_START( palamed )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1563,7 +1563,7 @@ static INPUT_PORTS_START( palamed )
INPUT_PORTS_END
static INPUT_PORTS_START( cachat )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1573,7 +1573,7 @@ static INPUT_PORTS_START( cachat )
TAITO_DSWA_BITS_2_TO_3
TAITO_COINAGE_JAPAN_NEW
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -1594,7 +1594,7 @@ static INPUT_PORTS_START( cachat )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
@@ -1604,7 +1604,7 @@ static INPUT_PORTS_START( cachat )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1614,7 +1614,7 @@ static INPUT_PORTS_START( cachat )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1626,7 +1626,7 @@ static INPUT_PORTS_START( cachat )
INPUT_PORTS_END
static INPUT_PORTS_START( tubeit )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1636,7 +1636,7 @@ static INPUT_PORTS_START( tubeit )
TAITO_DSWA_BITS_2_TO_3
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -1657,7 +1657,7 @@ static INPUT_PORTS_START( tubeit )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
@@ -1667,7 +1667,7 @@ static INPUT_PORTS_START( tubeit )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1677,7 +1677,7 @@ static INPUT_PORTS_START( tubeit )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1689,14 +1689,14 @@ static INPUT_PORTS_START( tubeit )
INPUT_PORTS_END
static INPUT_PORTS_START( horshoes )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, "Beer Frame Message" )
PORT_DIPSETTING( 0x01, "Break Time" )
PORT_DIPSETTING( 0x00, "Beer Frame" )
TAITO_DSWA_BITS_1_TO_3
TAITO_COINAGE_US /* According to the "United States Version" manual listing */
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
/* Not for sure, the CPU seems to play better when set to Hardest */
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, "Time" )
@@ -1717,7 +1717,7 @@ static INPUT_PORTS_START( horshoes )
PORT_DIPSETTING( 0x80, "2 Buttons" )
PORT_DIPSETTING( 0x00, "1 Button" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1727,7 +1727,7 @@ static INPUT_PORTS_START( horshoes )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1737,15 +1737,15 @@ static INPUT_PORTS_START( horshoes )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_START_TAG("AN0")
+ PORT_START("AN0")
PORT_BIT( 0xffff, 0x0000, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(30) PORT_REVERSE
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0xffff, 0x0000, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(30)
INPUT_PORTS_END
static INPUT_PORTS_START( plgirls )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1769,7 +1769,7 @@ static INPUT_PORTS_START( plgirls )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
/* Difficulty controls the Ball Speed */
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
@@ -1791,7 +1791,7 @@ static INPUT_PORTS_START( plgirls )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
@@ -1801,7 +1801,7 @@ static INPUT_PORTS_START( plgirls )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1811,7 +1811,7 @@ static INPUT_PORTS_START( plgirls )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1823,7 +1823,7 @@ static INPUT_PORTS_START( plgirls )
INPUT_PORTS_END
static INPUT_PORTS_START( plgirls2 )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) /* Listed as Not Used */
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1852,7 +1852,7 @@ Mode B | Coin | 1cn/4pl |on |off|
-----------------------------------
*/
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
/* Difficulty controls the number of hits requiered to destroy enemies */
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, "Time" ) /* Simply listed as "Time", what exactly does it refer to? */
@@ -1873,7 +1873,7 @@ Mode B | Coin | 1cn/4pl |on |off|
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
@@ -1883,7 +1883,7 @@ Mode B | Coin | 1cn/4pl |on |off|
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1893,7 +1893,7 @@ Mode B | Coin | 1cn/4pl |on |off|
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1905,7 +1905,7 @@ Mode B | Coin | 1cn/4pl |on |off|
INPUT_PORTS_END
static INPUT_PORTS_START( cubybop )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1918,7 +1918,7 @@ static INPUT_PORTS_START( cubybop )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_JAPAN_NEW
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -1939,7 +1939,7 @@ static INPUT_PORTS_START( cubybop )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
@@ -1949,7 +1949,7 @@ static INPUT_PORTS_START( cubybop )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1959,7 +1959,7 @@ static INPUT_PORTS_START( cubybop )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1971,11 +1971,11 @@ static INPUT_PORTS_START( cubybop )
INPUT_PORTS_END
static INPUT_PORTS_START( evilston )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_COCKTAIL
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -1994,7 +1994,7 @@ static INPUT_PORTS_START( evilston )
PORT_DIPSETTING( 0x40, DEF_STR( English ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Japanese ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
@@ -2002,13 +2002,13 @@ static INPUT_PORTS_START( evilston )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(4)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(4)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c
index 14e434b640c..d1ee23e8279 100644
--- a/src/mame/drivers/taito_x.c
+++ b/src/mame/drivers/taito_x.c
@@ -600,7 +600,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( taitox_generic )
/* The Dip Switches will be filled for each game */
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -626,7 +626,7 @@ static INPUT_PORTS_START( taitox_generic )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -652,13 +652,13 @@ static INPUT_PORTS_START( taitox_generic )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_UDLR_3_BUTTONS_START( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_UDLR_3_BUTTONS_START( 2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c
index f8e6b9ec5da..ec6c6fcdc49 100644
--- a/src/mame/drivers/taito_z.c
+++ b/src/mame/drivers/taito_z.c
@@ -2280,7 +2280,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( contcirc )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW A:1")
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, "Cockpit" ) // analogue accelerator pedal
@@ -2293,7 +2293,7 @@ static INPUT_PORTS_START( contcirc )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_WORLD_LOC(SW A)
- PORT_START_TAG("DSWB") /* DSW B */
+ PORT_START("DSWB") /* DSW B */
PORT_DIPNAME( 0x03, 0x03, "Difficulty 1 (time/speed)" ) PORT_DIPLOCATION("SW B:1,2")
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -2313,7 +2313,7 @@ static INPUT_PORTS_START( contcirc )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW B:7" )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW B:8" )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN2 )
@@ -2323,7 +2323,7 @@ static INPUT_PORTS_START( contcirc )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) /* main accel key */
- PORT_START_TAG("IN1") /* IN1: b3 not mapped: standardized on holding b4=lo gear */
+ PORT_START("IN1") /* IN1: b3 not mapped: standardized on holding b4=lo gear */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT )
@@ -2333,13 +2333,13 @@ static INPUT_PORTS_START( contcirc )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) /* main brake key */
- PORT_START_TAG("IN2") /* IN2, unused */
+ PORT_START("IN2") /* IN2, unused */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("STEER") /* IN3, "handle" i.e. steering */
+ PORT_START("STEER") /* IN3, "handle" i.e. steering */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(15) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("FAKE") /* IN4, fake allowing digital steer */
+ PORT_START("FAKE") /* IN4, fake allowing digital steer */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1)
PORT_DIPNAME( 0x10, 0x00, "Steering type" )
@@ -2355,7 +2355,7 @@ static INPUT_PORTS_START( contcrcu )
INPUT_PORTS_END
static INPUT_PORTS_START( chasehq ) // IN3-6 perhaps used with cockpit setup? //
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW A:1,2") /* US Manual states DIPS 1 & 2 "MUST REMAIN OFF" */
PORT_DIPSETTING( 0x03, "Upright / Steering Lock" )
PORT_DIPSETTING( 0x02, "Upright / No Steering Lock" )
@@ -2367,7 +2367,7 @@ static INPUT_PORTS_START( chasehq ) // IN3-6 perhaps used with cockpit setup? //
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_WORLD_LOC(SW A)
- PORT_START_TAG("DSWB") /* DSW B */
+ PORT_START("DSWB") /* DSW B */
TAITO_DIFFICULTY_LOC(SW B)
PORT_DIPNAME( 0x0c, 0x0c, "Timer Setting" ) PORT_DIPLOCATION("SW B:3,4")
PORT_DIPSETTING( 0x08, "70 Seconds" )
@@ -2387,7 +2387,7 @@ static INPUT_PORTS_START( chasehq ) // IN3-6 perhaps used with cockpit setup? //
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -2397,7 +2397,7 @@ static INPUT_PORTS_START( chasehq ) // IN3-6 perhaps used with cockpit setup? //
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) /* turbo */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2407,10 +2407,10 @@ static INPUT_PORTS_START( chasehq ) // IN3-6 perhaps used with cockpit setup? //
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2, unused */
+ PORT_START("IN2") /* IN2, unused */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("UNK1") /* IN3, ??? */
+ PORT_START("UNK1") /* IN3, ??? */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2420,7 +2420,7 @@ static INPUT_PORTS_START( chasehq ) // IN3-6 perhaps used with cockpit setup? //
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("UNK2") /* IN4, ??? */
+ PORT_START("UNK2") /* IN4, ??? */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2430,7 +2430,7 @@ static INPUT_PORTS_START( chasehq ) // IN3-6 perhaps used with cockpit setup? //
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("UNK3") /* IN5, ??? */
+ PORT_START("UNK3") /* IN5, ??? */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2440,7 +2440,7 @@ static INPUT_PORTS_START( chasehq ) // IN3-6 perhaps used with cockpit setup? //
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("UNK4") /* IN6, ??? */
+ PORT_START("UNK4") /* IN6, ??? */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2450,10 +2450,10 @@ static INPUT_PORTS_START( chasehq ) // IN3-6 perhaps used with cockpit setup? //
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("STEER") /* IN7, steering */
+ PORT_START("STEER") /* IN7, steering */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("FAKE") /* IN8, fake allowing digital steer */
+ PORT_START("FAKE") /* IN8, fake allowing digital steer */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1)
PORT_DIPNAME( 0x10, 0x00, "Steering type" )
@@ -2469,7 +2469,7 @@ static INPUT_PORTS_START( chasehqj )
INPUT_PORTS_END
static INPUT_PORTS_START( enforce )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW A:1" )
PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "SW A:2" )
PORT_SERVICE_DIPLOC( 0x04, 0x04, "SW A:3" )
@@ -2478,7 +2478,7 @@ static INPUT_PORTS_START( enforce )
PORT_DIPSETTING( 0x08, DEF_STR( On ) ) // Says SHIFT LO in test mode !?
TAITO_COINAGE_JAPAN_OLD_LOC(SW A)
- PORT_START_TAG("DSWB") /* DSW B */
+ PORT_START("DSWB") /* DSW B */
TAITO_DIFFICULTY_LOC(SW B)
PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "SW B:3" )
PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "SW B:4" )
@@ -2489,7 +2489,7 @@ static INPUT_PORTS_START( enforce )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW B:7" )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW B:8" )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN2 )
@@ -2499,7 +2499,7 @@ static INPUT_PORTS_START( enforce )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) /* Bomb */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) /* Laser */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT )
@@ -2509,12 +2509,12 @@ static INPUT_PORTS_START( enforce )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
- PORT_START_TAG("IN2") /* IN2, unused */
+ PORT_START("IN2") /* IN2, unused */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( bshark )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0x01, 0x01, "Mirror screen" ) PORT_DIPLOCATION("SW A:1") // manual says it must be off
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2525,7 +2525,7 @@ static INPUT_PORTS_START( bshark )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_US_LOC(SW A)
- PORT_START_TAG("DSWB") /* DSW B */
+ PORT_START("DSWB") /* DSW B */
TAITO_DIFFICULTY_LOC(SW B)
PORT_DIPNAME( 0x0c, 0x04, "Speed of Sight" ) PORT_DIPLOCATION("SW B:3,4")
PORT_DIPSETTING( 0x0c, "Slow" )
@@ -2537,7 +2537,7 @@ static INPUT_PORTS_START( bshark )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW B:7" )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW B:8" )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -2547,10 +2547,10 @@ static INPUT_PORTS_START( bshark )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1, unused */
+ PORT_START("IN1") /* IN1, unused */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* IN2, b2-5 affect sound num in service mode but otherwise useless (?) */
+ PORT_START("IN2") /* IN2, b2-5 affect sound num in service mode but otherwise useless (?) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -2560,16 +2560,16 @@ static INPUT_PORTS_START( bshark )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) /* "Fire" */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) /* same as "Fire" */
- PORT_START_TAG("STICKX") /* values chosen to match allowed crosshair area */
+ PORT_START("STICKX") /* values chosen to match allowed crosshair area */
PORT_BIT( 0xff, 0x00, IPT_AD_STICK_X ) PORT_MINMAX(0xcc,0x35) PORT_SENSITIVITY(20) PORT_KEYDELTA(4) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("X_ADJUST") /* declare as DIP SWITCH instead of VARIABLE REGISTER */
+ PORT_START("X_ADJUST") /* declare as DIP SWITCH instead of VARIABLE REGISTER */
TAITO_Z_ANALOG_ADJUST( "Adjust Stick H (VARIABLE REGISTER)" )
- PORT_START_TAG("STICKY") /* values chosen to match allowed crosshair area */
+ PORT_START("STICKY") /* values chosen to match allowed crosshair area */
PORT_BIT( 0xff, 0x00, IPT_AD_STICK_Y ) PORT_MINMAX(0xd5,0x32) PORT_SENSITIVITY(20) PORT_KEYDELTA(4) PORT_PLAYER(1)
- PORT_START_TAG("Y_ADJUST") /* declare as DIP SWITCH instead of VARIABLE REGISTER */
+ PORT_START("Y_ADJUST") /* declare as DIP SWITCH instead of VARIABLE REGISTER */
TAITO_Z_ANALOG_ADJUST( "Adjust Stick V (VARIABLE REGISTER)" )
INPUT_PORTS_END
@@ -2581,7 +2581,7 @@ static INPUT_PORTS_START( bsharkj )
INPUT_PORTS_END
static INPUT_PORTS_START( sci )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW A:1")
PORT_DIPSETTING( 0x01, "Cockpit" )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
@@ -2592,7 +2592,7 @@ static INPUT_PORTS_START( sci )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_WORLD_LOC(SW A)
- PORT_START_TAG("DSWB") /* DSW B */
+ PORT_START("DSWB") /* DSW B */
TAITO_DIFFICULTY_LOC(SW B)
PORT_DIPNAME( 0x0c, 0x0c, "Timer Setting" ) PORT_DIPLOCATION("SW B:3,4")
PORT_DIPSETTING( 0x08, "70 Seconds" )
@@ -2612,7 +2612,7 @@ static INPUT_PORTS_START( sci )
PORT_DIPSETTING( 0x80, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x00, DEF_STR( Low ) )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) /* fire */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -2622,7 +2622,7 @@ static INPUT_PORTS_START( sci )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) /* turbo */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) /* "center" */
@@ -2632,13 +2632,13 @@ static INPUT_PORTS_START( sci )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2, unused */
+ PORT_START("IN2") /* IN2, unused */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("STEER") /* IN3, steering */
+ PORT_START("STEER") /* IN3, steering */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("FAKE") /* IN4, fake allowing digital steer */
+ PORT_START("FAKE") /* IN4, fake allowing digital steer */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1)
PORT_DIPNAME( 0x10, 0x00, "Steering type" )
@@ -2661,7 +2661,7 @@ static INPUT_PORTS_START( scij )
INPUT_PORTS_END
static INPUT_PORTS_START( nightstr )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW A:1")
PORT_DIPSETTING( 0x01, "Cockpit" )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
@@ -2672,7 +2672,7 @@ static INPUT_PORTS_START( nightstr )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_WORLD_LOC(SW A)
- PORT_START_TAG("DSWB") /* DSW B */
+ PORT_START("DSWB") /* DSW B */
TAITO_DIFFICULTY_LOC(SW B)
PORT_DIPNAME( 0x0c, 0x0c, "Bonus Shields" ) PORT_DIPLOCATION("SW B:3,4")
PORT_DIPSETTING( 0x08, "3" )
@@ -2691,7 +2691,7 @@ static INPUT_PORTS_START( nightstr )
PORT_DIPSETTING( 0x80, "7 Shots / Second" )
PORT_DIPSETTING( 0x00, "10 Shots / Second" )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2701,10 +2701,10 @@ static INPUT_PORTS_START( nightstr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_TILT )
- PORT_START_TAG("IN1") /* IN1, unused */
+ PORT_START("IN1") /* IN1, unused */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -2714,16 +2714,16 @@ static INPUT_PORTS_START( nightstr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_START_TAG("STICKX")
+ PORT_START("STICKX")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(60) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("STICKY")
+ PORT_START("STICKY")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(60) PORT_KEYDELTA(15) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("X_ADJUST") /* declare as DIP SWITCH instead of VARIABLE REGISTER */
+ PORT_START("X_ADJUST") /* declare as DIP SWITCH instead of VARIABLE REGISTER */
TAITO_Z_ANALOG_ADJUST( "Adjust Stick H (VARIABLE REGISTER)" )
- PORT_START_TAG("Y_ADJUST") /* declare as DIP SWITCH instead of VARIABLE REGISTER */
+ PORT_START("Y_ADJUST") /* declare as DIP SWITCH instead of VARIABLE REGISTER */
TAITO_Z_ANALOG_ADJUST( "Adjust Stick V (VARIABLE REGISTER)" )
INPUT_PORTS_END
@@ -2742,7 +2742,7 @@ static INPUT_PORTS_START( nghtstru )
INPUT_PORTS_END
static INPUT_PORTS_START( aquajack )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0x80, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW A:1")
PORT_DIPSETTING( 0x80, "Cockpit" )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
@@ -2762,7 +2762,7 @@ static INPUT_PORTS_START( aquajack )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_4C ) ) /* 2 Coins to Continue */
PORT_DIPSETTING( 0x00, DEF_STR( 1C_6C ) ) /* 3 Coins to Continue */
- PORT_START_TAG("DSWB") /* DSW B */
+ PORT_START("DSWB") /* DSW B */
PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW B:2,1")
PORT_DIPSETTING( 0x40, DEF_STR( Easy ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Normal ) )
@@ -2788,7 +2788,7 @@ static INPUT_PORTS_START( aquajack )
/* PORT_DIPSETTING( 0x01, "Normal Game" ) */
/* PORT_DIPSETTING( 0x00, "Endless Game" ) */
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -2798,7 +2798,7 @@ static INPUT_PORTS_START( aquajack )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -2808,7 +2808,7 @@ static INPUT_PORTS_START( aquajack )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2, what is it ??? */
+ PORT_START("IN2") /* IN2, what is it ??? */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(1)
INPUT_PORTS_END
@@ -2829,7 +2829,7 @@ static INPUT_PORTS_START( aquajckj )
INPUT_PORTS_END
static INPUT_PORTS_START( spacegun )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW A:1" ) // Manual says Always Off
PORT_DIPNAME( 0x02, 0x02, "Always have gunsight power up" ) PORT_DIPLOCATION("SW A:2")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -2840,7 +2840,7 @@ static INPUT_PORTS_START( spacegun )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_WORLD_LOC(SW A)
- PORT_START_TAG("DSWB") /* DSW B */
+ PORT_START("DSWB") /* DSW B */
TAITO_DIFFICULTY_LOC(SW B)
PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "SW B:3" ) // Manual lists dips 3 through 6 and 8 as Always off
PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "SW B:4" )
@@ -2853,7 +2853,7 @@ static INPUT_PORTS_START( spacegun )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -2863,10 +2863,10 @@ static INPUT_PORTS_START( spacegun )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2)
- PORT_START_TAG("IN1") /* IN1, unused */
+ PORT_START("IN1") /* IN1, unused */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -2876,21 +2876,21 @@ static INPUT_PORTS_START( spacegun )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("STICKX1")
+ PORT_START("STICKX1")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(22) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("STICKY1")
+ PORT_START("STICKY1")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(22) PORT_PLAYER(1)
- PORT_START_TAG("STICKX2")
+ PORT_START("STICKX2")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(22) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("STICKY2")
+ PORT_START("STICKY2")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(22) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( dblaxle )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW A:1" )
PORT_DIPNAME( 0x02, 0x02, "Gear shift" ) PORT_DIPLOCATION("SW A:2")
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -2901,7 +2901,7 @@ static INPUT_PORTS_START( dblaxle )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_US_LOC(SW A)
- PORT_START_TAG("DSWB") /* DSW B */
+ PORT_START("DSWB") /* DSW B */
TAITO_DIFFICULTY_LOC(SW B)
PORT_DIPNAME( 0x04, 0x00, "Multi-machine hookup ?" ) PORT_DIPLOCATION("SW B:3") // doesn't boot if on
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -2916,7 +2916,7 @@ static INPUT_PORTS_START( dblaxle )
PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW B:7" )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW B:8" )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) /* shift */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -2926,7 +2926,7 @@ static INPUT_PORTS_START( dblaxle )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) /* "back" */
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) /* nitro */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) /* "center" */
@@ -2936,13 +2936,13 @@ static INPUT_PORTS_START( dblaxle )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2, unused */
+ PORT_START("IN2") /* IN2, unused */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("STEER") /* IN3, steering */
+ PORT_START("STEER") /* IN3, steering */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(40) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("FAKE") /* IN4, fake allowing digital steer */
+ PORT_START("FAKE") /* IN4, fake allowing digital steer */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1)
PORT_DIPNAME( 0x10, 0x00, "Steering type" )
diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c
index 684c0aeb380..c53c5e311ca 100644
--- a/src/mame/drivers/taitoair.c
+++ b/src/mame/drivers/taitoair.c
@@ -431,14 +431,14 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( topland )
/* 0xa00200 -> 0x0c0d7c (-$7285,A5) */
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPUNUSED_DIPLOC( 0x01, IP_ACTIVE_LOW, "SWA:1" )
PORT_DIPUNUSED_DIPLOC( 0x02, IP_ACTIVE_LOW, "SWA:2" )
TAITO_DSWA_BITS_2_TO_3_LOC(SWA)
TAITO_COINAGE_WORLD_LOC(SWA)
/* 0xa00202 -> 0x0c0d7e (-$7283,A5) */
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY_LOC(SWA)
PORT_DIPUNUSED_DIPLOC( 0x04, IP_ACTIVE_LOW, "SWB:3" )
PORT_DIPUNUSED_DIPLOC( 0x08, IP_ACTIVE_LOW, "SWB:4" )
@@ -447,7 +447,7 @@ static INPUT_PORTS_START( topland )
PORT_DIPUNUSED_DIPLOC( 0x40, IP_ACTIVE_LOW, "SWB:7" )
PORT_DIPUNUSED_DIPLOC( 0x80, IP_ACTIVE_LOW, "SWB:8" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -457,7 +457,7 @@ static INPUT_PORTS_START( topland )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) /* "door" (!) */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) /* slot down */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) /* slot up */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) /* handle */
@@ -467,7 +467,7 @@ static INPUT_PORTS_START( topland )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Freeze") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
/* The range of these sticks reflects the range test mode displays.
@@ -475,19 +475,19 @@ static INPUT_PORTS_START( topland )
in the stick_r routines. And fake DSW with self-centering option
to make keyboard control feasible! */
- PORT_START_TAG(STICK1_PORT_TAG)
+ PORT_START(STICK1_PORT_TAG)
PORT_BIT( 0xffff, 0x0000, IPT_AD_STICK_X ) PORT_MINMAX(0xf800,0x7ff) PORT_SENSITIVITY(30) PORT_KEYDELTA(40) PORT_PLAYER(1)
- PORT_START_TAG(STICK2_PORT_TAG)
+ PORT_START(STICK2_PORT_TAG)
PORT_BIT( 0xffff, 0x0000, IPT_AD_STICK_Y ) PORT_MINMAX(0xf800,0x7ff) PORT_SENSITIVITY(30) PORT_KEYDELTA(40) PORT_PLAYER(1)
- PORT_START_TAG(STICK3_PORT_TAG)
+ PORT_START(STICK3_PORT_TAG)
PORT_BIT( 0xffff, 0x0000, IPT_AD_STICK_Y ) PORT_MINMAX(0xf800,0x7ff) PORT_SENSITIVITY(30) PORT_KEYDELTA(40) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( ainferno )
/* 0xa00200 -> 0x0c0003.b (-$7ffd,A5) */
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, "Moving Control" ) PORT_DIPLOCATION("SWA:1")
PORT_DIPSETTING( 0x01, "Upright/Cockpit" )
PORT_DIPSETTING( 0x00, "DX Moving Only" )
@@ -498,7 +498,7 @@ static INPUT_PORTS_START( ainferno )
TAITO_COINAGE_US_LOC(SWA)
/* 0xa00202 -> 0x0c0004.b (-$7ffc,A5) */
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY_LOC(SWA)
PORT_DIPNAME( 0x0c, 0x0c, "Timer Length" ) PORT_DIPLOCATION("SWB:3,4")
PORT_DIPSETTING( 0x08, DEF_STR( Easy ) )
@@ -512,7 +512,7 @@ static INPUT_PORTS_START( ainferno )
PORT_DIPUNUSED_DIPLOC( 0x40, IP_ACTIVE_LOW, "SWB:7" )
PORT_DIPUNUSED_DIPLOC( 0x80, IP_ACTIVE_LOW, "SWB:8" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -522,7 +522,7 @@ static INPUT_PORTS_START( ainferno )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) /* lever */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) /* handle x */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) /* handle y */
@@ -532,7 +532,7 @@ static INPUT_PORTS_START( ainferno )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Freeze") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
/* The range of these sticks reflects the range test mode displays.
@@ -540,13 +540,13 @@ static INPUT_PORTS_START( ainferno )
in the stick_r routines. And fake DSW with self-centering option
to make keyboard control feasible! */
- PORT_START_TAG(STICK1_PORT_TAG)
+ PORT_START(STICK1_PORT_TAG)
PORT_BIT( 0xffff, 0x0000, IPT_AD_STICK_X ) PORT_MINMAX(0xf800,0x7ff) PORT_SENSITIVITY(30) PORT_KEYDELTA(40) PORT_PLAYER(1)
- PORT_START_TAG(STICK2_PORT_TAG)
+ PORT_START(STICK2_PORT_TAG)
PORT_BIT( 0xffff, 0x0000, IPT_AD_STICK_Y ) PORT_MINMAX(0xf800,0x7ff) PORT_SENSITIVITY(30) PORT_KEYDELTA(40) PORT_PLAYER(1)
- PORT_START_TAG(STICK3_PORT_TAG)
+ PORT_START(STICK3_PORT_TAG)
PORT_BIT( 0xffff, 0x0000, IPT_AD_STICK_Y ) PORT_MINMAX(0xf800,0x7ff) PORT_SENSITIVITY(30) PORT_KEYDELTA(40) PORT_PLAYER(2)
INPUT_PORTS_END
diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c
index fa3821568bb..ba770b426e5 100644
--- a/src/mame/drivers/taitojc.c
+++ b/src/mame/drivers/taitojc.c
@@ -1085,7 +1085,7 @@ ADDRESS_MAP_END
#ifdef UNUSED_DEFINITION
static INPUT_PORTS_START( taitojc )
- PORT_START_TAG("COINS")
+ PORT_START("COINS")
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_COIN4)
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_COIN3)
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_COIN2)
@@ -1093,7 +1093,7 @@ static INPUT_PORTS_START( taitojc )
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE1 )
//PORT_SERVICE(0x02, 0x00)
- PORT_START_TAG("START")
+ PORT_START("START")
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_START4)
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_START3)
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_START2)
@@ -1103,10 +1103,10 @@ static INPUT_PORTS_START( taitojc )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_TILT)
- PORT_START_TAG("UNUSED")
+ PORT_START("UNUSED")
PORT_BIT(0xff, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_START_TAG("BUTTONS")
+ PORT_START("BUTTONS")
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON1)
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON2)
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_BUTTON3)
@@ -1119,22 +1119,22 @@ INPUT_PORTS_END
#endif
static INPUT_PORTS_START( dendeg )
- PORT_START_TAG("COINS")
+ PORT_START("COINS")
PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_COIN1)
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE1 )
- PORT_START_TAG("START")
+ PORT_START("START")
PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_START1)
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_TILT)
- PORT_START_TAG("UNUSED")
+ PORT_START("UNUSED")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON7) // Horn
PORT_BIT(0xfe, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_START_TAG("BUTTONS")
+ PORT_START("BUTTONS")
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON6) // Mascon 5
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_BUTTON4) // Mascon 3
@@ -1144,46 +1144,46 @@ static INPUT_PORTS_START( dendeg )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_BUTTON3) // Mascon 2
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1) // Mascon 0
- PORT_START_TAG("ANALOG1") // Brake
+ PORT_START("ANALOG1") // Brake
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
INPUT_PORTS_END
static INPUT_PORTS_START( landgear )
- PORT_START_TAG("COINS")
+ PORT_START("COINS")
PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_COIN1)
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE1 )
- PORT_START_TAG("START")
+ PORT_START("START")
PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_START1)
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_TILT)
- PORT_START_TAG("UNUSED")
+ PORT_START("UNUSED")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1) // View button
PORT_BIT(0xfe, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_START_TAG("BUTTONS")
+ PORT_START("BUTTONS")
PORT_BIT(0xff, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_START_TAG("ANALOG1") // Lever X
+ PORT_START("ANALOG1") // Lever X
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0xff, 0x00) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
- PORT_START_TAG("ANALOG2") // Lever Y
+ PORT_START("ANALOG2") // Lever Y
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(0xff, 0x00) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
- PORT_START_TAG("ANALOG3") // Throttle
+ PORT_START("ANALOG3") // Throttle
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
INPUT_PORTS_END
static INPUT_PORTS_START( sidebs )
- PORT_START_TAG("COINS")
+ PORT_START("COINS")
PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_COIN1)
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE1 )
- PORT_START_TAG("START")
+ PORT_START("START")
PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_START1)
PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_SERVICE3)
@@ -1191,33 +1191,33 @@ static INPUT_PORTS_START( sidebs )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_TILT)
- PORT_START_TAG("UNUSED")
+ PORT_START("UNUSED")
PORT_BIT(0xfe, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1) // View button
- PORT_START_TAG("BUTTONS")
+ PORT_START("BUTTONS")
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_BUTTON2) // Shift down
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON3) // Shift up
PORT_BIT(0xfc, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_START_TAG("ANALOG1") // Steering
+ PORT_START("ANALOG1") // Steering
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
- PORT_START_TAG("ANALOG2") // Acceleration
+ PORT_START("ANALOG2") // Acceleration
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
- PORT_START_TAG("ANALOG3") // Brake
+ PORT_START("ANALOG3") // Brake
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
INPUT_PORTS_END
// TODO
static INPUT_PORTS_START( dangcurv )
- PORT_START_TAG("COINS")
+ PORT_START("COINS")
PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_COIN1)
PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE1 )
- PORT_START_TAG("START")
+ PORT_START("START")
PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_START1)
PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_SERVICE3)
@@ -1225,22 +1225,22 @@ static INPUT_PORTS_START( dangcurv )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_TILT)
- PORT_START_TAG("UNUSED")
+ PORT_START("UNUSED")
PORT_BIT(0xfe, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1) // View button
- PORT_START_TAG("BUTTONS")
+ PORT_START("BUTTONS")
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_BUTTON2) // Shift down
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON3) // Shift up
PORT_BIT(0xfc, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_START_TAG("ANALOG1") // Steering
+ PORT_START("ANALOG1") // Steering
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
- PORT_START_TAG("ANALOG2") // Acceleration
+ PORT_START("ANALOG2") // Acceleration
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
- PORT_START_TAG("ANALOG3") // Brake
+ PORT_START("ANALOG3") // Brake
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
INPUT_PORTS_END
diff --git a/src/mame/drivers/taitosj.c b/src/mame/drivers/taitosj.c
index a924740541f..04cb87f8bfe 100644
--- a/src/mame/drivers/taitosj.c
+++ b/src/mame/drivers/taitosj.c
@@ -400,7 +400,7 @@ ADDRESS_MAP_END
PORT_DIPSETTING( 0x70, DEF_STR( 1C_8C ) )
#define COMMON_IN0\
- PORT_START_TAG("IN0")\
+ PORT_START("IN0")\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY\
@@ -411,7 +411,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
#define COMMON_IN1\
- PORT_START_TAG("IN1")\
+ PORT_START("IN1")\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL\
@@ -422,7 +422,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
#define COMMON_IN2\
- PORT_START_TAG("IN2")\
+ PORT_START("IN2")\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )\
@@ -433,7 +433,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
#define COMMON_IN3(coin3state)\
- PORT_START_TAG("IN3") /* Service */\
+ PORT_START("IN3") /* Service */\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )\
@@ -444,7 +444,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
#define WWEST_INPUT1\
- PORT_START_TAG("IN0")\
+ PORT_START("IN0")\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT ) PORT_8WAY\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_8WAY\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_8WAY\
@@ -453,7 +453,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )\
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )\
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )\
- PORT_START_TAG("IN1")\
+ PORT_START("IN1")\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT ) PORT_8WAY PORT_COCKTAIL\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_8WAY PORT_COCKTAIL\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_8WAY PORT_COCKTAIL\
@@ -464,7 +464,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
#define WWEST_INPUT2\
- PORT_START_TAG("IN3") /* Service */\
+ PORT_START("IN3") /* Service */\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_8WAY\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_8WAY\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_8WAY\
@@ -473,7 +473,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_TILT )\
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )\
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )\
- PORT_START_TAG("IN4")\
+ PORT_START("IN4")\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_8WAY PORT_COCKTAIL\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_8WAY PORT_COCKTAIL\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_8WAY PORT_COCKTAIL\
@@ -489,11 +489,11 @@ static INPUT_PORTS_START( spaceskr )
COMMON_IN3(IP_ACTIVE_HIGH)
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(input_port_4_f0_r, 0) // from sound CPU
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -516,10 +516,10 @@ static INPUT_PORTS_START( spaceskr )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2") /* Coinage */
+ PORT_START("DSW2") /* Coinage */
DSW2_PORT
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -547,7 +547,7 @@ static INPUT_PORTS_START( spaceskr )
INPUT_PORTS_END
static INPUT_PORTS_START( spacecr )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -557,7 +557,7 @@ static INPUT_PORTS_START( spacecr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -571,11 +571,11 @@ static INPUT_PORTS_START( spacecr )
COMMON_IN3(IP_ACTIVE_LOW)
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(input_port_4_f0_r, 0) // from sound CPU
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -600,10 +600,10 @@ static INPUT_PORTS_START( spacecr )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* Coinage */
+ PORT_START("DSW2") /* Coinage */
DSW2_PORT
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -631,7 +631,7 @@ static INPUT_PORTS_START( spacecr )
INPUT_PORTS_END
static INPUT_PORTS_START( junglek )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -641,7 +641,7 @@ static INPUT_PORTS_START( junglek )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -655,11 +655,11 @@ static INPUT_PORTS_START( junglek )
COMMON_IN3(IP_ACTIVE_HIGH)
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(input_port_4_f0_r, 0) // from sound CPU
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Finish Bonus" )
PORT_DIPSETTING( 0x03, DEF_STR( None ) )
PORT_DIPSETTING( 0x02, "Timer x1" )
@@ -681,10 +681,10 @@ static INPUT_PORTS_START( junglek )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2") /* Coinage */
+ PORT_START("DSW2") /* Coinage */
DSW2_PORT
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x02, "10000" )
PORT_DIPSETTING( 0x01, "20000" )
@@ -719,11 +719,11 @@ static INPUT_PORTS_START( piratpet )
COMMON_IN3(IP_ACTIVE_HIGH)
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(input_port_4_f0_r, 0) // from sound CPU
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Finish Bonus" )
PORT_DIPSETTING( 0x03, DEF_STR( None ) )
PORT_DIPSETTING( 0x02, "Timer x1" )
@@ -745,10 +745,10 @@ static INPUT_PORTS_START( piratpet )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2") /* Coinage */
+ PORT_START("DSW2") /* Coinage */
DSW2_PORT
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x02, "10000" )
PORT_DIPSETTING( 0x01, "20000" )
@@ -775,7 +775,7 @@ static INPUT_PORTS_START( piratpet )
INPUT_PORTS_END
static INPUT_PORTS_START( alpine )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -785,7 +785,7 @@ static INPUT_PORTS_START( alpine )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -795,7 +795,7 @@ static INPUT_PORTS_START( alpine )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x1e, 0x00, IPT_UNUSED ) /* protection read */
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -804,11 +804,11 @@ static INPUT_PORTS_START( alpine )
COMMON_IN3(IP_ACTIVE_LOW) //Tilt flips screen
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(input_port_4_f0_r, 0) // from sound CPU
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Jump Bonus" )
PORT_DIPSETTING( 0x00, "500-1500" )
PORT_DIPSETTING( 0x01, "800-2000" )
@@ -830,10 +830,10 @@ static INPUT_PORTS_START( alpine )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2") /* Coinage */
+ PORT_START("DSW2") /* Coinage */
DSW2_PORT
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x03, 0x03, "1st Extended Time" )
PORT_DIPSETTING( 0x00, "10k" )
PORT_DIPSETTING( 0x01, "15k" )
@@ -860,7 +860,7 @@ static INPUT_PORTS_START( alpine )
INPUT_PORTS_END
static INPUT_PORTS_START( alpinea )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -870,7 +870,7 @@ static INPUT_PORTS_START( alpinea )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -880,7 +880,7 @@ static INPUT_PORTS_START( alpinea )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0f, 0x00, IPT_UNUSED ) /* protection read */
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -889,11 +889,11 @@ static INPUT_PORTS_START( alpinea )
COMMON_IN3(IP_ACTIVE_LOW) //Tilt flips screen
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(input_port_4_f0_r, 0) // from sound CPU
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Jump Bonus" )
PORT_DIPSETTING( 0x00, "500-1500" )
PORT_DIPSETTING( 0x01, "800-2000" )
@@ -913,10 +913,10 @@ static INPUT_PORTS_START( alpinea )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2") /* Coinage */
+ PORT_START("DSW2") /* Coinage */
DSW2_PORT
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x03, 0x03, "1st Extended Time" )
PORT_DIPSETTING( 0x00, "10k" )
PORT_DIPSETTING( 0x01, "15k" )
@@ -943,7 +943,7 @@ static INPUT_PORTS_START( alpinea )
INPUT_PORTS_END
static INPUT_PORTS_START( timetunl )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -953,7 +953,7 @@ static INPUT_PORTS_START( timetunl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -967,11 +967,11 @@ static INPUT_PORTS_START( timetunl )
COMMON_IN3(IP_ACTIVE_LOW)
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(input_port_4_f0_r, 0) // from sound CPU
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -996,10 +996,10 @@ static INPUT_PORTS_START( timetunl )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2") /* Coinage */
+ PORT_START("DSW2") /* Coinage */
DSW2_PORT
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1029,7 +1029,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( wwestern )
WWEST_INPUT1
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x1c, 0x18, IPT_UNUSED ) /* protection read, the game resets after a while without it */
@@ -1039,7 +1039,7 @@ static INPUT_PORTS_START( wwestern )
WWEST_INPUT2
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x03, "10000" )
PORT_DIPSETTING( 0x02, "30000" )
@@ -1061,10 +1061,10 @@ static INPUT_PORTS_START( wwestern )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2") /* Coinage */
+ PORT_START("DSW2") /* Coinage */
DSW2_PORT
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1094,7 +1094,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( frontlin )
WWEST_INPUT1
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1106,7 +1106,7 @@ static INPUT_PORTS_START( frontlin )
WWEST_INPUT2
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x03, "10000" )
PORT_DIPSETTING( 0x02, "20000" )
@@ -1128,10 +1128,10 @@ static INPUT_PORTS_START( frontlin )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2") /* Coinage */
+ PORT_START("DSW2") /* Coinage */
DSW2_PORT
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1167,11 +1167,11 @@ static INPUT_PORTS_START( elevator )
COMMON_IN3(IP_ACTIVE_HIGH)
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(input_port_4_f0_r, 0) // from sound CPU
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x03, "10000" )
PORT_DIPSETTING( 0x02, "15000" )
@@ -1195,10 +1195,10 @@ static INPUT_PORTS_START( elevator )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2") /* Coinage */
+ PORT_START("DSW2") /* Coinage */
DSW2_PORT
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easiest ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
@@ -1227,7 +1227,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( tinstar )
WWEST_INPUT1
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1237,7 +1237,7 @@ static INPUT_PORTS_START( tinstar )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN3") /* Service */
+ PORT_START("IN3") /* Service */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_8WAY
@@ -1247,14 +1247,14 @@ static INPUT_PORTS_START( tinstar )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(input_port_4_f0_r, 0) // from sound CPU
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Bonus Life?" )
PORT_DIPSETTING( 0x03, "10000?" )
PORT_DIPSETTING( 0x02, "20000?" )
@@ -1278,10 +1278,10 @@ static INPUT_PORTS_START( tinstar )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2") /* Coinage */
+ PORT_START("DSW2") /* Coinage */
DSW2_PORT
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1309,7 +1309,7 @@ static INPUT_PORTS_START( tinstar )
INPUT_PORTS_END
static INPUT_PORTS_START( waterski )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1319,7 +1319,7 @@ static INPUT_PORTS_START( waterski )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1333,11 +1333,11 @@ static INPUT_PORTS_START( waterski )
COMMON_IN3(IP_ACTIVE_HIGH)
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(input_port_4_f0_r, 0) // from sound CPU
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1362,10 +1362,10 @@ static INPUT_PORTS_START( waterski )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2") /* Coinage */
+ PORT_START("DSW2") /* Coinage */
DSW2_PORT
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1393,7 +1393,7 @@ static INPUT_PORTS_START( waterski )
INPUT_PORTS_END
static INPUT_PORTS_START( bioatack )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -1403,7 +1403,7 @@ static INPUT_PORTS_START( bioatack )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -1413,7 +1413,7 @@ static INPUT_PORTS_START( bioatack )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -1422,11 +1422,11 @@ static INPUT_PORTS_START( bioatack )
COMMON_IN3(IP_ACTIVE_LOW)
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(input_port_4_f0_r, 0) // from sound CPU
- PORT_START_TAG("DSW1") /* d50a */
+ PORT_START("DSW1") /* d50a */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x03, "5000" )
PORT_DIPSETTING( 0x02, "10000" )
@@ -1450,10 +1450,10 @@ static INPUT_PORTS_START( bioatack )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2") /* Coinage */
+ PORT_START("DSW2") /* Coinage */
DSW2_PORT
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1489,11 +1489,11 @@ static INPUT_PORTS_START( sfposeid )
COMMON_IN3(IP_ACTIVE_HIGH)
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(input_port_4_f0_r, 0) // from sound CPU
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1518,10 +1518,10 @@ static INPUT_PORTS_START( sfposeid )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2") /* Coinage */
+ PORT_START("DSW2") /* Coinage */
DSW2_PORT
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1557,11 +1557,11 @@ static INPUT_PORTS_START( hwrace )
COMMON_IN3(IP_ACTIVE_HIGH)
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(input_port_4_f0_r, 0) // from sound CPU
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1585,10 +1585,10 @@ static INPUT_PORTS_START( hwrace )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2") /* Coinage */
+ PORT_START("DSW2") /* Coinage */
DSW2_PORT
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x03, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, "0" )
PORT_DIPSETTING( 0x01, "1" )
@@ -1615,17 +1615,17 @@ static INPUT_PORTS_START( hwrace )
INPUT_PORTS_END
static INPUT_PORTS_START( kikstart )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1635,7 +1635,7 @@ static INPUT_PORTS_START( kikstart )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN3") /* Service */
+ PORT_START("IN3") /* Service */
PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(kikstart_gear_r, (void *)0)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* needs to be 0, otherwise cannot shift */
@@ -1644,13 +1644,13 @@ static INPUT_PORTS_START( kikstart )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(kikstart_gear_r, (void *)1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* needs to be 0, otherwise cannot shift */
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME(0x03, 0x01, "Gate Bonus" )
PORT_DIPSETTING( 0x00, "5k Points" )
PORT_DIPSETTING( 0x01, "10k Points" )
@@ -1672,10 +1672,10 @@ static INPUT_PORTS_START( kikstart )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW2") /* Coinage */
+ PORT_START("DSW2") /* Coinage */
DSW2_PORT
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x08, 0x08, "Control Type" )
PORT_DIPSETTING( 0x08, "Revolve" )
PORT_DIPSETTING( 0x00, "Buttons" )
@@ -1693,12 +1693,12 @@ static INPUT_PORTS_START( kikstart )
PORT_DIPSETTING( 0x00, "A only" )
/* fake for handling the gears */
- PORT_START_TAG("GEARP1")
+ PORT_START("GEARP1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("P1 1st Gear")
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("P1 2nd Gear")
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("P1 3rd Gear")
- PORT_START_TAG("GEARP2")
+ PORT_START("GEARP2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("P2 1st Gear") PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("P2 2nd Gear") PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("P2 3rd Gear") PORT_COCKTAIL
diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c
index 53ba01b3466..0ebca273423 100644
--- a/src/mame/drivers/taitowlf.c
+++ b/src/mame/drivers/taitowlf.c
@@ -488,25 +488,25 @@ GFXDECODE_END
PORT_BIT( bit, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(text) PORT_CODE(key1)
static INPUT_PORTS_START(taitowlf)
- PORT_START_TAG("pc_keyboard_0")
+ PORT_START("pc_keyboard_0")
PORT_BIT ( 0x0001, 0x0000, IPT_UNUSED ) /* unused scancode 0 */
AT_KEYB_HELPER( 0x0002, "Esc", KEYCODE_Q ) /* Esc 01 81 */
- PORT_START_TAG("pc_keyboard_1")
+ PORT_START("pc_keyboard_1")
AT_KEYB_HELPER( 0x0020, "Y", KEYCODE_Y ) /* Y 15 95 */
AT_KEYB_HELPER( 0x1000, "Enter", KEYCODE_ENTER ) /* Enter 1C 9C */
- PORT_START_TAG("pc_keyboard_2")
+ PORT_START("pc_keyboard_2")
- PORT_START_TAG("pc_keyboard_3")
+ PORT_START("pc_keyboard_3")
AT_KEYB_HELPER( 0x0002, "N", KEYCODE_N ) /* N 31 B1 */
AT_KEYB_HELPER( 0x0800, "F1", KEYCODE_S ) /* F1 3B BB */
- PORT_START_TAG("pc_keyboard_4")
+ PORT_START("pc_keyboard_4")
- PORT_START_TAG("pc_keyboard_5")
+ PORT_START("pc_keyboard_5")
- PORT_START_TAG("pc_keyboard_6")
+ PORT_START("pc_keyboard_6")
AT_KEYB_HELPER( 0x0040, "(MF2)Cursor Up", KEYCODE_UP ) /* Up 67 e7 */
AT_KEYB_HELPER( 0x0080, "(MF2)Page Up", KEYCODE_PGUP ) /* Page Up 68 e8 */
AT_KEYB_HELPER( 0x0100, "(MF2)Cursor Left", KEYCODE_LEFT ) /* Left 69 e9 */
@@ -515,7 +515,7 @@ static INPUT_PORTS_START(taitowlf)
AT_KEYB_HELPER( 0x1000, "(MF2)Page Down", KEYCODE_PGDN ) /* Page Down 6d ed */
AT_KEYB_HELPER( 0x4000, "Del", KEYCODE_A ) /* Delete 6f ef */
- PORT_START_TAG("pc_keyboard_7")
+ PORT_START("pc_keyboard_7")
INPUT_PORTS_END
static IRQ_CALLBACK(irq_callback)
diff --git a/src/mame/drivers/tank8.c b/src/mame/drivers/tank8.c
index e06c09e180c..34c75ff6db4 100644
--- a/src/mame/drivers/tank8.c
+++ b/src/mame/drivers/tank8.c
@@ -131,8 +131,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( tank8 )
-
- PORT_START // 0
+ PORT_START("P1") // 0
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_2WAY PORT_PLAYER(1)
@@ -142,7 +141,7 @@ static INPUT_PORTS_START( tank8 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_START // 1
+ PORT_START("P2") // 1
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_2WAY PORT_PLAYER(2)
@@ -152,7 +151,7 @@ static INPUT_PORTS_START( tank8 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START // 2
+ PORT_START("P3") // 2
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_2WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_2WAY PORT_PLAYER(3)
@@ -162,7 +161,7 @@ static INPUT_PORTS_START( tank8 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
- PORT_START // 3
+ PORT_START("P4") // 3
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN4 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_2WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_2WAY PORT_PLAYER(4)
@@ -172,7 +171,7 @@ static INPUT_PORTS_START( tank8 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
- PORT_START // 4
+ PORT_START("P5") // 4
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN5 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_2WAY PORT_PLAYER(5)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_2WAY PORT_PLAYER(5)
@@ -182,7 +181,7 @@ static INPUT_PORTS_START( tank8 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(5)
- PORT_START // 5
+ PORT_START("P6") // 5
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN6 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_2WAY PORT_PLAYER(6)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_2WAY PORT_PLAYER(6)
@@ -192,7 +191,7 @@ static INPUT_PORTS_START( tank8 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(6)
- PORT_START // 6
+ PORT_START("P7") // 6
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN7 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_2WAY PORT_PLAYER(7)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_2WAY PORT_PLAYER(7)
@@ -202,7 +201,7 @@ static INPUT_PORTS_START( tank8 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(7)
- PORT_START // 7
+ PORT_START("P8") // 7
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN8 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_2WAY PORT_PLAYER(8)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_2WAY PORT_PLAYER(8)
@@ -214,7 +213,7 @@ static INPUT_PORTS_START( tank8 )
/* play time is 4351 + N * 640 frames */
- PORT_START // 8
+ PORT_START("DSW1") // 8
PORT_DIPNAME( 0x0f, 0x08, "Play Time" )
PORT_DIPSETTING( 0x0f, "73 seconds" )
PORT_DIPSETTING( 0x0e, "83 seconds" )
@@ -234,7 +233,7 @@ static INPUT_PORTS_START( tank8 )
PORT_DIPSETTING( 0x00, "233 seconds" )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START // 9
+ PORT_START("DSW2") // 9
PORT_DIPNAME( 0x01, 0x01, "Remote" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ))
@@ -246,7 +245,7 @@ static INPUT_PORTS_START( tank8 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START // 10
+ PORT_START("RC") // 10
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME( "RC 1" )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME( "RC 2" )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME( "RC 3" )
@@ -256,10 +255,10 @@ static INPUT_PORTS_START( tank8 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME( "RC 7" )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME( "RC 8" )
- PORT_START // 11
+ PORT_START("VBLANK") // 11
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("CRASH") // 12
+ PORT_START("CRASH") // 12
PORT_ADJUSTER( 50, "Crash, Explosion Volume" )
INPUT_PORTS_END
diff --git a/src/mame/drivers/tankbatt.c b/src/mame/drivers/tankbatt.c
index 212fe539daa..d1224d9c904 100644
--- a/src/mame/drivers/tankbatt.c
+++ b/src/mame/drivers/tankbatt.c
@@ -178,7 +178,7 @@ static INTERRUPT_GEN( tankbatt_interrupt )
}
static INPUT_PORTS_START( tankbatt )
- PORT_START_TAG("P1") /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
@@ -187,7 +187,7 @@ static INPUT_PORTS_START( tankbatt )
PORT_BIT( 0x60, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_TILT )
- PORT_START_TAG("P2") /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
@@ -197,7 +197,7 @@ static INPUT_PORTS_START( tankbatt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW") /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
diff --git a/src/mame/drivers/tankbust.c b/src/mame/drivers/tankbust.c
index 8e6631fee24..d30eea2d822 100644
--- a/src/mame/drivers/tankbust.c
+++ b/src/mame/drivers/tankbust.c
@@ -233,7 +233,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( tankbust )
- PORT_START /* IN0 */
+ PORT_START("INPUTS") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
@@ -243,7 +243,7 @@ static INPUT_PORTS_START( tankbust )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN1 */
+ PORT_START("SYSTEM") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -253,7 +253,7 @@ static INPUT_PORTS_START( tankbust )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* DSW */
+ PORT_START("DSW") /* DSW */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Hard ) )
diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c
index 4333f7e5e29..160305a6840 100644
--- a/src/mame/drivers/taotaido.c
+++ b/src/mame/drivers/taotaido.c
@@ -159,7 +159,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( taotaido )
- PORT_START_TAG("IN0") /* Player 1 controls (0xffff81.b) */
+ PORT_START("IN0") /* Player 1 controls (0xffff81.b) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -173,7 +173,7 @@ static INPUT_PORTS_START( taotaido )
#endif
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") /* Player 2 controls (0xffff83.b) */
+ PORT_START("IN1") /* Player 2 controls (0xffff83.b) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -187,7 +187,7 @@ static INPUT_PORTS_START( taotaido )
#endif
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* System inputs (0xffff85.b) */
+ PORT_START("IN2") /* System inputs (0xffff85.b) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) // see notes
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -201,7 +201,7 @@ static INPUT_PORTS_START( taotaido )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) // see notes - SERVICE in "test mode"
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) // VBLANK ? The game freezes when ON
- PORT_START_TAG("DSW0") /* DSW A (0xffff87.b -> !0xfe2f6c.w or !0xfe30d0) */
+ PORT_START("DSW0") /* DSW A (0xffff87.b -> !0xfe2f6c.w or !0xfe30d0) */
PORT_DIPNAME( 0x01, 0x01, "Coin Slot" )
PORT_DIPSETTING( 0x01, "Same" )
PORT_DIPSETTING( 0x00, "Individual" )
@@ -221,7 +221,7 @@ static INPUT_PORTS_START( taotaido )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* DSW B (0xffff89.b -> !0xfe73c2.w or !0xfe751c.w) */
+ PORT_START("DSW1") /* DSW B (0xffff89.b -> !0xfe73c2.w or !0xfe751c.w) */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) // check code at 0x0963e2 or 0x845e2
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -238,7 +238,7 @@ static INPUT_PORTS_START( taotaido )
PORT_DIPUNUSED( 0x40, IP_ACTIVE_LOW )
PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW2") /* DSW C (0xffff8b.b -> !0xfe2f94.w or !0xfe30f8.w) */
+ PORT_START("DSW2") /* DSW C (0xffff8b.b -> !0xfe2f94.w or !0xfe30f8.w) */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) // doesn't seem to be demo sounds
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -252,7 +252,7 @@ static INPUT_PORTS_START( taotaido )
PORT_DIPUNUSED( 0x40, IP_ACTIVE_LOW )
PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("JP0") /* Jumpers (0xffff8f.b) */
+ PORT_START("JP0") /* Jumpers (0xffff8f.b) */
PORT_DIPNAME( 0x0f, 0x08, "Country" )
PORT_DIPSETTING( 0x00, "US" ) // also (c) Mc O'River Inc
PORT_DIPSETTING( 0x01, DEF_STR( Japan ) )
@@ -267,7 +267,7 @@ static INPUT_PORTS_START( taotaido )
#if TAOTAIDO_SHOW_ALL_INPUTS
/* These inputs are only to fit the test mode - leftover from another game ? */
- PORT_START_TAG("IN3") /* Player 3 inputs (0xffffa1.b) */
+ PORT_START("IN3") /* Player 3 inputs (0xffffa1.b) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -277,7 +277,7 @@ static INPUT_PORTS_START( taotaido )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN4") /* Player 4 inputs (0xffffa3.b) */
+ PORT_START("IN4") /* Player 4 inputs (0xffffa3.b) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
diff --git a/src/mame/drivers/targeth.c b/src/mame/drivers/targeth.c
index 0aa0e70100b..8ba80e0bea8 100644
--- a/src/mame/drivers/targeth.c
+++ b/src/mame/drivers/targeth.c
@@ -92,23 +92,23 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
static INPUT_PORTS_START( targeth )
-PORT_START /* Gun 1 X */
+ PORT_START("GUNX1") /* Gun 1 X */
PORT_BIT( 0x01ff, 200, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.05, -0.028, 0) PORT_MINMAX( 0, 400 + 4) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_PLAYER(1)
PORT_BIT( 0xfe00, IP_ACTIVE_HIGH, IPT_UNKNOWN )
-PORT_START /* Gun 1 Y */
+ PORT_START("GUNY1") /* Gun 1 Y */
PORT_BIT( 0x01ff, 128, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.041, -0.011, 0) PORT_MINMAX(4,255) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_PLAYER(1)
PORT_BIT( 0xfe00, IP_ACTIVE_HIGH, IPT_UNKNOWN )
-PORT_START /* Gun 2 X */
+ PORT_START("GUNX2") /* Gun 2 X */
PORT_BIT( 0x01ff, 400 + 4, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.05, -0.028, 0) PORT_MINMAX( 0, 400 + 4) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_PLAYER(2)
PORT_BIT( 0xfe00, IP_ACTIVE_HIGH, IPT_UNKNOWN )
-PORT_START /* Gun 2 Y */
+ PORT_START("GUNY2") /* Gun 2 Y */
PORT_BIT( 0x01ff, 255, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.041, -0.011, 0) PORT_MINMAX(4,255) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_PLAYER(2)
PORT_BIT( 0xfe00, IP_ACTIVE_HIGH, IPT_UNKNOWN )
-PORT_START /* DSW #2 */
+ PORT_START("DSW2") /* DSW #2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -131,7 +131,7 @@ PORT_START /* DSW #2 */
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
-PORT_START /* DSW #1 */
+ PORT_START("DSW1") /* DSW #1 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 6C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 5C_1C ) )
@@ -157,7 +157,7 @@ PORT_START /* DSW #1 */
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-PORT_START /* Button 1, COINSW & STARTSW */
+ PORT_START("SYSTEM") /* Button 1, COINSW & STARTSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -167,7 +167,7 @@ PORT_START /* Button 1, COINSW & STARTSW */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
-PORT_START /* Service & Button 2 */
+ PORT_START("SERVICE") /* Service & Button 2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* this MUST be low or the game doesn't boot */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) /* Reload 1P? */
diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c
index 22432d2de72..475c7fdfe97 100644
--- a/src/mame/drivers/tatsumi.c
+++ b/src/mame/drivers/tatsumi.c
@@ -372,7 +372,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( apache3 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_SERVICE_NO_TOGGLE( 0x01, IP_ACTIVE_LOW )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME( "Trigger" )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME( "Power" )
@@ -382,13 +382,13 @@ static INPUT_PORTS_START( apache3 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME( "Missile" )
- PORT_START_TAG("STICKX")
+ PORT_START("STICKX")
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("STICKY")
+ PORT_START("STICKY")
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0003, 0x0000, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x0000, "3" )
PORT_DIPSETTING( 0x0001, "4" )
@@ -438,7 +438,7 @@ static INPUT_PORTS_START( apache3 )
INPUT_PORTS_END
static INPUT_PORTS_START( roundup5 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("Accelerator")
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("Brake")
@@ -448,7 +448,7 @@ static INPUT_PORTS_START( roundup5 )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_SERVICE_NO_TOGGLE( 0x01, IP_ACTIVE_LOW )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -458,10 +458,10 @@ static INPUT_PORTS_START( roundup5 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("Extra 3") PORT_TOGGLE
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) PORT_NAME("Extra 4") PORT_TOGGLE
- PORT_START_TAG("STICKX")
+ PORT_START("STICKX")
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0001, DEF_STR( On ) )
@@ -513,7 +513,7 @@ static INPUT_PORTS_START( roundup5 )
INPUT_PORTS_END
static INPUT_PORTS_START( cyclwarr )
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -523,7 +523,7 @@ static INPUT_PORTS_START( cyclwarr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE4 )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -533,7 +533,7 @@ static INPUT_PORTS_START( cyclwarr )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
@@ -543,7 +543,7 @@ static INPUT_PORTS_START( cyclwarr )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:1")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -557,7 +557,7 @@ static INPUT_PORTS_START( cyclwarr )
PORT_DIPSETTING( 0x0008, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) )
@@ -593,7 +593,7 @@ static INPUT_PORTS_START( cyclwarr )
PORT_DIPSETTING( 0x00a0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x0090, DEF_STR( 1C_7C ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0003, 0x0002, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x0000, "5" )
PORT_DIPSETTING( 0x0001, "3" )
@@ -616,7 +616,7 @@ static INPUT_PORTS_START( cyclwarr )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
@@ -626,7 +626,7 @@ static INPUT_PORTS_START( cyclwarr )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
- PORT_START_TAG("P4")
+ PORT_START("P4")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START4 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
@@ -638,7 +638,7 @@ static INPUT_PORTS_START( cyclwarr )
INPUT_PORTS_END
static INPUT_PORTS_START( bigfight )
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -648,7 +648,7 @@ static INPUT_PORTS_START( bigfight )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE4 )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -658,7 +658,7 @@ static INPUT_PORTS_START( bigfight )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
@@ -668,7 +668,7 @@ static INPUT_PORTS_START( bigfight )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:1")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -682,7 +682,7 @@ static INPUT_PORTS_START( bigfight )
PORT_DIPSETTING( 0x0008, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) )
@@ -718,7 +718,7 @@ static INPUT_PORTS_START( bigfight )
PORT_DIPSETTING( 0x00a0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x0090, DEF_STR( 1C_7C ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x0000, "1" )
PORT_DIPSETTING( 0x0003, "2" )
@@ -742,7 +742,7 @@ static INPUT_PORTS_START( bigfight )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START3 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
@@ -752,7 +752,7 @@ static INPUT_PORTS_START( bigfight )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
- PORT_START_TAG("P4")
+ PORT_START("P4")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START4 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
diff --git a/src/mame/drivers/tattack.c b/src/mame/drivers/tattack.c
index 1d913ce9164..a1c7e86ec52 100644
--- a/src/mame/drivers/tattack.c
+++ b/src/mame/drivers/tattack.c
@@ -66,7 +66,7 @@ static ADDRESS_MAP_START( mem, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( tattack )
-PORT_START
+ PORT_START("INPUTS")
PORT_DIPNAME( 0x01, 0x00, "1-01" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -84,7 +84,7 @@ PORT_START
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
-PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, "DSW1 1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -112,7 +112,7 @@ PORT_START
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, "DSW2 1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/taxidrvr.c b/src/mame/drivers/taxidrvr.c
index 309feda847e..39e15fa5e9c 100644
--- a/src/mame/drivers/taxidrvr.c
+++ b/src/mame/drivers/taxidrvr.c
@@ -190,7 +190,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( taxidrvr )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0d, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0a, DEF_STR( 3C_1C ) )
@@ -226,7 +226,7 @@ static INPUT_PORTS_START( taxidrvr )
PORT_DIPSETTING( 0x60, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0xf0, DEF_STR( Free_Play ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -251,7 +251,7 @@ static INPUT_PORTS_START( taxidrvr )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x07, 0x00, "Fuel Consumption" )
PORT_DIPSETTING( 0x00, "Slowest" )
PORT_DIPSETTING( 0x01, "2" )
@@ -276,7 +276,7 @@ static INPUT_PORTS_START( taxidrvr )
PORT_DIPSETTING( 0x80, "20/15" )
PORT_DIPSETTING( 0xc0, "10/10" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 )
@@ -286,7 +286,7 @@ static INPUT_PORTS_START( taxidrvr )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -296,7 +296,7 @@ static INPUT_PORTS_START( taxidrvr )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) /* handled by p1c_r() */
INPUT_PORTS_END
diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c
index d6148f7e08b..b8a00ff1654 100644
--- a/src/mame/drivers/tbowl.c
+++ b/src/mame/drivers/tbowl.c
@@ -295,29 +295,29 @@ bits 0 and 1 ? I'll try to have another look when the sprites stuff is finished.
static INPUT_PORTS_START( tbowl )
- PORT_START /* player 1 inputs (0xfc00) */
+ PORT_START("P1") /* player 1 inputs (0xfc00) */
TBOWL_PLAYER_INPUT(1)
- PORT_START /* player 2 inputs (0xfc01) */
+ PORT_START("P2") /* player 2 inputs (0xfc01) */
TBOWL_PLAYER_INPUT(2)
- PORT_START /* player 3 inputs (0xfc02) */
+ PORT_START("P3") /* player 3 inputs (0xfc02) */
TBOWL_PLAYER_INPUT(3)
- PORT_START /* player 4 inputs (0xfc03) */
+ PORT_START("P4") /* player 4 inputs (0xfc03) */
TBOWL_PLAYER_INPUT(4)
- PORT_START /* system inputs (0xfc07 -> 0x80f9) */
+ PORT_START("SYSTEM") /* system inputs (0xfc07 -> 0x80f9) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN4 )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Service (General)") PORT_CODE(KEYCODE_F1)
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Service (General)") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* DSW1 (0xfc08 -> 0xffb4) */
+ PORT_START("DSW1") /* DSW1 (0xfc08 -> 0xffb4) */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING ( 0x00, DEF_STR( 8C_1C ) )
PORT_DIPSETTING ( 0x01, DEF_STR( 7C_1C ) )
@@ -361,7 +361,7 @@ static INPUT_PORTS_START( tbowl )
PORT_DIPSETTING ( 0xf0, "0:25" )
// PORT_DIPSETTING ( 0xf8, "1:00" )
- PORT_START /* DSW2 (0xfc09 -> 0xffb5) */
+ PORT_START("DSW2") /* DSW2 (0xfc09 -> 0xffb5) */
PORT_DIPNAME( 0x03, 0x03, "Difficulty (unused ?)" ) // To be checked again
PORT_DIPSETTING ( 0x00, "0x00" )
PORT_DIPSETTING ( 0x01, "0x01" )
@@ -384,7 +384,7 @@ static INPUT_PORTS_START( tbowl )
PORT_DIPSETTING ( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING ( 0x80, DEF_STR( On ) )
- PORT_START /* DSW3 (0xfc0a -> 0xffb6) */
+ PORT_START("DSW3") /* DSW3 (0xfc0a -> 0xffb6) */
PORT_DIPNAME( 0x03, 0x03, "Time (Quarter)" )
PORT_DIPSETTING ( 0x00, "8:00" )
PORT_DIPSETTING ( 0x01, "5:00" )
@@ -401,29 +401,29 @@ INPUT_PORTS_END
/* same as 'tbowl', but different "Quarter Time" Dip Switch
("3:00" and "4:00" are inverted) */
static INPUT_PORTS_START( tbowlj )
- PORT_START /* player 1 inputs (0xfc00) */
+ PORT_START("P1") /* player 1 inputs (0xfc00) */
TBOWL_PLAYER_INPUT(1)
- PORT_START /* player 2 inputs (0xfc01) */
+ PORT_START("P2") /* player 2 inputs (0xfc01) */
TBOWL_PLAYER_INPUT(2)
- PORT_START /* player 3 inputs (0xfc02) */
+ PORT_START("P3") /* player 3 inputs (0xfc02) */
TBOWL_PLAYER_INPUT(3)
- PORT_START /* player 4 inputs (0xfc03) */
+ PORT_START("P4") /* player 4 inputs (0xfc03) */
TBOWL_PLAYER_INPUT(4)
- PORT_START /* system inputs (0xfc07 -> 0x80f9) */
+ PORT_START("SYSTEM") /* system inputs (0xfc07 -> 0x80f9) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN4 )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Service (General)") PORT_CODE(KEYCODE_F1)
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Service (General)") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* DSW1 (0xfc08 -> 0xffb4) */
+ PORT_START("DSW1") /* DSW1 (0xfc08 -> 0xffb4) */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING ( 0x00, DEF_STR( 8C_1C ) )
PORT_DIPSETTING ( 0x01, DEF_STR( 7C_1C ) )
@@ -467,7 +467,7 @@ static INPUT_PORTS_START( tbowlj )
PORT_DIPSETTING ( 0xf0, "0:25" )
// PORT_DIPSETTING ( 0xf8, "1:00" )
- PORT_START /* DSW2 (0xfc09 -> 0xffb5) */
+ PORT_START("DSW2") /* DSW2 (0xfc09 -> 0xffb5) */
PORT_DIPNAME( 0x03, 0x03, "Difficulty (unused ?)" ) // To be checked again
PORT_DIPSETTING ( 0x00, "0x00" )
PORT_DIPSETTING ( 0x01, "0x01" )
@@ -490,7 +490,7 @@ static INPUT_PORTS_START( tbowlj )
PORT_DIPSETTING ( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING ( 0x80, DEF_STR( On ) )
- PORT_START /* DSW3 (0xfc0a -> 0xffb6) */
+ PORT_START("DSW3") /* DSW3 (0xfc0a -> 0xffb6) */
PORT_DIPNAME( 0x03, 0x03, "Time (Quarter)" )
PORT_DIPSETTING ( 0x00, "8:00" )
PORT_DIPSETTING ( 0x01, "5:00" )
diff --git a/src/mame/drivers/tceptor.c b/src/mame/drivers/tceptor.c
index 0660987103d..df5525c66e1 100644
--- a/src/mame/drivers/tceptor.c
+++ b/src/mame/drivers/tceptor.c
@@ -259,7 +259,7 @@ ADDRESS_MAP_END
/*******************************************************************/
static INPUT_PORTS_START( tceptor )
- PORT_START_TAG("DSW1") /* DSW 1 */
+ PORT_START("DSW1") /* DSW 1 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
@@ -282,7 +282,7 @@ static INPUT_PORTS_START( tceptor )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW2") /* DSW 2 */
+ PORT_START("DSW2") /* DSW 2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, "A" )
PORT_DIPSETTING( 0x03, "B" )
@@ -290,27 +290,27 @@ static INPUT_PORTS_START( tceptor )
PORT_DIPSETTING( 0x00, "D" )
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("BUTTONS") /* Memory Mapped Port */
+ PORT_START("BUTTONS") /* Memory Mapped Port */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) // shot
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) // bomb
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) // shot
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) // bomb
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SERVICE") /* Memory Mapped Port */
+ PORT_START("SERVICE") /* Memory Mapped Port */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) // TEST SW
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("PEDAL") /* ADC0809 - 8 CHANNEL ANALOG - CHANNEL 1 */
+ PORT_START("PEDAL") /* ADC0809 - 8 CHANNEL ANALOG - CHANNEL 1 */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0xd6) PORT_SENSITIVITY(100) PORT_KEYDELTA(16) PORT_CODE_INC(KEYCODE_Z)
- PORT_START_TAG("STICKX") /* ADC0809 - 8 CHANNEL ANALOG - CHANNEL 2 */
+ PORT_START("STICKX") /* ADC0809 - 8 CHANNEL ANALOG - CHANNEL 2 */
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_X ) PORT_MINMAX(0x00,0xfe) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
- PORT_START_TAG("STICKY") /* ADC08090 - 8 CHANNEL ANALOG - CHANNEL 3 */
+ PORT_START("STICKY") /* ADC08090 - 8 CHANNEL ANALOG - CHANNEL 3 */
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_Y ) PORT_MINMAX(0x00,0xfe) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
INPUT_PORTS_END
diff --git a/src/mame/drivers/tcl.c b/src/mame/drivers/tcl.c
index 4568c9e35d6..81b242dac63 100644
--- a/src/mame/drivers/tcl.c
+++ b/src/mame/drivers/tcl.c
@@ -55,7 +55,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( tcl )
- PORT_START
+ PORT_START("IN0")
INPUT_PORTS_END
static const gfx_layout charlayout =
diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c
index 08bc665b0e4..bda719d20bf 100644
--- a/src/mame/drivers/tecmo.c
+++ b/src/mame/drivers/tecmo.c
@@ -228,40 +228,40 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( rygar )
- PORT_START /* IN0 bits 0-3 */
+ PORT_START("JOY1") /* IN0 bits 0-3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
- PORT_START /* IN1 bits 0-3 */
+ PORT_START("BUTTONS1") /* IN1 bits 0-3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN2 bits 0-3 */
+ PORT_START("JOY2") /* IN2 bits 0-3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN3 bits 0-3 */
+ PORT_START("BUTTONS2") /* IN3 bits 0-3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN4 bits 0-3 */
+ PORT_START("SYS_0") /* IN4 bits 0-3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START /* unused? */
+ PORT_START("SYS_1") /* unused? */
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* DSWA bit 0-3 */
+ PORT_START("DSWA_0") /* DSWA bit 0-3 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -273,7 +273,7 @@ static INPUT_PORTS_START( rygar )
PORT_DIPSETTING( 0x08, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x0C, DEF_STR( 1C_3C ) )
- PORT_START /* DSWA bit 4-7 */
+ PORT_START("DSWA_1") /* DSWA bit 4-7 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x00, "3" )
@@ -286,7 +286,7 @@ static INPUT_PORTS_START( rygar )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
- PORT_START /* DSWB bit 0-3 */
+ PORT_START("DSWB_0") /* DSWB bit 0-3 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x00, "50000 200000 500000" )
PORT_DIPSETTING( 0x01, "100000 300000 600000" )
@@ -299,7 +299,7 @@ static INPUT_PORTS_START( rygar )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
- PORT_START /* DSWB bit 4-7 */
+ PORT_START("DSWB_1") /* DSWB bit 4-7 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x00, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x01, DEF_STR( Normal ) )
@@ -312,45 +312,45 @@ static INPUT_PORTS_START( rygar )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x08, DEF_STR( Yes ) )
- PORT_START /* unused? */
+ PORT_START("UNK") /* unused? */
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( gemini )
- PORT_START /* IN0 bits 0-3 */
+ PORT_START("JOY1") /* IN0 bits 0-3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
- PORT_START /* IN1 bits 0-3 */
+ PORT_START("BUTTONS1") /* IN1 bits 0-3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN2 bits 0-3 */
+ PORT_START("JOY2") /* IN2 bits 0-3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
- PORT_START /* IN3 bits 0-3 */
+ PORT_START("BUTTONS2") /* IN3 bits 0-3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* unused? */
+ PORT_START("SYS_0") /* unused? */
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN4 bits 0-3 */
+ PORT_START("SYS_1") /* IN4 bits 0-3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_COIN2 )
- PORT_START /* DSWA bit 0-3 */
+ PORT_START("DSWA_0") /* DSWA bit 0-3 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x06, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -364,7 +364,7 @@ static INPUT_PORTS_START( gemini )
PORT_DIPSETTING( 0x00, "Round 6" )
PORT_DIPSETTING( 0x08, "Round 7" )
- PORT_START /* DSWA bit 4-7 */
+ PORT_START("DSWA_1") /* DSWA bit 4-7 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x06, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -378,7 +378,7 @@ static INPUT_PORTS_START( gemini )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x08, DEF_STR( Yes ) )
- PORT_START /* DSWB bit 0-3 */
+ PORT_START("DSWB_0") /* DSWB bit 0-3 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x00, "3" )
@@ -390,7 +390,7 @@ static INPUT_PORTS_START( gemini )
PORT_DIPSETTING( 0x08, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x0c, DEF_STR( Hardest ) )
- PORT_START /* DSWB bit 4-7 */
+ PORT_START("DSWB_1") /* DSWB bit 4-7 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x00, "50000 200000" )
PORT_DIPSETTING( 0x01, "50000 300000" )
@@ -404,42 +404,42 @@ static INPUT_PORTS_START( gemini )
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* unused? */
+ PORT_START("UNK") /* unused? */
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( silkworm )
- PORT_START /* IN0 bit 0-3 */
+ PORT_START("JOY1") /* IN0 bits 0-3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
- PORT_START /* IN0 bit 4-7 */
+ PORT_START("BUTTONS1") /* IN0 bits 4-7 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* unused? */
- PORT_START /* IN1 bit 0-3 */
+ PORT_START("JOY2") /* IN1 bits 0-3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
- PORT_START /* IN1 bit 4-7 */
+ PORT_START("BUTTONS2") /* IN1 bits 4-7 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* unused? */
- PORT_START /* unused? */
+ PORT_START("SYS_0") /* unused? */
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* unused? */
+ PORT_START("SYS_1") /* unused? */
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* DSWA bit 0-3 */
+ PORT_START("DSWA_0") /* DSWA bit 0-3 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -451,7 +451,7 @@ static INPUT_PORTS_START( silkworm )
PORT_DIPSETTING( 0x08, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x0C, DEF_STR( 1C_3C ) )
- PORT_START /* DSWA bit 4-7 */
+ PORT_START("DSWA_1") /* DSWA bit 4-7 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x00, "3" )
@@ -464,7 +464,7 @@ static INPUT_PORTS_START( silkworm )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
- PORT_START /* DSWB bit 0-3 */
+ PORT_START("DSWB_0") /* DSWB bit 0-3 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x00, "50000 200000 500000" )
PORT_DIPSETTING( 0x01, "100000 300000 800000" )
@@ -478,7 +478,7 @@ static INPUT_PORTS_START( silkworm )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
- PORT_START /* DSWB bit 4-7 */
+ PORT_START("DSWB_1") /* DSWB bit 4-7 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x00, "0" )
PORT_DIPSETTING( 0x01, "1" )
@@ -491,7 +491,7 @@ static INPUT_PORTS_START( silkworm )
PORT_DIPSETTING( 0x08, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
- PORT_START /* COIN */
+ PORT_START("UNK") /* COIN */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 )
diff --git a/src/mame/drivers/tecmo16.c b/src/mame/drivers/tecmo16.c
index d86ee402fc2..e061b7dc612 100644
--- a/src/mame/drivers/tecmo16.c
+++ b/src/mame/drivers/tecmo16.c
@@ -168,7 +168,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( fstarfrc )
- PORT_START /* DIP SW 1 */
+ PORT_START("DSW1") /* DIP SW 1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
@@ -192,7 +192,7 @@ static INPUT_PORTS_START( fstarfrc )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DIP SW 2 */
+ PORT_START("DSW2") /* DIP SW 2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x03, "3" )
@@ -214,7 +214,7 @@ static INPUT_PORTS_START( fstarfrc )
PORT_DIPSETTING( 0x40, "240000,1400000" )
PORT_DIPSETTING( 0x00, "every 500000,once at highest score" ) // beating the hi-score gives you an extra life
- PORT_START
+ PORT_START("P1_P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -234,7 +234,7 @@ static INPUT_PORTS_START( fstarfrc )
INPUT_PORTS_END
static INPUT_PORTS_START( ginkun )
- PORT_START /* DIP SW 1 */
+ PORT_START("DSW1") /* DIP SW 1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:8,7")
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
@@ -258,7 +258,7 @@ static INPUT_PORTS_START( ginkun )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DIP SW 2 */
+ PORT_START("DSW2") /* DIP SW 2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:8,7")
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x03, "3" )
@@ -282,7 +282,7 @@ static INPUT_PORTS_START( ginkun )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("P1_P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -300,12 +300,12 @@ static INPUT_PORTS_START( ginkun )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_COIN2 )
- PORT_START
+ PORT_START("EXTRA")
/* Not used */
INPUT_PORTS_END
static INPUT_PORTS_START( riot )
- PORT_START /* DIP SW 1 */
+ PORT_START("DSW1") /* DIP SW 1 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
@@ -331,7 +331,7 @@ static INPUT_PORTS_START( riot )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DIP SW 2 */
+ PORT_START("DSW2") /* DIP SW 2 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -356,7 +356,7 @@ static INPUT_PORTS_START( riot )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("P1_P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -374,7 +374,7 @@ static INPUT_PORTS_START( riot )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_COIN2 )
- PORT_START
+ PORT_START("EXTRA")
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0xffdd, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c
index e2bbd5e003f..ff66d71006e 100644
--- a/src/mame/drivers/tecmosys.c
+++ b/src/mame/drivers/tecmosys.c
@@ -463,7 +463,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( deroon )
- PORT_START
+ PORT_START("P1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -482,7 +482,7 @@ static INPUT_PORTS_START( deroon )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/tehkanwc.c b/src/mame/drivers/tehkanwc.c
index 272b5e1f995..356b0719cab 100644
--- a/src/mame/drivers/tehkanwc.c
+++ b/src/mame/drivers/tehkanwc.c
@@ -295,7 +295,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( tehkanwc )
- PORT_START_TAG("DSW1") /* DSW1 - Active LOW */
+ PORT_START("DSW1") /* DSW1 - Active LOW */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING ( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING ( 0x07, DEF_STR( 1C_1C ) )
@@ -320,7 +320,7 @@ static INPUT_PORTS_START( tehkanwc )
PORT_DIPSETTING ( 0x40, "2&2/100%" )
PORT_DIPSETTING ( 0x00, "2&3/67%" )
- PORT_START_TAG("DSW2") /* DSW2 - Active LOW */
+ PORT_START("DSW2") /* DSW2 - Active LOW */
PORT_DIPNAME( 0x03, 0x03, "1P Game Time" )
PORT_DIPSETTING ( 0x00, "2:30" )
PORT_DIPSETTING ( 0x01, "2:00" )
@@ -363,7 +363,7 @@ static INPUT_PORTS_START( tehkanwc )
PORT_DIPSETTING ( 0x80, "Timer In" )
PORT_DIPSETTING ( 0x00, "Credit In" )
- PORT_START_TAG("DSW3") /* DSW3 - Active LOW */
+ PORT_START("DSW3") /* DSW3 - Active LOW */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING ( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING ( 0x03, DEF_STR( Normal ) )
@@ -376,31 +376,31 @@ static INPUT_PORTS_START( tehkanwc )
PORT_DIPSETTING ( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING ( 0x08, DEF_STR( On ) )
- PORT_START_TAG("P1X") /* IN0 - X AXIS */
+ PORT_START("P1X") /* IN0 - X AXIS */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(0) PORT_PLAYER(1)
- PORT_START_TAG("P1Y") /* IN0 - Y AXIS */
+ PORT_START("P1Y") /* IN0 - Y AXIS */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(0) PORT_PLAYER(1)
- PORT_START_TAG("P1BUT") /* IN0 - BUTTON */
+ PORT_START("P1BUT") /* IN0 - BUTTON */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_START_TAG("P2X") /* IN1 - X AXIS */
+ PORT_START("P2X") /* IN1 - X AXIS */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(0) PORT_PLAYER(2)
- PORT_START_TAG("P2Y") /* IN1 - Y AXIS */
+ PORT_START("P2Y") /* IN1 - Y AXIS */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(0) PORT_PLAYER(2)
- PORT_START_TAG("P2BUT") /* IN1 - BUTTON */
+ PORT_START("P2BUT") /* IN1 - BUTTON */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START_TAG("SYSTEM") /* IN2 - Active LOW */
+ PORT_START("SYSTEM") /* IN2 - Active LOW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("FAKE") /* fake port to emulate trackballs with keyboard */
+ PORT_START("FAKE") /* fake port to emulate trackballs with keyboard */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -413,7 +413,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( gridiron )
- PORT_START_TAG("DSW1") /* DSW1 - Active LOW */
+ PORT_START("DSW1") /* DSW1 - Active LOW */
PORT_DIPNAME( 0x03, 0x03, "Start Credits (P1&P2)/Extra" )
PORT_DIPSETTING ( 0x01, "1&1/200%" )
PORT_DIPSETTING ( 0x03, "1&2/100%" )
@@ -439,7 +439,7 @@ static INPUT_PORTS_START( gridiron )
PORT_DIPSETTING ( 0xc0, "15" )
PORT_DIPSETTING ( 0x80, "10" )
- PORT_START_TAG("DSW2") /* DSW2 - Active LOW */
+ PORT_START("DSW2") /* DSW2 - Active LOW */
PORT_DIPNAME( 0x03, 0x03, "1P Game Time" )
PORT_DIPSETTING ( 0x00, "2:30" )
PORT_DIPSETTING ( 0x01, "2:00" )
@@ -482,40 +482,40 @@ static INPUT_PORTS_START( gridiron )
PORT_DIPSETTING ( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING ( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* no DSW3 */
+ PORT_START("DSW3") /* no DSW3 */
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("P1X") /* IN0 - X AXIS */
+ PORT_START("P1X") /* IN0 - X AXIS */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_PLAYER(1)
- PORT_START_TAG("P1Y") /* IN0 - Y AXIS */
+ PORT_START("P1Y") /* IN0 - Y AXIS */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_PLAYER(1)
- PORT_START_TAG("P1BUT") /* IN0 - BUTTON */
+ PORT_START("P1BUT") /* IN0 - BUTTON */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_START_TAG("P2X") /* IN1 - X AXIS */
+ PORT_START("P2X") /* IN1 - X AXIS */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_PLAYER(2)
- PORT_START_TAG("P2Y") /* IN1 - Y AXIS */
+ PORT_START("P2Y") /* IN1 - Y AXIS */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_PLAYER(2)
- PORT_START_TAG("P2BUT") /* IN1 - BUTTON */
+ PORT_START("P2BUT") /* IN1 - BUTTON */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START_TAG("SYSTEM") /* IN2 - Active LOW */
+ PORT_START("SYSTEM") /* IN2 - Active LOW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("FAKE") /* no fake port here */
+ PORT_START("FAKE") /* no fake port here */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( teedoff )
- PORT_START_TAG("DSW1") /* DSW1 - Active LOW */
+ PORT_START("DSW1") /* DSW1 - Active LOW */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING ( 0x02, DEF_STR( 2C_1C ) )
PORT_DIPSETTING ( 0x03, DEF_STR( 1C_1C ) )
@@ -538,7 +538,7 @@ static INPUT_PORTS_START( teedoff )
PORT_DIPSETTING ( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING ( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* DSW2 - Active LOW */
+ PORT_START("DSW2") /* DSW2 - Active LOW */
PORT_BIT( 0x07, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x18, 0x18, "Penalty (Over Par)" ) // Check table at 0x2d67
PORT_DIPSETTING ( 0x10, "1/1/2/3/4" ) // +1 / +2 / +3 / +4 / +5 or +6
@@ -554,28 +554,28 @@ static INPUT_PORTS_START( teedoff )
PORT_DIPSETTING ( 0x40, DEF_STR( Hard ) )
PORT_DIPSETTING ( 0x00, DEF_STR( Hardest ) )
- PORT_START_TAG("DSW3") /* no DSW3 */
+ PORT_START("DSW3") /* no DSW3 */
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("P1X") /* IN0 - X AXIS */
+ PORT_START("P1X") /* IN0 - X AXIS */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_PLAYER(1)
- PORT_START_TAG("P1Y") /* IN0 - Y AXIS */
+ PORT_START("P1Y") /* IN0 - Y AXIS */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_PLAYER(1)
- PORT_START_TAG("P1BUT") /* IN0 - BUTTON */
+ PORT_START("P1BUT") /* IN0 - BUTTON */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_START_TAG("P2X") /* IN1 - X AXIS */
+ PORT_START("P2X") /* IN1 - X AXIS */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_PLAYER(2)
- PORT_START_TAG("P2Y") /* IN1 - Y AXIS */
+ PORT_START("P2Y") /* IN1 - Y AXIS */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_PLAYER(2)
- PORT_START_TAG("P2BUT") /* IN1 - BUTTON */
+ PORT_START("P2BUT") /* IN1 - BUTTON */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START_TAG("SYSTEM") /* IN2 - Active LOW */
+ PORT_START("SYSTEM") /* IN2 - Active LOW */
/* "Coin" buttons are read from address 0xf802 */
/* "Start" buttons are read from address 0xf806 */
/* coin input must be active between 2 and 15 frames to be consistently recognized */
@@ -584,7 +584,7 @@ static INPUT_PORTS_START( teedoff )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("FAKE") /* no fake port here */
+ PORT_START("FAKE") /* no fake port here */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/tempest.c b/src/mame/drivers/tempest.c
index 17331b4095e..11dfb744ae1 100644
--- a/src/mame/drivers/tempest.c
+++ b/src/mame/drivers/tempest.c
@@ -439,7 +439,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( tempest )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -454,7 +454,7 @@ static INPUT_PORTS_START( tempest )
/* handled by tempest_IN0_r() */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1/DSW0") /* IN1/DSW0 */
+ PORT_START("IN1/DSW0") /* IN1/DSW0 */
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(tempest_knob_r, 0)
/* The next one is reponsible for cocktail mode.
* According to the documentation, this is not a switch, although
@@ -467,7 +467,7 @@ static INPUT_PORTS_START( tempest )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2") /* IN2 */
+ PORT_START("IN2") /* IN2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, "Medium1" )
@@ -481,7 +481,7 @@ static INPUT_PORTS_START( tempest )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DSW1 - (N13 on analog vector generator PCB */
+ PORT_START("DSW1") /* DSW1 - (N13 on analog vector generator PCB */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -505,7 +505,7 @@ static INPUT_PORTS_START( tempest )
PORT_DIPSETTING( 0xc0, "Freeze Mode" )
PORT_DIPSETTING( 0xe0, "Freeze Mode" )
- PORT_START_TAG("DSW2") /* DSW2 - (L12 on analog vector generator PCB */
+ PORT_START("DSW2") /* DSW2 - (L12 on analog vector generator PCB */
PORT_DIPNAME( 0x01, 0x00, "Minimum" )
PORT_DIPSETTING( 0x00, "1 Credit" )
PORT_DIPSETTING( 0x01, "2 Credit" )
@@ -529,22 +529,22 @@ static INPUT_PORTS_START( tempest )
PORT_DIPSETTING( 0x40, "4" )
PORT_DIPSETTING( 0x80, "5" )
- PORT_START_TAG(TEMPEST_KNOB_P1_TAG)
+ PORT_START(TEMPEST_KNOB_P1_TAG)
/* This is the Tempest spinner input. It only uses 4 bits. */
PORT_BIT( 0x0f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_PLAYER(1) PORT_FULL_TURN_COUNT(72)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG(TEMPEST_KNOB_P2_TAG)
+ PORT_START(TEMPEST_KNOB_P2_TAG)
/* This is the Tempest spinner input. It only uses 4 bits. */
PORT_BIT( 0x0f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_PLAYER(2) PORT_FULL_TURN_COUNT(72)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG(TEMPEST_BUTTONS_P1_TAG)
+ PORT_START(TEMPEST_BUTTONS_P1_TAG)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG(TEMPEST_BUTTONS_P2_TAG)
+ PORT_START(TEMPEST_BUTTONS_P2_TAG)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/terracre.c b/src/mame/drivers/terracre.c
index 237220e3ad1..7934a9967b3 100644
--- a/src/mame/drivers/terracre.c
+++ b/src/mame/drivers/terracre.c
@@ -287,7 +287,7 @@ static ADDRESS_MAP_START( sound_writeport_2203, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( terracre )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -297,7 +297,7 @@ static INPUT_PORTS_START( terracre )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -307,7 +307,7 @@ static INPUT_PORTS_START( terracre )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -317,7 +317,7 @@ static INPUT_PORTS_START( terracre )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0003, "3" )
PORT_DIPSETTING( 0x0002, "4" )
@@ -361,7 +361,7 @@ static INPUT_PORTS_START( terracre )
INPUT_PORTS_END
static INPUT_PORTS_START( amazon )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -371,7 +371,7 @@ static INPUT_PORTS_START( amazon )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -381,7 +381,7 @@ static INPUT_PORTS_START( amazon )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -391,7 +391,7 @@ static INPUT_PORTS_START( amazon )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0003, "3" )
PORT_DIPSETTING( 0x0002, "4" )
@@ -435,7 +435,7 @@ static INPUT_PORTS_START( amazon )
INPUT_PORTS_END
static INPUT_PORTS_START( horekid )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0003, "3" )
PORT_DIPSETTING( 0x0002, "4" )
@@ -477,7 +477,7 @@ static INPUT_PORTS_START( horekid )
// PORT_DIPSETTING( 0x4000, DEF_STR( Off ) ) // duplicated setting
// PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) // duplicated setting
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -487,7 +487,7 @@ static INPUT_PORTS_START( horekid )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -497,7 +497,7 @@ static INPUT_PORTS_START( horekid )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME ("P2 Buttons 1+2 (Debug Cheat)") // fake button for "Debug Mode" (see read handler)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c
index 01e29c3e171..24bb5d6ff4e 100644
--- a/src/mame/drivers/tetrisp2.c
+++ b/src/mame/drivers/tetrisp2.c
@@ -699,7 +699,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( tetrisp2 )
- PORT_START_TAG("PLAYERS") /*$be0002.w*/
+ PORT_START("PLAYERS") /*$be0002.w*/
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -717,7 +717,7 @@ static INPUT_PORTS_START( tetrisp2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SYSTEM") /*$be0004.w*/
+ PORT_START("SYSTEM") /*$be0004.w*/
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -735,7 +735,7 @@ static INPUT_PORTS_START( tetrisp2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") //$be0008.w
+ PORT_START("DSW") //$be0008.w
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) )
@@ -816,7 +816,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( nndmseal )
- PORT_START_TAG("BUTTONS") // be0002.w
+ PORT_START("BUTTONS") // be0002.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -834,7 +834,7 @@ static INPUT_PORTS_START( nndmseal )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("COINS") // be0004.w
+ PORT_START("COINS") // be0004.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -852,7 +852,7 @@ static INPUT_PORTS_START( nndmseal )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") // be0008.w
+ PORT_START("DSW") // be0008.w
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -905,7 +905,7 @@ static INPUT_PORTS_START( nndmseal )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_SERVICE( 0x8000, IP_ACTIVE_LOW )
- PORT_START_TAG("PRINT") // be0006.w
+ PORT_START("PRINT") // be0006.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Print 1?") // Press both to print (and alternate with ok too).
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 ) PORT_NAME("Print 2?") // Hold them for some seconds to bring up a "caution" message.
PORT_BIT( 0x0004, IP_ACTIVE_HIGH,IPT_SPECIAL ) // ?
@@ -932,7 +932,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( rockn )
- PORT_START_TAG("PLAYERS") //$be0002.w
+ PORT_START("PLAYERS") //$be0002.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -950,7 +950,7 @@ static INPUT_PORTS_START( rockn )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM") //$be0004.w
+ PORT_START("SYSTEM") //$be0004.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -968,7 +968,7 @@ static INPUT_PORTS_START( rockn )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") //$be0008.w
+ PORT_START("DSW") //$be0008.w
PORT_DIPNAME( 0x0001, 0x0001, "DIPSW 1-1") // All these used to be marked 'Cheat', can't think why.
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1022,7 +1022,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( rocknms )
- PORT_START_TAG("PLAYERS") // IN0 - $be0002.w
+ PORT_START("PLAYERS") // IN0 - $be0002.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SPECIAL ) // MAIN -> SUB Communication
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SPECIAL ) // MAIN -> SUB Communication
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -1040,7 +1040,7 @@ static INPUT_PORTS_START( rocknms )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
- PORT_START_TAG("SYSTEM") // IN1 - $be0004.w
+ PORT_START("SYSTEM") // IN1 - $be0004.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -1058,7 +1058,7 @@ static INPUT_PORTS_START( rocknms )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") //$be0008.w
+ PORT_START("DSW") //$be0008.w
PORT_DIPNAME( 0x0001, 0x0001, "DIPSW 1-1") // All these used to be marked 'Cheat', can't think why.
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/thayers.c b/src/mame/drivers/thayers.c
index 53ad32de194..83ab79be43d 100644
--- a/src/mame/drivers/thayers.c
+++ b/src/mame/drivers/thayers.c
@@ -624,7 +624,7 @@ static CUSTOM_INPUT( laserdisc_ready_r )
}
static INPUT_PORTS_START( thayers )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x07, 0x07, "Time Per Coin" ) PORT_DIPLOCATION( "A:3,2,1" )
PORT_DIPSETTING( 0x07, "110 Seconds" )
PORT_DIPSETTING( 0x06, "95 Seconds" )
@@ -648,7 +648,7 @@ static INPUT_PORTS_START( thayers )
PORT_DIPSETTING( 0x00, "One Out of 8 Times" )
PORT_DIPUNUSED_DIPLOC( 0x80, IP_ACTIVE_LOW, "A:8" )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_SERVICE_DIPLOC( 0x01, 0x01, "B:1" )
PORT_DIPUNUSED_DIPLOC( 0x02, IP_ACTIVE_LOW, "B:2" )
PORT_DIPUNUSED_DIPLOC( 0x04, IP_ACTIVE_LOW, "B:3" )
@@ -657,67 +657,67 @@ static INPUT_PORTS_START( thayers )
PORT_DIPSETTING( 0x00, "PR-7820" )
PORT_DIPUNUSED_DIPLOC( 0xe0, IP_ACTIVE_LOW, "B:8,7,6" )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(laserdisc_enter_r, 0 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(laserdisc_ready_r, 0 )
- PORT_START_TAG("R0")
+ PORT_START("R0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "2" ) PORT_CODE( KEYCODE_F2 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "1 - Clear" ) PORT_CODE( KEYCODE_BACKSPACE )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "Q" ) PORT_CODE( KEYCODE_Q )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( DEF_STR( Yes ) ) PORT_CODE( KEYCODE_0_PAD )
- PORT_START_TAG("R1")
+ PORT_START("R1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "Z - Spell of Release" ) PORT_CODE( KEYCODE_Z )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "A" ) PORT_CODE( KEYCODE_A )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "W - Amulet" ) PORT_CODE( KEYCODE_W )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "Items" ) PORT_CODE( KEYCODE_1_PAD )
- PORT_START_TAG("R2")
+ PORT_START("R2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "X - Scepter" ) PORT_CODE( KEYCODE_X )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "S - Dagger" ) PORT_CODE( KEYCODE_S )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "E - Black Mace" ) PORT_CODE( KEYCODE_E )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "Drop Item" ) PORT_CODE( KEYCODE_2_PAD )
- PORT_START_TAG("R3")
+ PORT_START("R3")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "C - Spell of Seeing" ) PORT_CODE( KEYCODE_C )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "D - Great Circlet" ) PORT_CODE( KEYCODE_D )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "R - Blood Sword" ) PORT_CODE( KEYCODE_R )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "Give Score" ) PORT_CODE( KEYCODE_3_PAD )
- PORT_START_TAG("R4")
+ PORT_START("R4")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "V - Shield" ) PORT_CODE( KEYCODE_V )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "F - Hunting Horn" ) PORT_CODE( KEYCODE_F )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "T - Chalice" ) PORT_CODE( KEYCODE_T )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "Replay" ) PORT_CODE( KEYCODE_4_PAD )
- PORT_START_TAG("R5")
+ PORT_START("R5")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "B - Silver Wheat" ) PORT_CODE( KEYCODE_B )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "G - Long Bow" ) PORT_CODE( KEYCODE_G )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "Y - Coins" ) PORT_CODE( KEYCODE_Y )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "Combine Action" ) PORT_CODE( KEYCODE_6_PAD )
- PORT_START_TAG("R6")
+ PORT_START("R6")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "N - Staff" ) PORT_CODE( KEYCODE_N )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "H - Medallion" ) PORT_CODE( KEYCODE_H )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "U - Cold Fire" ) PORT_CODE( KEYCODE_U )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "Save Game" ) PORT_CODE( KEYCODE_7_PAD )
- PORT_START_TAG("R7")
+ PORT_START("R7")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "M - Spell of Understanding" ) PORT_CODE( KEYCODE_M )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "J - Onyx Seal" ) PORT_CODE( KEYCODE_J )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "I - Crown" ) PORT_CODE( KEYCODE_I )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "Update" ) PORT_CODE( KEYCODE_8_PAD )
- PORT_START_TAG("R8")
+ PORT_START("R8")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "3 - Enter" ) PORT_CODE( KEYCODE_ENTER )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "K - Orb of Quoid" ) PORT_CODE( KEYCODE_K )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "O - Crystal" ) PORT_CODE( KEYCODE_O )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "Hint" ) PORT_CODE( KEYCODE_9_PAD )
- PORT_START_TAG("R9")
+ PORT_START("R9")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "4 - Space" ) PORT_CODE( KEYCODE_SPACE )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "L" ) PORT_CODE( KEYCODE_L )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME( "P" ) PORT_CODE( KEYCODE_P )
diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c
index 1cc549e6d0e..2e3602c6c17 100644
--- a/src/mame/drivers/thedeep.c
+++ b/src/mame/drivers/thedeep.c
@@ -209,7 +209,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( thedeep )
- PORT_START_TAG("e008")
+ PORT_START("e008")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) // Up / down shown in service mode
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
@@ -219,7 +219,7 @@ static INPUT_PORTS_START( thedeep )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("e009")
+ PORT_START("e009")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -229,7 +229,7 @@ static INPUT_PORTS_START( thedeep )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("e00a")
+ PORT_START("e00a")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
@@ -253,7 +253,7 @@ static INPUT_PORTS_START( thedeep )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("e00b")
+ PORT_START("e00b")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -274,7 +274,7 @@ static INPUT_PORTS_START( thedeep )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("MCU") // Read by the mcu
+ PORT_START("MCU") // Read by the mcu
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_IMPULSE(1)
diff --git a/src/mame/drivers/thepit.c b/src/mame/drivers/thepit.c
index 0c49981d450..bb80391f113 100644
--- a/src/mame/drivers/thepit.c
+++ b/src/mame/drivers/thepit.c
@@ -220,7 +220,7 @@ ADDRESS_MAP_END
#define IN0_REAL\
- PORT_START_TAG("IN0")\
+ PORT_START("IN0")\
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY\
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY\
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY\
@@ -232,7 +232,7 @@ ADDRESS_MAP_END
#define IN2_FAKE\
- PORT_START_TAG("IN2")\
+ PORT_START("IN2")\
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL\
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL\
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL\
@@ -246,7 +246,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( thepit )
IN0_REAL
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -256,7 +256,7 @@ static INPUT_PORTS_START( thepit )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_3C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_4C ) )
@@ -290,7 +290,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( roundup )
IN0_REAL
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -300,7 +300,7 @@ static INPUT_PORTS_START( roundup )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -331,7 +331,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( fitter )
IN0_REAL
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -341,7 +341,7 @@ static INPUT_PORTS_START( fitter )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -375,7 +375,7 @@ static INPUT_PORTS_START( intrepid )
IN0_REAL
/* The bit at 0x80 in IN0 Starts a timer, which, after it runs down, doesn't seem to do anything. See $0105 */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -385,7 +385,7 @@ static INPUT_PORTS_START( intrepid )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, "Invulnerability (Cheat)")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -419,7 +419,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( dockman )
IN0_REAL
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -429,7 +429,7 @@ static INPUT_PORTS_START( dockman )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -462,7 +462,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( suprmous )
IN0_REAL
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -472,7 +472,7 @@ static INPUT_PORTS_START( suprmous )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x07, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -504,7 +504,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( rtriv )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 )
@@ -514,7 +514,7 @@ static INPUT_PORTS_START( rtriv )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -524,7 +524,7 @@ static INPUT_PORTS_START( rtriv )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -555,7 +555,7 @@ static INPUT_PORTS_START( rtriv )
/* Since the real inputs are multiplexed, we used this fake port
to read the 2nd player controls when the screen is flipped */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2)
diff --git a/src/mame/drivers/thief.c b/src/mame/drivers/thief.c
index 49d4a056d30..769a1f949b6 100644
--- a/src/mame/drivers/thief.c
+++ b/src/mame/drivers/thief.c
@@ -219,13 +219,13 @@ ADDRESS_MAP_END
/**********************************************************/
static INPUT_PORTS_START( sharkatt )
- PORT_START_TAG("DSW1") /* IN0 */
+ PORT_START("DSW1") /* IN0 */
PORT_DIPNAME( 0x7f, 0x7f, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x7f, DEF_STR( 1C_1C ) ) // if any are set
PORT_SERVICE( 0x80, IP_ACTIVE_HIGH )
- PORT_START_TAG("DSW2") /* IN1 */
+ PORT_START("DSW2") /* IN1 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -250,7 +250,7 @@ static INPUT_PORTS_START( sharkatt )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START_TAG("P1") /* IN2 */
+ PORT_START("P1") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -260,7 +260,7 @@ static INPUT_PORTS_START( sharkatt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_START_TAG("P2") /* IN3 */
+ PORT_START("P2") /* IN3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -272,7 +272,7 @@ static INPUT_PORTS_START( sharkatt )
INPUT_PORTS_END
static INPUT_PORTS_START( thief )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -296,7 +296,7 @@ static INPUT_PORTS_START( thief )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x00|0x0c, "10K" )
PORT_DIPSETTING( 0x01|0x0c, "20K" )
@@ -319,7 +319,7 @@ static INPUT_PORTS_START( thief )
PORT_DIPSETTING( 0x80|0x60, "I/O Board Test" )
PORT_DIPSETTING( 0x80|0x70, "Reserved" )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
@@ -329,7 +329,7 @@ static INPUT_PORTS_START( thief )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
@@ -341,7 +341,7 @@ static INPUT_PORTS_START( thief )
INPUT_PORTS_END
static INPUT_PORTS_START( natodef )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
@@ -364,7 +364,7 @@ static INPUT_PORTS_START( natodef )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -386,7 +386,7 @@ static INPUT_PORTS_START( natodef )
PORT_DIPSETTING( 0x80|0x60, "I/O Board Test" )
PORT_DIPSETTING( 0x80|0x70, "Reserved" )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
@@ -396,7 +396,7 @@ static INPUT_PORTS_START( natodef )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
diff --git a/src/mame/drivers/thoop2.c b/src/mame/drivers/thoop2.c
index afc121d9f68..2f656fada39 100644
--- a/src/mame/drivers/thoop2.c
+++ b/src/mame/drivers/thoop2.c
@@ -112,7 +112,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( thoop2 )
-PORT_START /* DSW #2 */
+ PORT_START("DSW2") /* DSW #2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
@@ -135,7 +135,7 @@ PORT_START /* DSW #2 */
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
-PORT_START /* DSW #1 */
+ PORT_START("DSW1") /* DSW #1 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x02, DEF_STR( 6C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 5C_1C ) )
@@ -161,7 +161,7 @@ PORT_START /* DSW #1 */
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-PORT_START /* 1P INPUTS & COINSW */
+ PORT_START("P1") /* 1P INPUTS & COINSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -171,7 +171,7 @@ PORT_START /* 1P INPUTS & COINSW */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
-PORT_START /* 2P INPUTS & STARTSW */
+ PORT_START("P2") /* 2P INPUTS & STARTSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
@@ -181,7 +181,7 @@ PORT_START /* 2P INPUTS & STARTSW */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
-PORT_START /* INPUTS, TEST & SERVICE */
+ PORT_START("SYSTEM") /* INPUTS, TEST & SERVICE */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE2 ) /* test button */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
diff --git a/src/mame/drivers/thunderj.c b/src/mame/drivers/thunderj.c
index fe7418a975d..e3314cbcdf0 100644
--- a/src/mame/drivers/thunderj.c
+++ b/src/mame/drivers/thunderj.c
@@ -254,10 +254,10 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( thunderj )
- PORT_START_TAG("260000") /* 260000 */
+ PORT_START("260000") /* 260000 */
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("260010") /* 260010 */
+ PORT_START("260010") /* 260010 */
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -267,7 +267,7 @@ static INPUT_PORTS_START( thunderj )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_START_TAG("260012") /* 260012 */
+ PORT_START("260012") /* 260012 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_SERVICE( 0x0002, IP_ACTIVE_LOW )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED ) /* Input buffer full (@260030) */
diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c
index 4f4a2002c0f..4b580f61ebd 100644
--- a/src/mame/drivers/thunderx.c
+++ b/src/mame/drivers/thunderx.c
@@ -465,7 +465,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( scontra )
- PORT_START /* COINSW */
+ PORT_START("SYSTEM") /* COINSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -475,7 +475,7 @@ static INPUT_PORTS_START( scontra )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* PLAYER 1 INPUTS */
+ PORT_START("P1") /* PLAYER 1 INPUTS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -485,7 +485,7 @@ static INPUT_PORTS_START( scontra )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* PLAYER 2 INPUTS */
+ PORT_START("P2") /* PLAYER 2 INPUTS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -495,7 +495,7 @@ static INPUT_PORTS_START( scontra )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* DSW #1 */
+ PORT_START("DSW1") /* DSW #1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -531,7 +531,7 @@ static INPUT_PORTS_START( scontra )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START /* DSW #2 */
+ PORT_START("DSW2") /* DSW #2 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -554,7 +554,7 @@ static INPUT_PORTS_START( scontra )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW #3 */
+ PORT_START("DSW3") /* DSW #3 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -569,7 +569,7 @@ static INPUT_PORTS_START( scontra )
INPUT_PORTS_END
static INPUT_PORTS_START( thunderx )
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -579,7 +579,7 @@ static INPUT_PORTS_START( thunderx )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* PLAYER 1 INPUTS */
+ PORT_START("P1") /* PLAYER 1 INPUTS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -589,7 +589,7 @@ static INPUT_PORTS_START( thunderx )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* PLAYER 2 INPUTS */
+ PORT_START("P2") /* PLAYER 2 INPUTS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -599,7 +599,7 @@ static INPUT_PORTS_START( thunderx )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -635,7 +635,7 @@ static INPUT_PORTS_START( thunderx )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -658,7 +658,7 @@ static INPUT_PORTS_START( thunderx )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/tiamc1.c b/src/mame/drivers/tiamc1.c
index 6b87f3f7500..b8e0a6caa7f 100644
--- a/src/mame/drivers/tiamc1.c
+++ b/src/mame/drivers/tiamc1.c
@@ -209,7 +209,7 @@ static ADDRESS_MAP_START( tiamc1_readport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( tiamc1 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Player 0 JOYSTICK_RIGHT */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Player 2 JOYSTICK_RIGHT */
@@ -219,7 +219,7 @@ static INPUT_PORTS_START( tiamc1 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Player 2 JOYSTICK_LEFT */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Player 3 JOYSTICK_LEFT */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Player 0 JOYSTICK_UP */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Player 2 JOYSTICK_UP */
@@ -229,7 +229,7 @@ static INPUT_PORTS_START( tiamc1 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Player 2 JOYSTICK_DOWN */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SERVICE )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* OUT:coin lockout */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* OUT:game counter */
diff --git a/src/mame/drivers/tickee.c b/src/mame/drivers/tickee.c
index 2be4e02d903..3895bf1803c 100644
--- a/src/mame/drivers/tickee.c
+++ b/src/mame/drivers/tickee.c
@@ -250,7 +250,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( tickee )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x01, "Game Time/Diff" )
PORT_DIPSETTING( 0x03, "Very Fast/Very Easy" )
PORT_DIPSETTING( 0x02, "Fast/Easy" )
@@ -273,13 +273,13 @@ static INPUT_PORTS_START( tickee )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ))
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_2C ))
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* right ticket status */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* left ticket status */
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -288,25 +288,25 @@ static INPUT_PORTS_START( tickee )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_BIT( 0xfffe, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("GUNX1") /* fake analog X */
+ PORT_START("GUNX1") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("GUNY1") /* fake analog Y */
+ PORT_START("GUNY1") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10)
- PORT_START_TAG("GUNX2") /* fake analog X */
+ PORT_START("GUNX2") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("GUNY2") /* fake analog Y */
+ PORT_START("GUNY2") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( ghoshunt )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, "Messages in Play")
PORT_DIPSETTING( 0x01, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ))
@@ -330,14 +330,14 @@ static INPUT_PORTS_START( ghoshunt )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ))
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_2C ))
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* right ticket status */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* left ticket status */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0xd8, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -346,23 +346,23 @@ static INPUT_PORTS_START( ghoshunt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* right ticket status */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* left ticket status */
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0xd8, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("GUNX1") /* fake analog X */
+ PORT_START("GUNX1") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
- PORT_START_TAG("GUNY1") /* fake analog Y */
+ PORT_START("GUNY1") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10)
- PORT_START_TAG("GUNX2") /* fake analog X */
+ PORT_START("GUNX2") /* fake analog X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("GUNY2") /* fake analog Y */
+ PORT_START("GUNY2") /* fake analog Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) PORT_PLAYER(2)
INPUT_PORTS_END
diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c
index ef467d7b969..6c931b1144a 100644
--- a/src/mame/drivers/tigeroad.c
+++ b/src/mame/drivers/tigeroad.c
@@ -241,7 +241,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( tigeroad )
- PORT_START /* IN0 */
+ PORT_START("P1_P2") /* IN0 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -259,7 +259,7 @@ static INPUT_PORTS_START( tigeroad )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
@@ -270,7 +270,7 @@ static INPUT_PORTS_START( tigeroad )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START /* dipswitch */
+ PORT_START("DSW") /* dipswitch */
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) )
@@ -317,7 +317,7 @@ static INPUT_PORTS_START( tigeroad )
INPUT_PORTS_END
static INPUT_PORTS_START( toramich )
- PORT_START /* IN0 */
+ PORT_START("P1_P2") /* IN0 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -335,7 +335,7 @@ static INPUT_PORTS_START( toramich )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
@@ -346,7 +346,7 @@ static INPUT_PORTS_START( toramich )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START /* dipswitch */
+ PORT_START("DSW") /* dipswitch */
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) )
@@ -394,7 +394,7 @@ static INPUT_PORTS_START( toramich )
INPUT_PORTS_END
static INPUT_PORTS_START( f1dream )
- PORT_START /* IN0 */
+ PORT_START("P1_P2") /* IN0 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -412,7 +412,7 @@ static INPUT_PORTS_START( f1dream )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("SYSTEM")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
@@ -423,7 +423,7 @@ static INPUT_PORTS_START( f1dream )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START /* dipswitch */
+ PORT_START("DSW") /* dipswitch */
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/timelimt.c b/src/mame/drivers/timelimt.c
index a8c68229a86..f48b7379c20 100644
--- a/src/mame/drivers/timelimt.c
+++ b/src/mame/drivers/timelimt.c
@@ -114,7 +114,7 @@ ADDRESS_MAP_END
/***************************************************************************/
static INPUT_PORTS_START( timelimt )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY
@@ -124,7 +124,7 @@ static INPUT_PORTS_START( timelimt )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -134,7 +134,7 @@ static INPUT_PORTS_START( timelimt )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -159,7 +159,7 @@ static INPUT_PORTS_START( timelimt )
INPUT_PORTS_END
static INPUT_PORTS_START( progress )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
@@ -169,7 +169,7 @@ static INPUT_PORTS_START( progress )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON3 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -179,7 +179,7 @@ static INPUT_PORTS_START( progress )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
diff --git a/src/mame/drivers/timeplt.c b/src/mame/drivers/timeplt.c
index a88cb1b7052..fa51fc80eb7 100644
--- a/src/mame/drivers/timeplt.c
+++ b/src/mame/drivers/timeplt.c
@@ -173,7 +173,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( timeplt )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -181,7 +181,7 @@ static INPUT_PORTS_START( timeplt )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -189,7 +189,7 @@ static INPUT_PORTS_START( timeplt )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -197,7 +197,7 @@ static INPUT_PORTS_START( timeplt )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -233,7 +233,7 @@ static INPUT_PORTS_START( timeplt )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c
index ac936afd338..6b78088baee 100644
--- a/src/mame/drivers/tmaster.c
+++ b/src/mame/drivers/tmaster.c
@@ -647,7 +647,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( tm )
PORT_INCLUDE(microtouch)
- PORT_START_TAG("COIN") // IN3
+ PORT_START("COIN") // IN3
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN5 ) // "M. Coin 1 Input"
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN6 ) // "M. Coin 2 Input"
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BILL1 ) PORT_IMPULSE(2) // "DBV Input"
@@ -669,7 +669,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( tmaster )
PORT_INCLUDE(microtouch)
- PORT_START_TAG("COIN") // IN3
+ PORT_START("COIN") // IN3
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) // "M. Coin 1 Input"
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) // "M. Coin 2 Input"
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BILL1 ) PORT_IMPULSE(2) // "DBV Input"
@@ -689,19 +689,19 @@ static INPUT_PORTS_START( tmaster )
INPUT_PORTS_END
static INPUT_PORTS_START( galgames )
- PORT_START_TAG("TRACKBALL_1_X")
+ PORT_START("TRACKBALL_1_X")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(5) PORT_PLAYER(1) PORT_RESET
- PORT_START_TAG("TRACKBALL_1_Y")
+ PORT_START("TRACKBALL_1_Y")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(5) PORT_PLAYER(1) PORT_RESET
- PORT_START_TAG("TRACKBALL_2_X")
+ PORT_START("TRACKBALL_2_X")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(5) PORT_PLAYER(2) PORT_RESET
- PORT_START_TAG("TRACKBALL_2_Y")
+ PORT_START("TRACKBALL_2_Y")
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(5) PORT_PLAYER(2) PORT_RESET
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -712,7 +712,7 @@ static INPUT_PORTS_START( galgames )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN5")
+ PORT_START("IN5")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -723,7 +723,7 @@ static INPUT_PORTS_START( galgames )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN6")
+ PORT_START("IN6")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) // CS 1 (coin)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) // CS 2 (coin)
PORT_SERVICE_NO_TOGGLE( 0x0004, IP_ACTIVE_LOW ) // System Check
diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c
index df74d9c5134..b7b99ed71d3 100644
--- a/src/mame/drivers/tmnt.c
+++ b/src/mame/drivers/tmnt.c
@@ -1337,7 +1337,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x8000, IP_ACTIVE_LOW, start )
static INPUT_PORTS_START( cuebrick )
- PORT_START_TAG("COINS") /* COINS */
+ PORT_START("COINS") /* COINS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1347,13 +1347,13 @@ static INPUT_PORTS_START( cuebrick )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P1") /* PLAYER 1 */
+ PORT_START("P1") /* PLAYER 1 */
KONAMI_PLAYERS_INPUT_LSB( 1, IPT_BUTTON3, IPT_UNUSED )
- PORT_START_TAG("P2") /* PLAYER 2 */
+ PORT_START("P2") /* PLAYER 2 */
KONAMI_PLAYERS_INPUT_LSB( 2, IPT_BUTTON3, IPT_UNUSED )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -1374,7 +1374,7 @@ static INPUT_PORTS_START( cuebrick )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -1410,7 +1410,7 @@ static INPUT_PORTS_START( cuebrick )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START_TAG("DSW3") /* DSW3 */
+ PORT_START("DSW3") /* DSW3 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1422,7 +1422,7 @@ static INPUT_PORTS_START( cuebrick )
INPUT_PORTS_END
static INPUT_PORTS_START( mia )
- PORT_START_TAG("COINS") /* COINS */
+ PORT_START("COINS") /* COINS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1432,13 +1432,13 @@ static INPUT_PORTS_START( mia )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P1") /* PLAYER 1 */
+ PORT_START("P1") /* PLAYER 1 */
KONAMI_PLAYERS_INPUT_LSB( 1, IPT_BUTTON3, IPT_UNUSED )
- PORT_START_TAG("P2") /* PLAYER 2 */
+ PORT_START("P2") /* PLAYER 2 */
KONAMI_PLAYERS_INPUT_LSB( 2, IPT_BUTTON3, IPT_UNUSED )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -1474,7 +1474,7 @@ static INPUT_PORTS_START( mia )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START_TAG("DSW2") /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -1495,7 +1495,7 @@ static INPUT_PORTS_START( mia )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* DSW3 */
+ PORT_START("DSW3") /* DSW3 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1507,7 +1507,7 @@ static INPUT_PORTS_START( mia )
INPUT_PORTS_END
static INPUT_PORTS_START( tmnt )
- PORT_START_TAG("COINS") /* COINS */
+ PORT_START("COINS") /* COINS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -1517,16 +1517,16 @@ static INPUT_PORTS_START( tmnt )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE4 )
- PORT_START_TAG("P1") /* PLAYER 1 */
+ PORT_START("P1") /* PLAYER 1 */
KONAMI_PLAYERS_INPUT_LSB( 1, IPT_UNKNOWN, IPT_UNKNOWN )
- PORT_START_TAG("P2") /* PLAYER 2 */
+ PORT_START("P2") /* PLAYER 2 */
KONAMI_PLAYERS_INPUT_LSB( 2, IPT_UNKNOWN, IPT_UNKNOWN )
- PORT_START_TAG("P3") /* PLAYER 3 */
+ PORT_START("P3") /* PLAYER 3 */
KONAMI_PLAYERS_INPUT_LSB( 3, IPT_UNKNOWN, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
@@ -1545,7 +1545,7 @@ static INPUT_PORTS_START( tmnt )
PORT_DIPSETTING( 0x0a, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x09, DEF_STR( 1C_7C ) )
- PORT_START_TAG("DSW2") /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -1569,10 +1569,10 @@ static INPUT_PORTS_START( tmnt )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("P4") /* PLAYER 4 */
+ PORT_START("P4") /* PLAYER 4 */
KONAMI_PLAYERS_INPUT_LSB( 4, IPT_UNKNOWN, IPT_UNKNOWN )
- PORT_START_TAG("DSW3") /* DSW3 */
+ PORT_START("DSW3") /* DSW3 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1587,7 +1587,7 @@ static INPUT_PORTS_START( tmnt )
INPUT_PORTS_END
static INPUT_PORTS_START( tmnt2p )
- PORT_START_TAG("COINS") /* COINS */
+ PORT_START("COINS") /* COINS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1597,16 +1597,16 @@ static INPUT_PORTS_START( tmnt2p )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P1") /* PLAYER 1 */
+ PORT_START("P1") /* PLAYER 1 */
KONAMI_PLAYERS_INPUT_LSB( 1, IPT_UNKNOWN, IPT_START1 )
- PORT_START_TAG("P2") /* PLAYER 2 */
+ PORT_START("P2") /* PLAYER 2 */
KONAMI_PLAYERS_INPUT_LSB( 2, IPT_UNKNOWN, IPT_START2 )
- PORT_START_TAG("P3") /* PLAYER 3 */
+ PORT_START("P3") /* PLAYER 3 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -1642,7 +1642,7 @@ static INPUT_PORTS_START( tmnt2p )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START_TAG("DSW2") /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -1666,10 +1666,10 @@ static INPUT_PORTS_START( tmnt2p )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("P4") /* PLAYER 4 */
+ PORT_START("P4") /* PLAYER 4 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW3") /* DSW3 */
+ PORT_START("DSW3") /* DSW3 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1684,7 +1684,7 @@ static INPUT_PORTS_START( tmnt2p )
INPUT_PORTS_END
static INPUT_PORTS_START( punkshot )
- PORT_START_TAG("DSW1/DSW2") /* DSW1/DSW2 */
+ PORT_START("DSW1/DSW2") /* DSW1/DSW2 */
PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) )
@@ -1736,7 +1736,7 @@ static INPUT_PORTS_START( punkshot )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("COINS/DSW3") /* COIN/DSW3 */
+ PORT_START("COINS/DSW3") /* COIN/DSW3 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -1760,17 +1760,17 @@ static INPUT_PORTS_START( punkshot )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("P1/P2") /* IN0/IN1 */
+ PORT_START("P1/P2") /* IN0/IN1 */
KONAMI_PLAYERS_INPUT_LSB( 1, IPT_UNKNOWN, IPT_UNKNOWN )
KONAMI_PLAYERS_INPUT_MSB( 2, IPT_UNKNOWN, IPT_UNKNOWN )
- PORT_START_TAG("P3/P4") /* IN2/IN3 */
+ PORT_START("P3/P4") /* IN2/IN3 */
KONAMI_PLAYERS_INPUT_LSB( 3, IPT_UNKNOWN, IPT_UNKNOWN )
KONAMI_PLAYERS_INPUT_MSB( 4, IPT_UNKNOWN, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( punksht2 )
- PORT_START_TAG("DSW1/DSW2") /* DSW1/DSW2 */
+ PORT_START("DSW1/DSW2") /* DSW1/DSW2 */
PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) )
@@ -1822,7 +1822,7 @@ static INPUT_PORTS_START( punksht2 )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("COINS/DSW3") /* COIN/DSW3 */
+ PORT_START("COINS/DSW3") /* COIN/DSW3 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1846,16 +1846,16 @@ static INPUT_PORTS_START( punksht2 )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("P1/P2") /* IN0/IN1 */
+ PORT_START("P1/P2") /* IN0/IN1 */
KONAMI_PLAYERS_INPUT_LSB( 1, IPT_UNKNOWN, IPT_UNKNOWN )
KONAMI_PLAYERS_INPUT_MSB( 2, IPT_UNKNOWN, IPT_UNKNOWN )
- PORT_START_TAG("P3/P4") /* IN2/IN3 */
+ PORT_START("P3/P4") /* IN2/IN3 */
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( lgtnfght )
- PORT_START_TAG("COINS")
+ PORT_START("COINS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* vblank? checked during boot */
@@ -1865,13 +1865,13 @@ static INPUT_PORTS_START( lgtnfght )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P1")
+ PORT_START("P1")
KONAMI_PLAYERS_INPUT_LSB( 1, IPT_BUTTON3, IPT_UNKNOWN )
- PORT_START_TAG("P2")
+ PORT_START("P2")
KONAMI_PLAYERS_INPUT_LSB( 2, IPT_BUTTON3, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -1894,7 +1894,7 @@ static INPUT_PORTS_START( lgtnfght )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -1930,7 +1930,7 @@ static INPUT_PORTS_START( lgtnfght )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
// PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START_TAG("DSW3") /* DSW3 */
+ PORT_START("DSW3") /* DSW3 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1945,13 +1945,13 @@ static INPUT_PORTS_START( lgtnfght )
INPUT_PORTS_END
static INPUT_PORTS_START( blswhstl )
- PORT_START_TAG("P1") /* IN0 */
+ PORT_START("P1") /* IN0 */
KONAMI_PLAYERS_INPUT_LSB( 1, IPT_UNKNOWN, IPT_UNKNOWN )
- PORT_START_TAG("P2") /* IN1 */
+ PORT_START("P2") /* IN1 */
KONAMI_PLAYERS_INPUT_LSB( 2, IPT_UNKNOWN, IPT_UNKNOWN )
- PORT_START_TAG("COINS") /* COIN */
+ PORT_START("COINS") /* COIN */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1961,22 +1961,22 @@ static INPUT_PORTS_START( blswhstl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* VBLANK? OBJMPX? */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("EEPROM") /* EEPROM */
+ PORT_START("EEPROM") /* EEPROM */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM status? - always 1 */
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( glfgreat )
- PORT_START_TAG("P1/P2") /* IN0 */
+ PORT_START("P1/P2") /* IN0 */
KONAMI_PLAYERS_INPUT_LSB( 1, IPT_BUTTON3, IPT_BUTTON4 ) PORT_PLAYER(1)
KONAMI_PLAYERS_INPUT_MSB( 2, IPT_BUTTON3, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_START_TAG("P3/P4") /* IN1 */
+ PORT_START("P3/P4") /* IN1 */
KONAMI_PLAYERS_INPUT_LSB( 3, IPT_BUTTON3, IPT_BUTTON4 ) PORT_PLAYER(3)
KONAMI_PLAYERS_INPUT_MSB( 4, IPT_BUTTON3, IPT_BUTTON4 ) PORT_PLAYER(4)
- PORT_START_TAG("DSW1/DSW2")
+ PORT_START("DSW1/DSW2")
PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0005, DEF_STR( 3C_1C ) )
@@ -2033,7 +2033,7 @@ static INPUT_PORTS_START( glfgreat )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("COINS/DSW3")
+ PORT_START("COINS/DSW3")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -2062,13 +2062,13 @@ static INPUT_PORTS_START( glfgreat )
INPUT_PORTS_END
static INPUT_PORTS_START( ssriders )
- PORT_START_TAG("P1") /* IN0 */
+ PORT_START("P1") /* IN0 */
KONAMI_PLAYERS_INPUT_LSB( 1, IPT_UNKNOWN, IPT_START1 )
- PORT_START_TAG("P2") /* IN1 */
+ PORT_START("P2") /* IN1 */
KONAMI_PLAYERS_INPUT_LSB( 2, IPT_UNKNOWN, IPT_START2 )
- PORT_START_TAG("COINS") /* COIN */
+ PORT_START("COINS") /* COIN */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2078,7 +2078,7 @@ static INPUT_PORTS_START( ssriders )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("EEPROM") /* EEPROM and service */
+ PORT_START("EEPROM") /* EEPROM and service */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM status? - always 1 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* ?? TMNT2: OBJMPX */
@@ -2087,21 +2087,21 @@ static INPUT_PORTS_START( ssriders )
PORT_BIT( 0x60, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("P3") /* IN2 */
+ PORT_START("P3") /* IN2 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P4") /* IN3 */
+ PORT_START("P4") /* IN3 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( ssridr4p )
- PORT_START_TAG("P1") /* IN0 */
+ PORT_START("P1") /* IN0 */
KONAMI_PLAYERS_INPUT_LSB( 1, IPT_UNKNOWN, IPT_UNKNOWN )
- PORT_START_TAG("P2") /* IN1 */
+ PORT_START("P2") /* IN1 */
KONAMI_PLAYERS_INPUT_LSB( 2, IPT_UNKNOWN, IPT_UNKNOWN )
- PORT_START_TAG("COINS") /* COIN */
+ PORT_START("COINS") /* COIN */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -2111,7 +2111,7 @@ static INPUT_PORTS_START( ssridr4p )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE4 )
- PORT_START_TAG("EEPROM") /* EEPROM and service */
+ PORT_START("EEPROM") /* EEPROM and service */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM status? - always 1 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* ?? TMNT2: OBJMPX */
@@ -2120,23 +2120,23 @@ static INPUT_PORTS_START( ssridr4p )
PORT_BIT( 0x60, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("P3") /* IN2 */
+ PORT_START("P3") /* IN2 */
KONAMI_PLAYERS_INPUT_LSB( 3, IPT_UNKNOWN, IPT_UNKNOWN )
- PORT_START_TAG("P4") /* IN3 */
+ PORT_START("P4") /* IN3 */
KONAMI_PLAYERS_INPUT_LSB( 4, IPT_UNKNOWN, IPT_UNKNOWN )
INPUT_PORTS_END
/* Same as 'ssridr4p', but additional Start button for each player.
COIN3, COIN4, SERVICE3 and SERVICE4 only have an effect in the "test mode". */
static INPUT_PORTS_START( ssrid4ps )
- PORT_START_TAG("P1") /* IN0 */
+ PORT_START("P1") /* IN0 */
KONAMI_PLAYERS_INPUT_LSB( 1, IPT_UNKNOWN, IPT_START1 )
- PORT_START_TAG("P2") /* IN1 */
+ PORT_START("P2") /* IN1 */
KONAMI_PLAYERS_INPUT_LSB( 2, IPT_UNKNOWN, IPT_START2 )
- PORT_START_TAG("COINS") /* COIN */
+ PORT_START("COINS") /* COIN */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -2146,7 +2146,7 @@ static INPUT_PORTS_START( ssrid4ps )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE4 )
- PORT_START_TAG("EEPROM") /* EEPROM and service */
+ PORT_START("EEPROM") /* EEPROM and service */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM status? - always 1 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* ?? TMNT2: OBJMPX */
@@ -2155,22 +2155,22 @@ static INPUT_PORTS_START( ssrid4ps )
PORT_BIT( 0x60, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("P3") /* IN2 */
+ PORT_START("P3") /* IN2 */
KONAMI_PLAYERS_INPUT_LSB( 3, IPT_UNKNOWN, IPT_START3 )
- PORT_START_TAG("P4") /* IN3 */
+ PORT_START("P4") /* IN3 */
KONAMI_PLAYERS_INPUT_LSB( 4, IPT_UNKNOWN, IPT_START4 )
INPUT_PORTS_END
/* Version for the bootleg, which has the service switch a little different */
static INPUT_PORTS_START( sunsetbl )
- PORT_START_TAG("P1") /* IN0 */
+ PORT_START("P1") /* IN0 */
KONAMI_PLAYERS_INPUT_LSB( 1, IPT_UNKNOWN, IPT_START1 )
- PORT_START_TAG("P2") /* IN1 */
+ PORT_START("P2") /* IN1 */
KONAMI_PLAYERS_INPUT_LSB( 2, IPT_UNKNOWN, IPT_START2 )
- PORT_START_TAG("COINS") /* COIN */
+ PORT_START("COINS") /* COIN */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -2180,7 +2180,7 @@ static INPUT_PORTS_START( sunsetbl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE4 )
- PORT_START_TAG("EEPROM") /* EEPROM and service */
+ PORT_START("EEPROM") /* EEPROM and service */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM status? - always 1 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2189,15 +2189,15 @@ static INPUT_PORTS_START( sunsetbl )
PORT_BIT( 0x60, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("P3") /* IN2 */
+ PORT_START("P3") /* IN2 */
KONAMI_PLAYERS_INPUT_LSB( 3, IPT_UNKNOWN, IPT_START3 )
- PORT_START_TAG("P4") /* IN3 */
+ PORT_START("P4") /* IN3 */
KONAMI_PLAYERS_INPUT_LSB( 4, IPT_UNKNOWN, IPT_START4 )
INPUT_PORTS_END
static INPUT_PORTS_START( qgakumon )
- PORT_START_TAG("P1") /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) // Joystick control : Left
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) // Joystick control : Right
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) // Joystick control : Up
@@ -2207,7 +2207,7 @@ static INPUT_PORTS_START( qgakumon )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) // Joystick control : Left
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) // Joystick control : Right
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) // Joystick control : Up
@@ -2217,7 +2217,7 @@ static INPUT_PORTS_START( qgakumon )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("COINS") /* COIN */
+ PORT_START("COINS") /* COIN */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -2227,7 +2227,7 @@ static INPUT_PORTS_START( qgakumon )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("EEPROM") /* EEPROM and service */
+ PORT_START("EEPROM") /* EEPROM and service */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM status? - always 1 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* ?? TMNT2: OBJMPX */
@@ -2236,15 +2236,15 @@ static INPUT_PORTS_START( qgakumon )
PORT_BIT( 0x60, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("P3") /* IN2 */
+ PORT_START("P3") /* IN2 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P4") /* IN3 */
+ PORT_START("P4") /* IN3 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( thndrx2 )
- PORT_START_TAG("P1/COINS")
+ PORT_START("P1/COINS")
KONAMI_PLAYERS_INPUT_LSB( 1, IPT_UNKNOWN, IPT_START1 )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -2255,7 +2255,7 @@ static INPUT_PORTS_START( thndrx2 )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2/EEPROM") /* EEPROM and service */
+ PORT_START("P2/EEPROM") /* EEPROM and service */
KONAMI_PLAYERS_INPUT_LSB( 2, IPT_UNKNOWN, IPT_START2 )
PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM status? - always 1 */
@@ -2268,7 +2268,7 @@ static INPUT_PORTS_START( thndrx2 )
INPUT_PORTS_END
static INPUT_PORTS_START( prmrsocr )
- PORT_START_TAG("P1/COINS")
+ PORT_START("P1/COINS")
KONAMI_PLAYERS_INPUT_LSB( 1, IPT_UNKNOWN, IPT_START1 )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_SERVICE_NO_TOGGLE( 0x0200, IP_ACTIVE_LOW )
@@ -2287,7 +2287,7 @@ static INPUT_PORTS_START( prmrsocr )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("P2/EEPROM")
+ PORT_START("P2/EEPROM")
KONAMI_PLAYERS_INPUT_LSB( 2, IPT_UNKNOWN, IPT_START2 )
PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM status? - always 1 */
diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c
index 17ddb3ed693..372a2123f77 100644
--- a/src/mame/drivers/tnzs.c
+++ b/src/mame/drivers/tnzs.c
@@ -617,7 +617,7 @@ static ADDRESS_MAP_START( jpopnics_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
#define COMMON_IN2\
- PORT_START_TAG("IN2")\
+ PORT_START("IN2")\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT )\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )\
@@ -628,17 +628,17 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
#define COMMON_COIN1(coinstate)\
- PORT_START_TAG("COIN1")\
+ PORT_START("COIN1")\
PORT_BIT( 0x01, coinstate, IPT_COIN1 )\
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
#define COMMON_COIN2(coinstate)\
- PORT_START_TAG("COIN2")\
+ PORT_START("COIN2")\
PORT_BIT( 0x01, coinstate, IPT_COIN2 )\
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
static INPUT_PORTS_START( extrmatn )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -651,7 +651,7 @@ static INPUT_PORTS_START( extrmatn )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
TAITO_COINAGE_JAPAN_OLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -675,10 +675,10 @@ static INPUT_PORTS_START( extrmatn )
PORT_DIPSETTING( 0x40, "*2" )
PORT_DIPSETTING( 0x00, "*3" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_LRUD_2_BUTTONS_START( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_LRUD_2_BUTTONS_START( 2 )
COMMON_IN2
@@ -687,7 +687,7 @@ static INPUT_PORTS_START( extrmatn )
INPUT_PORTS_END
static INPUT_PORTS_START( arknoid2 )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -700,7 +700,7 @@ static INPUT_PORTS_START( arknoid2 )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -723,7 +723,7 @@ static INPUT_PORTS_START( arknoid2 )
PORT_DIPSETTING( 0x80, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
- PORT_START_TAG("IN0") /* read at c000 (sound cpu) */
+ PORT_START("IN0") /* read at c000 (sound cpu) */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -733,21 +733,21 @@ static INPUT_PORTS_START( arknoid2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
COMMON_IN2
COMMON_COIN1(IP_ACTIVE_HIGH)
COMMON_COIN2(IP_ACTIVE_HIGH)
- PORT_START_TAG("AN1") /* spinner 1 - read at f000/1 */\
+ PORT_START("AN1") /* spinner 1 - read at f000/1 */\
PORT_BIT ( 0x0fff, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(70) PORT_KEYDELTA(15)\
PORT_BIT ( 0x1000, IP_ACTIVE_LOW, IPT_COIN2 ) /* Mirrored for service mode */\
PORT_BIT ( 0x2000, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* Mirrored for service mode */\
PORT_BIT ( 0x4000, IP_ACTIVE_LOW, IPT_COIN1 ) /* Mirrored for service mode */\
PORT_BIT ( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )\
- PORT_START_TAG("AN2") /* spinner 2 - read at f002/3 */\
+ PORT_START("AN2") /* spinner 2 - read at f002/3 */\
PORT_BIT ( 0x0fff, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(70) PORT_KEYDELTA(15) PORT_PLAYER(2)\
PORT_BIT ( 0xf000, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -760,7 +760,7 @@ static INPUT_PORTS_START( arknid2u )
INPUT_PORTS_END
static INPUT_PORTS_START( plumppop )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -773,7 +773,7 @@ static INPUT_PORTS_START( plumppop )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_JAPAN_OLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Medium ) )
@@ -796,7 +796,7 @@ static INPUT_PORTS_START( plumppop )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -806,7 +806,7 @@ static INPUT_PORTS_START( plumppop )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -816,7 +816,7 @@ static INPUT_PORTS_START( plumppop )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -829,33 +829,33 @@ static INPUT_PORTS_START( plumppop )
COMMON_COIN1(IP_ACTIVE_HIGH)
COMMON_COIN2(IP_ACTIVE_HIGH)
- PORT_START_TAG("AN1") /* spinner 1 - read at f000/1 */
+ PORT_START("AN1") /* spinner 1 - read at f000/1 */
PORT_BIT( 0xffff, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(70) PORT_KEYDELTA(15)
- PORT_START_TAG("AN2") /* spinner 2 - read at f002/3 */
+ PORT_START("AN2") /* spinner 2 - read at f002/3 */
PORT_BIT( 0xffff, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(70) PORT_KEYDELTA(15) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( jpopnics )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Button 2 (Cheat)")
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P2 Button 2 (Cheat)") PORT_PLAYER(2)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -868,7 +868,7 @@ static INPUT_PORTS_START( jpopnics )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_JAPAN_OLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Medium ) )
@@ -891,21 +891,21 @@ static INPUT_PORTS_START( jpopnics )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START_TAG("COIN1")
+ PORT_START("COIN1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("COIN2")
+ PORT_START("COIN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN1") /* spinner 1 - read at f000/1 */
+ PORT_START("AN1") /* spinner 1 - read at f000/1 */
PORT_BIT( 0xffff, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(70) PORT_KEYDELTA(15)
- PORT_START_TAG("AN2") /* spinner 2 - read at f002/3 */
+ PORT_START("AN2") /* spinner 2 - read at f002/3 */
PORT_BIT( 0xffff, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(70) PORT_KEYDELTA(15) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( drtoppel )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -918,7 +918,7 @@ static INPUT_PORTS_START( drtoppel )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Medium ) )
@@ -941,10 +941,10 @@ static INPUT_PORTS_START( drtoppel )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_LRUD_2_BUTTONS_START( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_LRUD_2_BUTTONS_START( 2 )
COMMON_IN2
@@ -960,7 +960,7 @@ static INPUT_PORTS_START( drtopplu )
INPUT_PORTS_END
static INPUT_PORTS_START( chukatai )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -973,7 +973,7 @@ static INPUT_PORTS_START( chukatai )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Medium ) )
@@ -996,10 +996,10 @@ static INPUT_PORTS_START( chukatai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_LRUD_2_BUTTONS_START( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_LRUD_2_BUTTONS_START( 2 )
COMMON_IN2
@@ -1015,7 +1015,7 @@ static INPUT_PORTS_START( chukatau )
INPUT_PORTS_END
static INPUT_PORTS_START( tnzs )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1028,7 +1028,7 @@ static INPUT_PORTS_START( tnzs )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
TAITO_COINAGE_JAPAN_OLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Medium ) )
@@ -1051,10 +1051,10 @@ static INPUT_PORTS_START( tnzs )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_LRUD_2_BUTTONS_START( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_LRUD_2_BUTTONS_START( 2 )
COMMON_IN2
@@ -1107,7 +1107,7 @@ static INPUT_PORTS_START( tnzs2 )
INPUT_PORTS_END
static INPUT_PORTS_START( kabukiz )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1131,7 +1131,7 @@ static INPUT_PORTS_START( kabukiz )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -1145,10 +1145,10 @@ static INPUT_PORTS_START( kabukiz )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
TAITO_COINAGE_JAPAN_OLD
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_LRUD_2_BUTTONS_START( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_COCKTAIL
@@ -1158,7 +1158,7 @@ static INPUT_PORTS_START( kabukiz )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1171,7 +1171,7 @@ static INPUT_PORTS_START( kabukiz )
INPUT_PORTS_END
static INPUT_PORTS_START( insectx )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1184,7 +1184,7 @@ static INPUT_PORTS_START( insectx )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_WORLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Medium ) )
@@ -1207,13 +1207,13 @@ static INPUT_PORTS_START( insectx )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_LRUD_2_BUTTONS_START( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_LRUD_2_BUTTONS_START( 2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -1225,7 +1225,7 @@ static INPUT_PORTS_START( insectx )
INPUT_PORTS_END
static INPUT_PORTS_START( kageki )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -1238,7 +1238,7 @@ static INPUT_PORTS_START( kageki )
PORT_DIPSETTING( 0x08, DEF_STR( On ) )
TAITO_COINAGE_JAPAN_OLD
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Medium ) )
@@ -1263,13 +1263,13 @@ static INPUT_PORTS_START( kageki )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
TAITO_JOY_LRUD_2_BUTTONS_START( 1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_LRUD_2_BUTTONS_START( 2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c
index 8236dc80bab..a2b2e875d86 100644
--- a/src/mame/drivers/toaplan1.c
+++ b/src/mame/drivers/toaplan1.c
@@ -383,7 +383,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
#define TOAPLAN1_SYSTEM_INPUTS \
- PORT_START_TAG("SYSTEM") \
+ PORT_START("SYSTEM") \
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) \
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_TILT ) \
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) \
@@ -394,7 +394,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
#define TOAPLAN1_VBLANK_INPUT \
- PORT_START_TAG("VBLANK") \
+ PORT_START("VBLANK") \
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_VBLANK ) \
PORT_BIT( 0xfffe, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -402,13 +402,13 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( rallybik )
TOAPLAN1_VBLANK_INPUT
- PORT_START_TAG("P1")
+ PORT_START("P1")
TOAPLAN1_PLAYER_INPUT( 1, IPT_UNKNOWN, )
- PORT_START_TAG("P2")
+ PORT_START("P2")
TOAPLAN1_PLAYER_INPUT( 2, IPT_UNKNOWN, PORT_COCKTAIL )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -430,7 +430,7 @@ static INPUT_PORTS_START( rallybik )
PORT_DIPSETTING( 0xc0, DEF_STR( 2C_3C ) )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_2C ) )
- PORT_START_TAG("DSWB") /* DSW B */
+ PORT_START("DSWB") /* DSW B */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x00, DEF_STR( Medium ) )
@@ -460,13 +460,13 @@ INPUT_PORTS_END
static INPUT_PORTS_START( truxton )
TOAPLAN1_VBLANK_INPUT
- PORT_START_TAG("P1")
+ PORT_START("P1")
TOAPLAN1_PLAYER_INPUT( 1, IPT_UNKNOWN, )
- PORT_START_TAG("P2")
+ PORT_START("P2")
TOAPLAN1_PLAYER_INPUT( 2, IPT_UNKNOWN, PORT_COCKTAIL )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -501,7 +501,7 @@ static INPUT_PORTS_START( truxton )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_6C ) )
*/
- PORT_START_TAG("DSWB") /* DSW B */
+ PORT_START("DSWB") /* DSW B */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x00, DEF_STR( Medium ) )
@@ -526,7 +526,7 @@ static INPUT_PORTS_START( truxton )
TOAPLAN1_SYSTEM_INPUTS
- PORT_START_TAG("TJUMP") /* Territory Jumper Block */
+ PORT_START("TJUMP") /* Territory Jumper Block */
PORT_DIPNAME( 0x07, 0x02, "Territory/Copyright" )
PORT_DIPSETTING( 0x02, "World/Taito Corp" )
PORT_DIPSETTING( 0x06, "World/Taito America" )
@@ -545,13 +545,13 @@ INPUT_PORTS_END
static INPUT_PORTS_START( hellfire )
TOAPLAN1_VBLANK_INPUT
- PORT_START_TAG("P1")
+ PORT_START("P1")
TOAPLAN1_PLAYER_INPUT( 1, IPT_UNKNOWN, )
- PORT_START_TAG("P2")
+ PORT_START("P2")
TOAPLAN1_PLAYER_INPUT( 2, IPT_UNKNOWN, )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -573,7 +573,7 @@ static INPUT_PORTS_START( hellfire )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_6C ) )
- PORT_START_TAG("DSWB") /* DSWB */
+ PORT_START("DSWB") /* DSWB */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x00, DEF_STR( Medium ) )
@@ -598,7 +598,7 @@ static INPUT_PORTS_START( hellfire )
TOAPLAN1_SYSTEM_INPUTS
- PORT_START_TAG("TJUMP") /* Territory Jumper block */
+ PORT_START("TJUMP") /* Territory Jumper block */
PORT_DIPNAME( 0x03, 0x02, "Territory" )
PORT_DIPSETTING( 0x02, DEF_STR( Europe ) )
// PORT_DIPSETTING( 0x03, DEF_STR( Europe ) )
@@ -625,13 +625,13 @@ INPUT_PORTS_END
static INPUT_PORTS_START( zerowing )
TOAPLAN1_VBLANK_INPUT
- PORT_START_TAG("P1")
+ PORT_START("P1")
TOAPLAN1_PLAYER_INPUT( 1, IPT_UNKNOWN, )
- PORT_START_TAG("P2")
+ PORT_START("P2")
TOAPLAN1_PLAYER_INPUT( 2, IPT_UNKNOWN, PORT_COCKTAIL )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -653,7 +653,7 @@ static INPUT_PORTS_START( zerowing )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_6C ) )
- PORT_START_TAG("DSWB") /* DSW B */
+ PORT_START("DSWB") /* DSW B */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x00, DEF_STR( Medium ) )
@@ -678,7 +678,7 @@ static INPUT_PORTS_START( zerowing )
TOAPLAN1_SYSTEM_INPUTS
- PORT_START_TAG("TJUMP") /* Territory Jumper block */
+ PORT_START("TJUMP") /* Territory Jumper block */
PORT_DIPNAME( 0x03, 0x02, "Territory" )
PORT_DIPSETTING( 0x02, DEF_STR( Europe ) )
// PORT_DIPSETTING( 0x03, DEF_STR( Europe ) )
@@ -709,13 +709,13 @@ INPUT_PORTS_END
static INPUT_PORTS_START( demonwld )
TOAPLAN1_VBLANK_INPUT
- PORT_START_TAG("P1")
+ PORT_START("P1")
TOAPLAN1_PLAYER_INPUT( 1, IPT_BUTTON3, )
- PORT_START_TAG("P2")
+ PORT_START("P2")
TOAPLAN1_PLAYER_INPUT( 2, IPT_BUTTON3, )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -737,7 +737,7 @@ static INPUT_PORTS_START( demonwld )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_6C ) )
- PORT_START_TAG("DSWB") /* DSW B */
+ PORT_START("DSWB") /* DSW B */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x00, DEF_STR( Medium ) )
@@ -762,7 +762,7 @@ static INPUT_PORTS_START( demonwld )
TOAPLAN1_SYSTEM_INPUTS
- PORT_START_TAG("TJUMP") /* Territory Jumper Block */
+ PORT_START("TJUMP") /* Territory Jumper Block */
PORT_DIPNAME( 0x01, 0x01, "Territory/Copyright" )
PORT_DIPSETTING( 0x01, "Toaplan" )
PORT_DIPSETTING( 0x00, "Japan/Taito Corp" )
@@ -792,13 +792,13 @@ INPUT_PORTS_END
static INPUT_PORTS_START( samesame )
TOAPLAN1_VBLANK_INPUT
- PORT_START_TAG("P1")
+ PORT_START("P1")
TOAPLAN1_PLAYER_INPUT( 1, IPT_UNKNOWN, )
- PORT_START_TAG("P2")
+ PORT_START("P2")
TOAPLAN1_PLAYER_INPUT( 2, IPT_UNKNOWN, PORT_COCKTAIL )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -834,7 +834,7 @@ static INPUT_PORTS_START( samesame )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_2C ) )
*/
- PORT_START_TAG("DSWB") /* DSW B */
+ PORT_START("DSWB") /* DSW B */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x00, DEF_STR( Medium ) )
@@ -859,7 +859,7 @@ static INPUT_PORTS_START( samesame )
TOAPLAN1_SYSTEM_INPUTS
- PORT_START_TAG("TJUMP") /* Territory Jumper Block */
+ PORT_START("TJUMP") /* Territory Jumper Block */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -920,13 +920,13 @@ INPUT_PORTS_END
static INPUT_PORTS_START( outzone )
TOAPLAN1_VBLANK_INPUT
- PORT_START_TAG("P1")
+ PORT_START("P1")
TOAPLAN1_PLAYER_INPUT( 1, IPT_BUTTON3, )
- PORT_START_TAG("P2")
+ PORT_START("P2")
TOAPLAN1_PLAYER_INPUT( 2, IPT_BUTTON3, )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -948,7 +948,7 @@ static INPUT_PORTS_START( outzone )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_6C ) )
- PORT_START_TAG("DSWB") /* DSW B */
+ PORT_START("DSWB") /* DSW B */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x00, DEF_STR( Medium ) )
@@ -973,7 +973,7 @@ static INPUT_PORTS_START( outzone )
TOAPLAN1_SYSTEM_INPUTS
- PORT_START_TAG("TJUMP") /* Territory Jumper Block */
+ PORT_START("TJUMP") /* Territory Jumper Block */
PORT_DIPNAME( 0x0f, 0x02, "Territory" )
PORT_DIPSETTING( 0x00, DEF_STR( Japan ) )
PORT_DIPSETTING( 0x01, "US" )
@@ -1039,13 +1039,13 @@ INPUT_PORTS_END
static INPUT_PORTS_START( vimana )
TOAPLAN1_VBLANK_INPUT
- PORT_START_TAG("P1")
+ PORT_START("P1")
TOAPLAN1_PLAYER_INPUT( 1, IPT_BUTTON3, )
- PORT_START_TAG("P2")
+ PORT_START("P2")
TOAPLAN1_PLAYER_INPUT( 2, IPT_BUTTON3, )
- PORT_START_TAG("DSWA") /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1067,7 +1067,7 @@ static INPUT_PORTS_START( vimana )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_6C ) )
- PORT_START_TAG("DSWB") /* DSW B */
+ PORT_START("DSWB") /* DSW B */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x00, DEF_STR( Medium ) )
@@ -1092,7 +1092,7 @@ static INPUT_PORTS_START( vimana )
TOAPLAN1_SYSTEM_INPUTS
- PORT_START_TAG("TJUMP") /* Territory Jumper Block */
+ PORT_START("TJUMP") /* Territory Jumper Block */
PORT_DIPNAME( 0x0f, 0x02, "Territory / License" )
PORT_DIPSETTING( 0x00, "Japan (Distributed by Tecmo)" )
PORT_DIPSETTING( 0x01, "US" )
diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index 0f140fe8746..59374d8b9f4 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -2110,11 +2110,11 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( toaplan2 )
- PORT_START_TAG("VBL")
+ PORT_START("VBL")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0xfffe, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Unknown/Unused */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_8WAY
@@ -2125,7 +2125,7 @@ static INPUT_PORTS_START( toaplan2 )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Unknown/Unused */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) PORT_8WAY
@@ -2136,7 +2136,7 @@ static INPUT_PORTS_START( toaplan2 )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Unknown/Unused */
- PORT_START_TAG("SYS")
+ PORT_START("SYS")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_TILT )
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -2147,7 +2147,7 @@ static INPUT_PORTS_START( toaplan2 )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Unknown/Unused */
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Unused ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0001, DEF_STR( On ) )
@@ -2162,7 +2162,7 @@ static INPUT_PORTS_START( toaplan2 )
PORT_BIT( 0x00f0, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Modified below */
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Unknown/Unused */
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x0003, 0x0000, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x0003, DEF_STR( Hardest ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Hard ) )
@@ -2172,7 +2172,7 @@ static INPUT_PORTS_START( toaplan2 )
PORT_BIT( 0x00fc, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Modified below */
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Unknown/Unused */
- PORT_START_TAG("JMPR") /* (6) Territory Jumper block */
+ PORT_START("JMPR") /* (6) Territory Jumper block */
/* Territory settings on bit mask 0x000f */
PORT_BIT( 0x000f, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Modified below */
PORT_BIT( 0xfff0, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Unknown/Unused */
@@ -2270,11 +2270,11 @@ static INPUT_PORTS_START( ghox )
PORT_DIPSETTING( 0x80007, "Italy (Star Electronica SRL)" )
PORT_DIPSETTING( 0x80008, "UK (JP Leisure Ltd)" )
- PORT_START_TAG("PAD1") /* Paddle 1 (left-right) read at $100000 */
+ PORT_START("PAD1") /* Paddle 1 (left-right) read at $100000 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1)
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Unknown/Unused */
- PORT_START_TAG("PAD2") /* Paddle 2 (left-right) read at $040000 */
+ PORT_START("PAD2") /* Paddle 2 (left-right) read at $040000 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(2)
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Unknown/Unused */
INPUT_PORTS_END
@@ -2529,7 +2529,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( fixeight )
PORT_INCLUDE(toaplan2)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(3) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(3) PORT_8WAY
@@ -2545,7 +2545,7 @@ static INPUT_PORTS_START( fixeight )
PORT_SERVICE_NO_TOGGLE(0x0004, IP_ACTIVE_HIGH) /* Service input is a push-button marked 'Test SW' */
#if 0
- PORT_START_TAG("FAKE") /* Fake input, to display message */
+ PORT_START("FAKE") /* Fake input, to display message */
PORT_DIPNAME( 0x0000, 0x0000, " Press service button" )
PORT_DIPSETTING( 0x0000, "" )
PORT_DIPNAME( 0x0000, 0x0000, " for game keeping options" )
@@ -2731,7 +2731,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( snowbro2 )
PORT_INCLUDE(toaplan2)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(3) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(3) PORT_8WAY
@@ -2742,7 +2742,7 @@ static INPUT_PORTS_START( snowbro2 )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Unknown/Unused */
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(4) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(4) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(4) PORT_8WAY
@@ -2903,11 +2903,11 @@ INPUT_PORTS_END
static INPUT_PORTS_START( bgaregga )
- PORT_START_TAG("VBL")
+ PORT_START("VBL")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0xfffe, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Unknown/Unused */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_8WAY
@@ -2918,7 +2918,7 @@ static INPUT_PORTS_START( bgaregga )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Unknown/Unused */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) PORT_8WAY
@@ -2929,7 +2929,7 @@ static INPUT_PORTS_START( bgaregga )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Unknown/Unused */
- PORT_START_TAG("SYS")
+ PORT_START("SYS")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_SERVICE2 )
@@ -2940,7 +2940,7 @@ static INPUT_PORTS_START( bgaregga )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* Unknown/Unused */
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_SERVICE_DIPLOC(0x0001, IP_ACTIVE_HIGH, "SW1:1")
PORT_DIPNAME( 0x0002, 0x0000, "Credits to Start" ) PORT_DIPLOCATION("SW1:2")
PORT_DIPSETTING( 0x0000, "1" )
@@ -2974,7 +2974,7 @@ static INPUT_PORTS_START( bgaregga )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) PORT_CONDITION("DSWA",0x001c,PORTCOND_EQUALS,0x001c)
PORT_DIPSETTING( 0x0080, DEF_STR( On ) ) PORT_CONDITION("DSWA",0x001c,PORTCOND_EQUALS,0x001c)
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x0003, 0x0000, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x0003, DEF_STR( Hardest ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Hard ) )
@@ -3001,7 +3001,7 @@ static INPUT_PORTS_START( bgaregga )
PORT_DIPSETTING( 0x0080, "1000k and 2000k" ) PORT_CONDITION("JMPR",0x0003,PORTCOND_EQUALS,0x0000) /* Japan */
PORT_DIPSETTING( 0x0000, "Every 1000k" ) PORT_CONDITION("JMPR",0x0003,PORTCOND_EQUALS,0x0000) /* Japan */
- PORT_START_TAG("JMPR")
+ PORT_START("JMPR")
PORT_DIPNAME( 0x0008, 0x0000, "Stage Edit" )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0008, DEF_STR( On ) )
@@ -3043,11 +3043,11 @@ INPUT_PORTS_END
static INPUT_PORTS_START( batrider )
- PORT_START_TAG("VBL") /* VBlank */
+ PORT_START("VBL") /* VBlank */
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0xfffe, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN") /* Player Inputs */
+ PORT_START("IN") /* Player Inputs */
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -3064,7 +3064,7 @@ static INPUT_PORTS_START( batrider )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8080, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW") /* DSWA and DSWB */
+ PORT_START("DSW") /* DSWA and DSWB */
PORT_SERVICE_DIPLOC(0x0001, IP_ACTIVE_HIGH, "SW1:1")
PORT_DIPNAME( 0x0002, 0x0000, "Credits to Start" ) PORT_CONDITION("DSW",0x001c,PORTCOND_NOTEQUALS,0x001c) PORT_DIPLOCATION("SW1:2")
PORT_DIPSETTING( 0x0000, "1" ) PORT_CONDITION("DSW",0x001c,PORTCOND_NOTEQUALS,0x001c)
@@ -3121,7 +3121,7 @@ static INPUT_PORTS_START( batrider )
PORT_DIPSETTING( 0x0000, "Every 1500k" )
PORT_DIPSETTING( 0x4000, "Every 1000k" )
- PORT_START_TAG("SYS-DSW") /* Coin/System and DSWC */
+ PORT_START("SYS-DSW") /* Coin/System and DSWC */
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* Service */
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_UNKNOWN)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Test */
@@ -3159,11 +3159,11 @@ INPUT_PORTS_END
static INPUT_PORTS_START( bbakraid )
- PORT_START_TAG("VBL") /* VBlank */
+ PORT_START("VBL") /* VBlank */
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0xfffe, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN") /* Player Inputs */
+ PORT_START("IN") /* Player Inputs */
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -3180,7 +3180,7 @@ static INPUT_PORTS_START( bbakraid )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8080, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW") /* DSWA and DSWB */
+ PORT_START("DSW") /* DSWA and DSWB */
PORT_SERVICE_DIPLOC(0x0001, IP_ACTIVE_HIGH, "SW1:1")
PORT_DIPNAME( 0x0002, 0x0000, "Credits to Start" ) PORT_CONDITION("DSW",0x001c,PORTCOND_NOTEQUALS,0x001c) PORT_DIPLOCATION("SW1:2")
PORT_DIPSETTING( 0x0000, "1" ) PORT_CONDITION("DSW",0x001c,PORTCOND_NOTEQUALS,0x001c)
@@ -3237,7 +3237,7 @@ static INPUT_PORTS_START( bbakraid )
PORT_DIPSETTING( 0x4000, "Every 3000k" )
PORT_DIPSETTING( 0x0000, "Every 2000k" )
- PORT_START_TAG("SYS-DSW") /* Coin/System and DSW-3 */
+ PORT_START("SYS-DSW") /* Coin/System and DSW-3 */
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* Service */
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_UNKNOWN)
PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Test */
diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c
index c4bafc04a55..03221ce5bfe 100644
--- a/src/mame/drivers/toki.c
+++ b/src/mame/drivers/toki.c
@@ -164,7 +164,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( toki )
SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x001f, 0x001f, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3,4,5")
PORT_DIPSETTING( 0x0015, DEF_STR( 6C_1C ) )
PORT_DIPSETTING( 0x0017, DEF_STR( 5C_1C ) )
@@ -217,7 +217,7 @@ static INPUT_PORTS_START( toki )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x8000, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -235,7 +235,7 @@ static INPUT_PORTS_START( toki )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -247,7 +247,7 @@ static INPUT_PORTS_START( toki )
INPUT_PORTS_END
static INPUT_PORTS_START( tokib )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x001f, 0x001f, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0015, DEF_STR( 6C_1C ) )
PORT_DIPSETTING( 0x0017, DEF_STR( 5C_1C ) )
@@ -300,7 +300,7 @@ static INPUT_PORTS_START( tokib )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x8000, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -318,7 +318,7 @@ static INPUT_PORTS_START( tokib )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
diff --git a/src/mame/drivers/toobin.c b/src/mame/drivers/toobin.c
index 1d99ef0ce54..a1ce05f1bf7 100644
--- a/src/mame/drivers/toobin.c
+++ b/src/mame/drivers/toobin.c
@@ -151,7 +151,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( toobin )
- PORT_START_TAG("FF8800") /* ff8800 */
+ PORT_START("FF8800") /* ff8800 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P2 R Paddle Forward") PORT_CODE(KEYCODE_L) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("P2 L Paddle Forward") PORT_CODE(KEYCODE_J) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("P2 L Paddle Backward") PORT_CODE(KEYCODE_U) PORT_PLAYER(2)
@@ -164,7 +164,7 @@ static INPUT_PORTS_START( toobin )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P2 Throw") PORT_CODE(KEYCODE_RCONTROL) PORT_PLAYER(2)
PORT_BIT( 0xfc00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("FF9000") /* ff9000 */
+ PORT_START("FF9000") /* ff9000 */
PORT_BIT( 0x03ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/topshoot.c b/src/mame/drivers/topshoot.c
index c29b1576103..8e241b94995 100644
--- a/src/mame/drivers/topshoot.c
+++ b/src/mame/drivers/topshoot.c
@@ -138,7 +138,7 @@ connector, but of course, I can be wrong.
static INPUT_PORTS_START( topshoot ) /* Top Shooter Input Ports */
- PORT_START_TAG("IN0") /* 16bit */
+ PORT_START("IN0") /* 16bit */
PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c
index eb1cce09cde..a1f94988d68 100644
--- a/src/mame/drivers/topspeed.c
+++ b/src/mame/drivers/topspeed.c
@@ -537,7 +537,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( topspeed )
/* 0x880000 (port 0) -> 0x400852 (-$77ae,A5) (shared RAM) */
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x03, "Deluxe Motorized Cockpit" )
PORT_DIPSETTING( 0x02, "Upright (?)" )
@@ -547,7 +547,7 @@ static INPUT_PORTS_START( topspeed )
TAITO_COINAGE_WORLD
/* 0x880000 (port 1) -> 0x400850 (-$77b0,A5) (shared RAM) */
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x0c, "Initial Time" )
PORT_DIPSETTING( 0x00, "40 seconds" )
@@ -566,7 +566,7 @@ static INPUT_PORTS_START( topspeed )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x80, "Same as Start" )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN2 )
@@ -577,7 +577,7 @@ static INPUT_PORTS_START( topspeed )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON8 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) /* main brake key */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) /* nitro */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT )
@@ -588,18 +588,18 @@ static INPUT_PORTS_START( topspeed )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON7 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) /* main accel key */
- PORT_START_TAG("IN2") /* unused */
+ PORT_START("IN2") /* unused */
/* Note that sensitivity is chosen to suit keyboard control
(for sound selection in test mode and hi score name entry).
With an analogue wheel, the user will need to adjust this. */
/* continuous steer */
- PORT_START_TAG(STEER_PORT_TAG)
+ PORT_START(STEER_PORT_TAG)
PORT_BIT( 0xffff, 0x00, IPT_AD_STICK_X ) PORT_MINMAX(0xff7f,0x80) PORT_SENSITIVITY(10) PORT_KEYDELTA(2) PORT_PLAYER(1)
/* fake inputs, allowing digital steer etc. */
- PORT_START_TAG(FAKE_PORT_TAG)
+ PORT_START(FAKE_PORT_TAG)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1)
diff --git a/src/mame/drivers/toratora.c b/src/mame/drivers/toratora.c
index 6b3f1374b1e..f157af438d7 100644
--- a/src/mame/drivers/toratora.c
+++ b/src/mame/drivers/toratora.c
@@ -357,7 +357,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( toratora )
- PORT_START_TAG("INPUT")
+ PORT_START("INPUT")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 )
@@ -367,7 +367,7 @@ static INPUT_PORTS_START( toratora )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "2" )
diff --git a/src/mame/drivers/tourtabl.c b/src/mame/drivers/tourtabl.c
index c9c1b872c0f..c87065e1896 100644
--- a/src/mame/drivers/tourtabl.c
+++ b/src/mame/drivers/tourtabl.c
@@ -112,29 +112,29 @@ static MACHINE_START( tourtabl )
static INPUT_PORTS_START( tourtabl )
- PORT_START_TAG("PADDLE4")
+ PORT_START("PADDLE4")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(40) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_REVERSE PORT_PLAYER(4)
- PORT_START_TAG("PADDLE3")
+ PORT_START("PADDLE3")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(40) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_REVERSE PORT_PLAYER(3)
- PORT_START_TAG("PADDLE2")
+ PORT_START("PADDLE2")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(40) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("PADDLE1")
+ PORT_START("PADDLE1")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(40) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("TIA_IN4") /* TIA INPT4 */
+ PORT_START("TIA_IN4") /* TIA INPT4 */
PORT_DIPNAME( 0x80, 0x80, "Breakout Replay" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x80, DEF_STR( On ))
- PORT_START_TAG("TIA_IN5") /* TIA INPT5 */
+ PORT_START("TIA_IN5") /* TIA INPT5 */
PORT_DIPNAME( 0x80, 0x80, "Game Length" )
PORT_DIPSETTING( 0x00, "11 points (3 balls)" )
PORT_DIPSETTING( 0x80, "15 points (5 balls)" )
- PORT_START_TAG("RIOT0_SWA") /* RIOT #0 SWCHA */
+ PORT_START("RIOT0_SWA") /* RIOT #0 SWCHA */
PORT_DIPNAME( 0x0F, 0x0E, "Replay Level" )
PORT_DIPSETTING( 0x0B, "200 points" )
PORT_DIPSETTING( 0x0C, "250 points" )
@@ -146,12 +146,12 @@ static INPUT_PORTS_START( tourtabl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_START_TAG("RIOT0_SWB") /* RIOT #0 SWCHB */
+ PORT_START("RIOT0_SWB") /* RIOT #0 SWCHB */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Game Select") PORT_CODE(KEYCODE_SPACE)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("RIOT1_SWA")/* RIOT #1 SWCHA */
+ PORT_START("RIOT1_SWA")/* RIOT #1 SWCHA */
PORT_DIPNAME( 0x0F, 0x07, DEF_STR( Coinage ))
PORT_DIPSETTING( 0x00, "Mode A" )
PORT_DIPSETTING( 0x01, "Mode B" )
@@ -177,7 +177,7 @@ static INPUT_PORTS_START( tourtabl )
PORT_SERVICE( 0x40, IP_ACTIVE_HIGH )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("RIOT1_SWB") /* RIOT #1 SWCHB */
+ PORT_START("RIOT1_SWB") /* RIOT #1 SWCHB */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START4 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c
index 9bc1c08f0f3..d90fe05e235 100644
--- a/src/mame/drivers/toypop.c
+++ b/src/mame/drivers/toypop.c
@@ -358,7 +358,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( liblrabl )
/* The inputs are not memory mapped, they are handled by three I/O chips. */
- PORT_START_TAG("INPUT_RIGHT") /* 58XX #0 pins 22-29 */
+ PORT_START("INPUT_RIGHT") /* 58XX #0 pins 22-29 */
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_UP ) PORT_8WAY
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_8WAY
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_8WAY
@@ -368,7 +368,7 @@ static INPUT_PORTS_START( liblrabl )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("SYSTEM") /* 58XX #0 pins 30-33 and 38-41 */
+ PORT_START("SYSTEM") /* 58XX #0 pins 30-33 and 38-41 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -378,7 +378,7 @@ static INPUT_PORTS_START( liblrabl )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("DSW1") /* 56XX #1 pins 22-29 */
+ PORT_START("DSW1") /* 56XX #1 pins 22-29 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x02, "1" )
PORT_DIPSETTING( 0x00, "2" )
@@ -404,7 +404,7 @@ static INPUT_PORTS_START( liblrabl )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x20, DEF_STR( 1C_6C ) )
- PORT_START_TAG("DSW2") /* 56XX #1 pins 30-33 and 38-41 */
+ PORT_START("DSW2") /* 56XX #1 pins 30-33 and 38-41 */
PORT_DIPNAME( 0x01, 0x01, "Freeze" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -428,7 +428,7 @@ static INPUT_PORTS_START( liblrabl )
PORT_DIPSETTING( 0x80, "C" )
PORT_DIPSETTING( 0x00, "D" )
- PORT_START_TAG("INPUT_LEFT") /* 56XX #2 pins 22-29 */
+ PORT_START("INPUT_LEFT") /* 56XX #2 pins 22-29 */
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_8WAY
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_8WAY
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_8WAY
@@ -438,7 +438,7 @@ static INPUT_PORTS_START( liblrabl )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("SERVICE") /* 56XX #2 pins 30-33 */
+ PORT_START("SERVICE") /* 56XX #2 pins 30-33 */
PORT_BIT( 0x03, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x04, DEF_STR( Upright ) )
@@ -448,7 +448,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( toypop )
/* The inputs are not memory mapped, they are handled by three I/O chips. */
- PORT_START_TAG("INPUT_RIGHT") /* 58XX #0 pins 22-29 */
+ PORT_START("INPUT_RIGHT") /* 58XX #0 pins 22-29 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
@@ -458,7 +458,7 @@ static INPUT_PORTS_START( toypop )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
- PORT_START_TAG("SYSTEM") /* 58XX #0 pins 30-33 and 38-41 */
+ PORT_START("SYSTEM") /* 58XX #0 pins 30-33 and 38-41 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -468,7 +468,7 @@ static INPUT_PORTS_START( toypop )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("DSW1") /* 56XX #1 pins 22-29 */
+ PORT_START("DSW1") /* 56XX #1 pins 22-29 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x02, "1" )
PORT_DIPSETTING( 0x01, "2" )
@@ -489,7 +489,7 @@ static INPUT_PORTS_START( toypop )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW2") /* 56XX #1 pins 30-33 and 38-41 */
+ PORT_START("DSW2") /* 56XX #1 pins 30-33 and 38-41 */
PORT_DIPNAME( 0x01, 0x01, "Freeze" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -514,10 +514,10 @@ static INPUT_PORTS_START( toypop )
PORT_DIPSETTING( 0x80, "Every 15000 points" )
PORT_DIPSETTING( 0x00, "Every 20000 points" )
- PORT_START_TAG("INPUT_LEFT") /* 56XX #2 pins 22-29 */
+ PORT_START("INPUT_LEFT") /* 56XX #2 pins 22-29 */
PORT_BIT(0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SERVICE") /* 56XX #2 pins 30-33 */
+ PORT_START("SERVICE") /* 56XX #2 pins 30-33 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) // would be Cabinet, but this game has no cocktail mode
diff --git a/src/mame/drivers/tp84.c b/src/mame/drivers/tp84.c
index 896e97c50b8..2ff19fbb929 100644
--- a/src/mame/drivers/tp84.c
+++ b/src/mame/drivers/tp84.c
@@ -202,7 +202,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( tp84 )
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -212,7 +212,7 @@ static INPUT_PORTS_START( tp84 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -222,7 +222,7 @@ static INPUT_PORTS_START( tp84 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -232,7 +232,7 @@ static INPUT_PORTS_START( tp84 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* DSW0 */
+ PORT_START("DSW1") /* DSW0 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -268,7 +268,7 @@ static INPUT_PORTS_START( tp84 )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START /* DSW1 */
+ PORT_START("DSW2") /* DSW1 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -293,7 +293,7 @@ static INPUT_PORTS_START( tp84 )
INPUT_PORTS_END
static INPUT_PORTS_START( tp84a )
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -303,7 +303,7 @@ static INPUT_PORTS_START( tp84a )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -313,7 +313,7 @@ static INPUT_PORTS_START( tp84a )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -323,7 +323,7 @@ static INPUT_PORTS_START( tp84a )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* DSW0 */
+ PORT_START("DSW1") /* DSW0 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -359,7 +359,7 @@ static INPUT_PORTS_START( tp84a )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x00, "Invalid" )
- PORT_START /* DSW1 */
+ PORT_START("DSW2") /* DSW1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c
index 017ffa31a3e..cc0d512d399 100644
--- a/src/mame/drivers/trackfld.c
+++ b/src/mame/drivers/trackfld.c
@@ -308,7 +308,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( trackfld )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -318,7 +318,7 @@ static INPUT_PORTS_START( trackfld )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
@@ -328,7 +328,7 @@ static INPUT_PORTS_START( trackfld )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3) //PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3) //PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) //PORT_COCKTAIL
@@ -338,7 +338,7 @@ static INPUT_PORTS_START( trackfld )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4) //PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -376,7 +376,7 @@ static INPUT_PORTS_START( trackfld )
/* 0x00 disables Coin 2. It still accepts coins and makes the sound, but
it doesn't give you any credit */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x00, "2" )
@@ -403,7 +403,7 @@ static INPUT_PORTS_START( trackfld )
INPUT_PORTS_END
static INPUT_PORTS_START( atlantol )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -413,7 +413,7 @@ static INPUT_PORTS_START( atlantol )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1)
@@ -423,7 +423,7 @@ static INPUT_PORTS_START( atlantol )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(3) //PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) //PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(3) //PORT_COCKTAIL
@@ -433,7 +433,7 @@ static INPUT_PORTS_START( atlantol )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(4) //PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -471,7 +471,7 @@ static INPUT_PORTS_START( atlantol )
/* 0x00 disables Coin 2. It still accepts coins and makes the sound, but
it doesn't give you any credit */
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x00, "2" )
@@ -498,7 +498,7 @@ static INPUT_PORTS_START( atlantol )
INPUT_PORTS_END
static INPUT_PORTS_START( mastkin )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -508,7 +508,7 @@ static INPUT_PORTS_START( mastkin )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
@@ -518,7 +518,7 @@ static INPUT_PORTS_START( mastkin )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Allow_Continue ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -539,7 +539,7 @@ static INPUT_PORTS_START( mastkin )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) // Stored at 0x284e but not read back
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) // Cocktail Mode, not used
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x0a, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x09, DEF_STR( 3C_1C ) )
@@ -577,7 +577,7 @@ static INPUT_PORTS_START( mastkin )
INPUT_PORTS_END
static INPUT_PORTS_START( wizzquiz )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -587,7 +587,7 @@ static INPUT_PORTS_START( wizzquiz )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("P2 - C")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 - B")
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 - A")
@@ -597,7 +597,7 @@ static INPUT_PORTS_START( wizzquiz )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("P1 - A")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -607,7 +607,7 @@ static INPUT_PORTS_START( wizzquiz )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("DSW0")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -643,7 +643,7 @@ static INPUT_PORTS_START( wizzquiz )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) ) // must set both Free Play
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -670,7 +670,7 @@ static INPUT_PORTS_START( wizzquiz )
INPUT_PORTS_END
static INPUT_PORTS_START( reaktor )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -680,7 +680,7 @@ static INPUT_PORTS_START( reaktor )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
/* controls seem to be shared by both players */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
@@ -691,7 +691,7 @@ static INPUT_PORTS_START( reaktor )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) // probably unused
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) // probably unused
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) // probably unused
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) // probably unused
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) // probably unused
@@ -701,7 +701,7 @@ static INPUT_PORTS_START( reaktor )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) // probably unused
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) // probably unused
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x01, "Pricing" )
PORT_DIPSETTING( 0x01, "10p / 25c per play" )
PORT_DIPSETTING( 0x00, "20p / 50c per play" )
@@ -726,7 +726,7 @@ static INPUT_PORTS_START( reaktor )
PORT_DIPSETTING( 0x80, "20000" )
PORT_DIPSETTING( 0x00, "30000" )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "Game Orientation" )
PORT_DIPSETTING( 0x01, "For Vertical Monitor" )
PORT_DIPSETTING( 0x00, "For Horizontal Monitor" )
diff --git a/src/mame/drivers/travrusa.c b/src/mame/drivers/travrusa.c
index aed92d1cffe..ec832fb18b0 100644
--- a/src/mame/drivers/travrusa.c
+++ b/src/mame/drivers/travrusa.c
@@ -82,7 +82,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( travrusa )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
/* coin input must be active for 19 frames to be consistently recognized */
@@ -93,7 +93,7 @@ static INPUT_PORTS_START( travrusa )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -103,7 +103,7 @@ static INPUT_PORTS_START( travrusa )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -113,7 +113,7 @@ static INPUT_PORTS_START( travrusa )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Fuel Reduced on Collision" )
PORT_DIPSETTING( 0x03, DEF_STR( Low ) )
PORT_DIPSETTING( 0x02, "Med" )
@@ -141,7 +141,7 @@ static INPUT_PORTS_START( travrusa )
/* PORT_DIPSETTING( 0x10, "INVALID" ) */
/* PORT_DIPSETTING( 0x00, "INVALID" ) */
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -176,7 +176,7 @@ static INPUT_PORTS_START( motorace )
INPUT_PORTS_END
static INPUT_PORTS_START( shtrider )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -184,7 +184,7 @@ static INPUT_PORTS_START( shtrider )
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -194,13 +194,13 @@ static INPUT_PORTS_START( shtrider )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x03, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
@@ -225,7 +225,7 @@ static INPUT_PORTS_START( shtrider )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/triplhnt.c b/src/mame/drivers/triplhnt.c
index c03726332d9..a08daa7aacf 100644
--- a/src/mame/drivers/triplhnt.c
+++ b/src/mame/drivers/triplhnt.c
@@ -161,39 +161,39 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( triplhnt )
- PORT_START_TAG("0C00") /* 0C00 */
+ PORT_START("0C00") /* 0C00 */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START_TAG("0C08") /* 0C08 */
+ PORT_START("0C08") /* 0C08 */
PORT_DIPNAME( 0xc0, 0x00, "Play Time" )
PORT_DIPSETTING( 0x00, "32 seconds / 16 raccoons" )
PORT_DIPSETTING( 0x40, "64 seconds / 32 raccoons" )
PORT_DIPSETTING( 0x80, "96 seconds / 48 raccoons" )
PORT_DIPSETTING( 0xc0, "128 seconds / 64 raccoons" )
- PORT_START_TAG("0C09") /* 0C09 */
+ PORT_START("0C09") /* 0C09 */
PORT_DIPNAME( 0xc0, 0x40, "Game Select" )
PORT_DIPSETTING( 0x00, "Hit the Bear" )
PORT_DIPSETTING( 0x40, "Witch Hunt" )
PORT_DIPSETTING( 0xc0, "Raccoon Hunt" )
- PORT_START_TAG("0C0A") /* 0C0A */
+ PORT_START("0C0A") /* 0C0A */
PORT_DIPNAME( 0xc0, 0x00, DEF_STR( Coinage ))
PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ))
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ))
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ))
- PORT_START_TAG("0C0B") /* 0C0B */
+ PORT_START("0C0B") /* 0C0B */
PORT_DIPNAME( 0x80, 0x00, "Extended Play" )
PORT_DIPSETTING( 0x80, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ))
- PORT_START_TAG("0C40") /* 0C40 */
+ PORT_START("0C40") /* 0C40 */
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN2 )
- PORT_START_TAG("0C48") /* 0C48 */
+ PORT_START("0C48") /* 0C48 */
// default to service enabled to make users calibrate gun
// PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x40, 0x00, DEF_STR( Service_Mode )) PORT_TOGGLE PORT_CODE(KEYCODE_F2)
@@ -201,16 +201,16 @@ static INPUT_PORTS_START( triplhnt )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("VBLANK")
+ PORT_START("VBLANK")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("STICKX")
+ PORT_START("STICKX")
PORT_BIT( 0xfc, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0x00,0xfc) PORT_CROSSHAIR(X, 62.0/64, 1.0/64, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15)
- PORT_START_TAG("STICKY")
+ PORT_START("STICKY")
PORT_BIT( 0xfc, 0x78, IPT_AD_STICK_Y ) PORT_MINMAX(0x00,0xec) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15)
- PORT_START_TAG("BEAR") /* 10 */
+ PORT_START("BEAR") /* 10 */
PORT_ADJUSTER( 35, "Bear Roar Frequency" )
INPUT_PORTS_END
diff --git a/src/mame/drivers/truco.c b/src/mame/drivers/truco.c
index f7fc35513ac..b2dc45d1f13 100644
--- a/src/mame/drivers/truco.c
+++ b/src/mame/drivers/truco.c
@@ -41,7 +41,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( truco )
- PORT_START_TAG("P1") /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -51,7 +51,7 @@ static INPUT_PORTS_START( truco )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
- PORT_START_TAG("DSW") /* DSW1 */
+ PORT_START("DSW") /* DSW1 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING ( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING ( 0x00, DEF_STR( On ) )
@@ -77,7 +77,7 @@ static INPUT_PORTS_START( truco )
PORT_DIPSETTING ( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING ( 0x00, DEF_STR( On ) )
- PORT_START_TAG("COIN") /* IN1 - FAKE - Used for coinup */
+ PORT_START("COIN") /* IN1 - FAKE - Used for coinup */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/trucocl.c b/src/mame/drivers/trucocl.c
index d493020c0e3..0e30d7afc18 100644
--- a/src/mame/drivers/trucocl.c
+++ b/src/mame/drivers/trucocl.c
@@ -98,7 +98,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( trucocl )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c
index c4940891951..9072e38c748 100644
--- a/src/mame/drivers/trvmadns.c
+++ b/src/mame/drivers/trvmadns.c
@@ -217,7 +217,7 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( trvmadns )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 )
diff --git a/src/mame/drivers/trvquest.c b/src/mame/drivers/trvquest.c
index 983908eb7e1..1e1b5a93baa 100644
--- a/src/mame/drivers/trvquest.c
+++ b/src/mame/drivers/trvquest.c
@@ -74,7 +74,7 @@ static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( trvquest )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Reset")
@@ -84,7 +84,7 @@ static INPUT_PORTS_START( trvquest )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -94,7 +94,7 @@ static INPUT_PORTS_START( trvquest )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START
+ PORT_START("UNK")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -120,7 +120,7 @@ static INPUT_PORTS_START( trvquest )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x07, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x06, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/tryout.c b/src/mame/drivers/tryout.c
index eb7df01bbc5..31cfeaf581a 100644
--- a/src/mame/drivers/tryout.c
+++ b/src/mame/drivers/tryout.c
@@ -84,7 +84,7 @@ static ADDRESS_MAP_START( sound_cpu, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( tryout )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -108,7 +108,7 @@ static INPUT_PORTS_START( tryout )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -118,7 +118,7 @@ static INPUT_PORTS_START( tryout )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
@@ -128,7 +128,7 @@ static INPUT_PORTS_START( tryout )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_IMPULSE(2)
diff --git a/src/mame/drivers/tsamurai.c b/src/mame/drivers/tsamurai.c
index 78c75e8eb1a..4dbd360d0b9 100644
--- a/src/mame/drivers/tsamurai.c
+++ b/src/mame/drivers/tsamurai.c
@@ -438,7 +438,7 @@ ADDRESS_MAP_END
/*******************************************************************************/
#define TS_IN0\
- PORT_START_TAG("IN0")\
+ PORT_START("IN0")\
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY\
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY\
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY\
@@ -449,7 +449,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
#define TS_IN1\
- PORT_START_TAG("IN1")\
+ PORT_START("IN1")\
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL\
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL\
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL\
@@ -460,7 +460,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
#define TS_IN2\
- PORT_START_TAG("IN2")\
+ PORT_START("IN2")\
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )\
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )\
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 )\
@@ -471,7 +471,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
#define TS_DSW1\
- PORT_START_TAG("DSW1")\
+ PORT_START("DSW1")\
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coin_A ) )\
PORT_DIPSETTING( 0x07, DEF_STR( 6C_1C ) )\
PORT_DIPSETTING( 0x06, DEF_STR( 3C_1C ) )\
@@ -503,7 +503,7 @@ TS_IN1
TS_IN2
TS_DSW1
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "5" )
@@ -533,7 +533,7 @@ TS_IN1
TS_IN2
TS_DSW1
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "5" )
@@ -563,7 +563,7 @@ TS_IN1
TS_IN2
TS_DSW1
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -591,7 +591,7 @@ TS_DSW1
INPUT_PORTS_END
#define YAMINS\
- PORT_START_TAG("IN0")\
+ PORT_START("IN0")\
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY\
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY\
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY\
@@ -600,7 +600,7 @@ INPUT_PORTS_END
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON1 )\
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )\
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )\
- PORT_START_TAG("IN1")\
+ PORT_START("IN1")\
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL\
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL\
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL\
@@ -615,7 +615,7 @@ static INPUT_PORTS_START( yamagchi )
TS_IN2
TS_DSW1
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "5" )
@@ -644,7 +644,7 @@ static INPUT_PORTS_START( m660 )
YAMINS
TS_IN2
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x04, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
@@ -670,7 +670,7 @@ static INPUT_PORTS_START( m660 )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
diff --git a/src/mame/drivers/ttchamp.c b/src/mame/drivers/ttchamp.c
index d96558b6a96..e34cc502565 100644
--- a/src/mame/drivers/ttchamp.c
+++ b/src/mame/drivers/ttchamp.c
@@ -149,7 +149,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START(ttchamp)
- PORT_START /* 8bit */
+ PORT_START("SYSTEM") /* 8bit */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) )
@@ -195,7 +195,7 @@ static INPUT_PORTS_START(ttchamp)
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START /* 8bit */
+ PORT_START("P1_P2") /* 8bit */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_8WAY
@@ -328,4 +328,3 @@ static DRIVER_INIT (ttchamp)
GAME( 199?, ttchamp, 0, ttchamp, ttchamp, ttchamp, ROT0, "Gamart?", "Table Tennis Champions (set 1)", GAME_NOT_WORKING|GAME_NO_SOUND )
GAME( 199?, ttchampa,ttchamp, ttchamp, ttchamp, ttchamp, ROT0, "Gamart?", "Table Tennis Champions (set 2)", GAME_NOT_WORKING|GAME_NO_SOUND )
-
diff --git a/src/mame/drivers/tubep.c b/src/mame/drivers/tubep.c
index 5827977c750..9933830464a 100644
--- a/src/mame/drivers/tubep.c
+++ b/src/mame/drivers/tubep.c
@@ -663,7 +663,7 @@ static WRITE8_HANDLER( ay8910_portB_2_w )
static INPUT_PORTS_START( tubep )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -673,7 +673,7 @@ static INPUT_PORTS_START( tubep )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -683,7 +683,7 @@ static INPUT_PORTS_START( tubep )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("Coin_Start")
+ PORT_START("Coin_Start")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -693,7 +693,7 @@ static INPUT_PORTS_START( tubep )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:6,5,4")
PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x06, DEF_STR( 1C_2C ) )
@@ -715,7 +715,7 @@ static INPUT_PORTS_START( tubep )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:6,5")
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -735,7 +735,7 @@ static INPUT_PORTS_START( tubep )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW3:6")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -775,7 +775,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( rjammer )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -785,7 +785,7 @@ static INPUT_PORTS_START( rjammer )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -795,7 +795,7 @@ static INPUT_PORTS_START( rjammer )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:6")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -816,7 +816,7 @@ static INPUT_PORTS_START( rjammer )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:6")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -836,7 +836,7 @@ static INPUT_PORTS_START( rjammer )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("Coins_Service")
+ PORT_START("Coins_Service")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c
index 7216d42f39b..9e70a511e71 100644
--- a/src/mame/drivers/tugboat.c
+++ b/src/mame/drivers/tugboat.c
@@ -202,7 +202,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( tugboat )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -212,7 +212,7 @@ static INPUT_PORTS_START( tugboat )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -222,7 +222,7 @@ static INPUT_PORTS_START( tugboat )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -232,7 +232,7 @@ static INPUT_PORTS_START( tugboat )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -242,7 +242,7 @@ static INPUT_PORTS_START( tugboat )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -254,7 +254,7 @@ static INPUT_PORTS_START( tugboat )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c
index a60447c9ff9..9fe436fff1a 100644
--- a/src/mame/drivers/tumbleb.c
+++ b/src/mame/drivers/tumbleb.c
@@ -1004,7 +1004,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( tumblepb )
- PORT_START_TAG("P1") /* Player 1 controls */
+ PORT_START("P1") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1014,7 +1014,7 @@ static INPUT_PORTS_START( tumblepb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 controls */
+ PORT_START("P2") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1024,7 +1024,7 @@ static INPUT_PORTS_START( tumblepb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("SYSTEM") /* Credits */
+ PORT_START("SYSTEM") /* Credits */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1034,7 +1034,7 @@ static INPUT_PORTS_START( tumblepb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* Dip switch bank 1 */
+ PORT_START("DSW1") /* Dip switch bank 1 */
PORT_DIPNAME( 0xe0, 0xe0, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ) )
@@ -1060,7 +1060,7 @@ static INPUT_PORTS_START( tumblepb )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* Dip switch bank 2 */
+ PORT_START("DSW2") /* Dip switch bank 2 */
PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x80, "1" )
PORT_DIPSETTING( 0x00, "2" )
@@ -1094,7 +1094,7 @@ static INPUT_PORTS_START( tumblepb )
INPUT_PORTS_END
static INPUT_PORTS_START( metlsavr )
- PORT_START_TAG("P1") /* Player 1 controls */
+ PORT_START("P1") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1104,7 +1104,7 @@ static INPUT_PORTS_START( metlsavr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 controls */
+ PORT_START("P2") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1114,7 +1114,7 @@ static INPUT_PORTS_START( metlsavr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("SYSTEM") /* Credits */
+ PORT_START("SYSTEM") /* Credits */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1124,7 +1124,7 @@ static INPUT_PORTS_START( metlsavr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* Dip switch bank 1 */
+ PORT_START("DSW1") /* Dip switch bank 1 */
PORT_DIPUNUSED_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW1:8" )
PORT_DIPUNUSED_DIPLOC( 0x02, IP_ACTIVE_LOW, "SW1:7" )
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:6,5")
@@ -1145,7 +1145,7 @@ static INPUT_PORTS_START( metlsavr )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* Dip switch bank 2 */
+ PORT_START("DSW2") /* Dip switch bank 2 */
PORT_SERVICE_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW2:8" )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:7") // See notes
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -1169,7 +1169,7 @@ static INPUT_PORTS_START( metlsavr )
INPUT_PORTS_END
static INPUT_PORTS_START( suprtrio )
- PORT_START_TAG("PLAYERS")
+ PORT_START("PLAYERS")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1187,11 +1187,11 @@ static INPUT_PORTS_START( suprtrio )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xfffe, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") /* Dip switches */
+ PORT_START("DSW") /* Dip switches */
PORT_DIPNAME( 0x0007, 0x0000, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW:8,7,6")
PORT_DIPSETTING( 0x0006, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0005, DEF_STR( 4C_1C ) )
@@ -1217,7 +1217,7 @@ static INPUT_PORTS_START( suprtrio )
INPUT_PORTS_END
static INPUT_PORTS_START( fncywld )
- PORT_START_TAG("P1") /* Player 1 controls */
+ PORT_START("P1") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1227,7 +1227,7 @@ static INPUT_PORTS_START( fncywld )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 controls */
+ PORT_START("P2") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1237,7 +1237,7 @@ static INPUT_PORTS_START( fncywld )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("SYSTEM") /* Credits */
+ PORT_START("SYSTEM") /* Credits */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1247,7 +1247,7 @@ static INPUT_PORTS_START( fncywld )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* Dip switch bank 1 */
+ PORT_START("DSW1") /* Dip switch bank 1 */
PORT_DIPNAME( 0xe0, 0xe0, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x20, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x40, DEF_STR( 3C_1C ) )
@@ -1273,7 +1273,7 @@ static INPUT_PORTS_START( fncywld )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* Dip switch bank 2 */
+ PORT_START("DSW2") /* Dip switch bank 2 */
PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x80, "1" )
PORT_DIPSETTING( 0x00, "2" )
@@ -1308,7 +1308,7 @@ static INPUT_PORTS_START( fncywld )
INPUT_PORTS_END
static INPUT_PORTS_START( htchctch )
- PORT_START_TAG("P1") /* Player 1 controls */
+ PORT_START("P1") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1318,7 +1318,7 @@ static INPUT_PORTS_START( htchctch )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 controls */
+ PORT_START("P2") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1328,7 +1328,7 @@ static INPUT_PORTS_START( htchctch )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("SYSTEM") /* Credits */
+ PORT_START("SYSTEM") /* Credits */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1338,7 +1338,7 @@ static INPUT_PORTS_START( htchctch )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* Dip switch bank 1 */
+ PORT_START("DSW1") /* Dip switch bank 1 */
PORT_DIPUNUSED_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW1:8" )
PORT_DIPUNUSED_DIPLOC( 0x02, IP_ACTIVE_LOW, "SW1:7" )
PORT_DIPUNUSED_DIPLOC( 0x04, IP_ACTIVE_LOW, "SW1:6" )
@@ -1348,7 +1348,7 @@ static INPUT_PORTS_START( htchctch )
PORT_DIPUNUSED_DIPLOC( 0x40, IP_ACTIVE_LOW, "SW1:2" )
PORT_DIPUNUSED_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW1:1" )
- PORT_START_TAG("DSW2") /* Dip switch bank 2 */
+ PORT_START("DSW2") /* Dip switch bank 2 */
PORT_SERVICE_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW2:8" )
PORT_DIPNAME( 0x06, 0x06, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:7,6")
PORT_DIPSETTING( 0x00, DEF_STR( Easy ) )
@@ -1373,7 +1373,7 @@ static INPUT_PORTS_START( htchctch )
INPUT_PORTS_END
static INPUT_PORTS_START( cookbib )
- PORT_START_TAG("P1") /* Player 1 controls */
+ PORT_START("P1") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1383,7 +1383,7 @@ static INPUT_PORTS_START( cookbib )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 controls */
+ PORT_START("P2") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1393,7 +1393,7 @@ static INPUT_PORTS_START( cookbib )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("SYSTEM") /* Credits */
+ PORT_START("SYSTEM") /* Credits */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1403,7 +1403,7 @@ static INPUT_PORTS_START( cookbib )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* Dip switch bank 1 */
+ PORT_START("DSW1") /* Dip switch bank 1 */
PORT_DIPUNUSED_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW1:8" )
PORT_DIPUNUSED_DIPLOC( 0x02, IP_ACTIVE_LOW, "SW1:7" )
PORT_DIPUNUSED_DIPLOC( 0x04, IP_ACTIVE_LOW, "SW1:6" )
@@ -1413,7 +1413,7 @@ static INPUT_PORTS_START( cookbib )
PORT_DIPUNUSED_DIPLOC( 0x40, IP_ACTIVE_LOW, "SW1:2" )
PORT_DIPUNUSED_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW1:1" )
- PORT_START_TAG("DSW2") /* Dip switch bank 2 */
+ PORT_START("DSW2") /* Dip switch bank 2 */
PORT_SERVICE_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW2:8" )
PORT_DIPNAME( 0x06, 0x06, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:7,6")
PORT_DIPSETTING( 0x00, DEF_STR( Easy ) )
@@ -1438,7 +1438,7 @@ static INPUT_PORTS_START( cookbib )
INPUT_PORTS_END
static INPUT_PORTS_START( chokchok )
- PORT_START_TAG("P1") /* Player 1 controls */
+ PORT_START("P1") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1448,7 +1448,7 @@ static INPUT_PORTS_START( chokchok )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 controls */
+ PORT_START("P2") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1458,7 +1458,7 @@ static INPUT_PORTS_START( chokchok )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("SYSTEM") /* Credits */
+ PORT_START("SYSTEM") /* Credits */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1468,7 +1468,7 @@ static INPUT_PORTS_START( chokchok )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* Dip switch bank 1 */
+ PORT_START("DSW1") /* Dip switch bank 1 */
PORT_DIPNAME( 0x01, 0x01, "Winning Rounds" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "3" )
@@ -1491,7 +1491,7 @@ static INPUT_PORTS_START( chokchok )
PORT_DIPSETTING( 0x40, "5" )
PORT_DIPSETTING( 0x80, "6" )
- PORT_START_TAG("DSW2") /* Dip switch bank 2 */
+ PORT_START("DSW2") /* Dip switch bank 2 */
PORT_SERVICE_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW2:8" )
PORT_DIPNAME( 0x06, 0x06, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:7,6")
PORT_DIPSETTING( 0x00, DEF_STR( Easy ) )
@@ -1516,7 +1516,7 @@ static INPUT_PORTS_START( chokchok )
INPUT_PORTS_END
static INPUT_PORTS_START( wlstar )
- PORT_START_TAG("P1") /* Player 1 controls */
+ PORT_START("P1") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1526,7 +1526,7 @@ static INPUT_PORTS_START( wlstar )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 controls */
+ PORT_START("P2") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1536,7 +1536,7 @@ static INPUT_PORTS_START( wlstar )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("SYSTEM") /* Credits */
+ PORT_START("SYSTEM") /* Credits */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1546,7 +1546,7 @@ static INPUT_PORTS_START( wlstar )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* Dip switch bank 1 */
+ PORT_START("DSW1") /* Dip switch bank 1 */
PORT_DIPUNUSED_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW1:8" )
PORT_DIPUNUSED_DIPLOC( 0x02, IP_ACTIVE_LOW, "SW1:7" )
PORT_DIPUNUSED_DIPLOC( 0x04, IP_ACTIVE_LOW, "SW1:6" )
@@ -1561,7 +1561,7 @@ static INPUT_PORTS_START( wlstar )
PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x80, DEF_STR( Hardest ) )
- PORT_START_TAG("DSW2") /* Dip switch bank 2 */
+ PORT_START("DSW2") /* Dip switch bank 2 */
PORT_DIPNAME( 0x01, 0x01, "Last Inning" ) PORT_DIPLOCATION("SW2:8") // See notes
PORT_DIPSETTING( 0x00, "9" )
PORT_DIPSETTING( 0x01, "12" )
@@ -1589,7 +1589,7 @@ static INPUT_PORTS_START( wlstar )
INPUT_PORTS_END
static INPUT_PORTS_START( wondl96 )
- PORT_START_TAG("P1") /* Player 1 controls */
+ PORT_START("P1") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1599,7 +1599,7 @@ static INPUT_PORTS_START( wondl96 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 controls */
+ PORT_START("P2") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1609,7 +1609,7 @@ static INPUT_PORTS_START( wondl96 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("SYSTEM") /* Credits */
+ PORT_START("SYSTEM") /* Credits */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // must be high to avoid endless loops
@@ -1619,7 +1619,7 @@ static INPUT_PORTS_START( wondl96 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* Dip switch bank 1 */
+ PORT_START("DSW1") /* Dip switch bank 1 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW2:8")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1645,7 +1645,7 @@ static INPUT_PORTS_START( wondl96 )
PORT_DIPSETTING( 0x80, "4 Credits" )
PORT_DIPSETTING( 0x00, "6 Credits" )
- PORT_START_TAG("DSW2") /* Dip switch bank 2 */
+ PORT_START("DSW2") /* Dip switch bank 2 */
PORT_DIPUNUSED_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW2:8" )
PORT_DIPNAME( 0x0e, 0x0e, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:7,6,5")
PORT_DIPSETTING( 0x04, "Level 1" )
@@ -1669,7 +1669,7 @@ static INPUT_PORTS_START( wondl96 )
INPUT_PORTS_END
static INPUT_PORTS_START( sdfight )
- PORT_START_TAG("P1") /* Player 1 controls */
+ PORT_START("P1") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1679,7 +1679,7 @@ static INPUT_PORTS_START( sdfight )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 controls */
+ PORT_START("P2") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1689,7 +1689,7 @@ static INPUT_PORTS_START( sdfight )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("SYSTEM") /* Credits */
+ PORT_START("SYSTEM") /* Credits */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1699,7 +1699,7 @@ static INPUT_PORTS_START( sdfight )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* Dip switch bank 1 */
+ PORT_START("DSW1") /* Dip switch bank 1 */
PORT_SERVICE_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW1:8" ) /* These dips were done from the Test mode screens */
PORT_DIPNAME( 0x0e, 0x0e, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:7,6,5")
PORT_DIPSETTING( 0x04, "Level 1" )
@@ -1723,7 +1723,7 @@ static INPUT_PORTS_START( sdfight )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* Dip switch bank 2 */
+ PORT_START("DSW2") /* Dip switch bank 2 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW2:8") /* Only Free Play shows in Test Mode */
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1750,7 +1750,7 @@ static INPUT_PORTS_START( sdfight )
INPUT_PORTS_END
static INPUT_PORTS_START( bcstory )
- PORT_START_TAG("P1") /* Player 1 controls */
+ PORT_START("P1") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1760,7 +1760,7 @@ static INPUT_PORTS_START( bcstory )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 controls */
+ PORT_START("P2") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1770,7 +1770,7 @@ static INPUT_PORTS_START( bcstory )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("SYSTEM") /* Credits */
+ PORT_START("SYSTEM") /* Credits */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1780,7 +1780,7 @@ static INPUT_PORTS_START( bcstory )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* Dip switch bank 1 */
+ PORT_START("DSW1") /* Dip switch bank 1 */
PORT_SERVICE_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW1:8" )
PORT_DIPNAME( 0x0e, 0x0e, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:7,6,5")
PORT_DIPSETTING( 0x04, "Level 1" )
@@ -1804,7 +1804,7 @@ static INPUT_PORTS_START( bcstory )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* Dip switch bank 2 */
+ PORT_START("DSW2") /* Dip switch bank 2 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW2:8")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1824,7 +1824,7 @@ static INPUT_PORTS_START( bcstory )
INPUT_PORTS_END
static INPUT_PORTS_START( semibase )
- PORT_START_TAG("P1") /* Player 1 controls */
+ PORT_START("P1") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1834,7 +1834,7 @@ static INPUT_PORTS_START( semibase )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 controls */
+ PORT_START("P2") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1844,7 +1844,7 @@ static INPUT_PORTS_START( semibase )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("SYSTEM") /* Credits */
+ PORT_START("SYSTEM") /* Credits */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) // See notes
@@ -1854,7 +1854,7 @@ static INPUT_PORTS_START( semibase )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* Dip switch bank 1 */
+ PORT_START("DSW1") /* Dip switch bank 1 */
PORT_SERVICE_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW1:8" )
PORT_DIPNAME( 0x0e, 0x0e, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:7,6,5")
PORT_DIPSETTING( 0x04, "Level 1" )
@@ -1878,7 +1878,7 @@ static INPUT_PORTS_START( semibase )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* Dip switch bank 2 */
+ PORT_START("DSW2") /* Dip switch bank 2 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW2:8")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1898,7 +1898,7 @@ static INPUT_PORTS_START( semibase )
INPUT_PORTS_END
static INPUT_PORTS_START( dquizgo )
- PORT_START_TAG("P1") /* Player 1 controls */
+ PORT_START("P1") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1908,7 +1908,7 @@ static INPUT_PORTS_START( dquizgo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 controls */
+ PORT_START("P2") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -1918,7 +1918,7 @@ static INPUT_PORTS_START( dquizgo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("SYSTEM") /* Credits */
+ PORT_START("SYSTEM") /* Credits */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1928,7 +1928,7 @@ static INPUT_PORTS_START( dquizgo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* Dip switch bank 1 */
+ PORT_START("DSW1") /* Dip switch bank 1 */
PORT_SERVICE_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW1:8" )
PORT_DIPNAME( 0x0e, 0x0e, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:7,6,5")
PORT_DIPSETTING( 0x04, "Level 1" )
@@ -1952,7 +1952,7 @@ static INPUT_PORTS_START( dquizgo )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* Dip switch bank 2 */
+ PORT_START("DSW2") /* Dip switch bank 2 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW2:8") // See notes
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1969,7 +1969,7 @@ static INPUT_PORTS_START( dquizgo )
INPUT_PORTS_END
static INPUT_PORTS_START( jumppop )
- PORT_START_TAG("PLAYERS") /* Controls */
+ PORT_START("PLAYERS") /* Controls */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1987,14 +1987,14 @@ static INPUT_PORTS_START( jumppop )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM") /* Coins / Start Buttons */
+ PORT_START("SYSTEM") /* Coins / Start Buttons */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") /* Dip switches */
+ PORT_START("DSW") /* Dip switches */
PORT_SERVICE_DIPLOC( 0x0001, IP_ACTIVE_LOW, "SWA:1" )
PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SWA:2")
PORT_DIPSETTING( 0x0002, DEF_STR( Off ) )
diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c
index ea80dfaa725..2df8962c7ca 100644
--- a/src/mame/drivers/tumblep.c
+++ b/src/mame/drivers/tumblep.c
@@ -155,7 +155,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( tumblep )
- PORT_START_TAG("P1") /* Player 1 controls */
+ PORT_START("P1") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -165,7 +165,7 @@ static INPUT_PORTS_START( tumblep )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 controls */
+ PORT_START("P2") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -175,7 +175,7 @@ static INPUT_PORTS_START( tumblep )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("SYSTEM") /* Credits */
+ PORT_START("SYSTEM") /* Credits */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -185,7 +185,7 @@ static INPUT_PORTS_START( tumblep )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* Dip switch bank 1 */
+ PORT_START("DSW1") /* Dip switch bank 1 */
PORT_DIPNAME( 0xe0, 0xe0, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ) )
@@ -211,7 +211,7 @@ static INPUT_PORTS_START( tumblep )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* Dip switch bank 2 */
+ PORT_START("DSW2") /* Dip switch bank 2 */
PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x80, "1" )
PORT_DIPSETTING( 0x00, "2" )
diff --git a/src/mame/drivers/tunhunt.c b/src/mame/drivers/tunhunt.c
index b734af55798..bd376eeac46 100644
--- a/src/mame/drivers/tunhunt.c
+++ b/src/mame/drivers/tunhunt.c
@@ -175,7 +175,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( tunhunt )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT ( 0x01, IP_ACTIVE_HIGH, IPT_TILT )
PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Service_Mode ) )
@@ -189,13 +189,13 @@ static INPUT_PORTS_START( tunhunt )
PORT_BIT ( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff, 0x00, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(4)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, 0x00, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(4) PORT_REVERSE
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME (0x0003, 0x0002, DEF_STR( Coinage ) )
PORT_DIPSETTING ( 0x0003, DEF_STR( 2C_1C ) )
PORT_DIPSETTING ( 0x0002, DEF_STR( 1C_1C ) )
diff --git a/src/mame/drivers/turbo.c b/src/mame/drivers/turbo.c
index 14890c5c649..6776b7a6acc 100644
--- a/src/mame/drivers/turbo.c
+++ b/src/mame/drivers/turbo.c
@@ -826,7 +826,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( turbo )
- PORT_START_TAG("INPUT") /* IN0 */
+ PORT_START("INPUT") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* ACCEL B */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) /* ACCEL A */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_TOGGLE /* SHIFT */
@@ -836,7 +836,7 @@ static INPUT_PORTS_START( turbo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("DSW1") /* DSW 1 */
+ PORT_START("DSW1") /* DSW 1 */
PORT_DIPNAME( 0x03, 0x03, "Car On Extended Play" ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x01, "2" )
@@ -861,7 +861,7 @@ static INPUT_PORTS_START( turbo )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* DSW 2 */
+ PORT_START("DSW2") /* DSW 2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Game_Time ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x00, "60 seconds" )
PORT_DIPSETTING( 0x01, "70 seconds" )
@@ -886,7 +886,7 @@ static INPUT_PORTS_START( turbo )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_3C ))
PORT_DIPSETTING( 0x60, DEF_STR( 1C_6C ))
- PORT_START_TAG("DSW3") /* Collision and DSW 3 */
+ PORT_START("DSW3") /* Collision and DSW 3 */
PORT_BIT( 0x0f, 0x00, IPT_SPECIAL ) /* Merged with collision bits */
PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:1")
PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
@@ -901,25 +901,25 @@ static INPUT_PORTS_START( turbo )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, "Cockpit")
- PORT_START_TAG("DIAL") /* IN0 */
+ PORT_START("DIAL") /* IN0 */
PORT_BIT( 0xff, 0, IPT_DIAL ) PORT_SENSITIVITY(10) PORT_KEYDELTA(30)
/* this is actually a variable resistor */
- PORT_START_TAG("VR1")
+ PORT_START("VR1")
PORT_ADJUSTER(31, "Sprite scale offset")
/* this is actually a variable resistor */
- PORT_START_TAG("VR2")
+ PORT_START("VR2")
PORT_ADJUSTER(91, "Sprite scale gain")
INPUT_PORTS_END
static INPUT_PORTS_START( subroc3d )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -929,7 +929,7 @@ static INPUT_PORTS_START( subroc3d )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("DSW2") /* DSW 2 */
+ PORT_START("DSW2") /* DSW 2 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coin_A )) PORT_DIPLOCATION("SW2:1,2,3")
PORT_DIPSETTING( 0x07, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x06, DEF_STR( 4C_1C ) )
@@ -954,7 +954,7 @@ static INPUT_PORTS_START( subroc3d )
PORT_DIPSETTING( 0x80, "4" )
PORT_DIPSETTING( 0xc0, "5" )
- PORT_START_TAG("DSW3") /* DSW 3 */
+ PORT_START("DSW3") /* DSW 3 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW3:1,2")
PORT_DIPSETTING( 0x00, "20000" )
PORT_DIPSETTING( 0x01, "40000" )
@@ -979,19 +979,19 @@ static INPUT_PORTS_START( subroc3d )
PORT_DIPSETTING( 0x00, "Endless" )
PORT_DIPSETTING( 0x80, DEF_STR( Normal ) )
- PORT_START_TAG("DSW1") /* DSW 1 */ /* Unused */
+ PORT_START("DSW1") /* DSW 1 */ /* Unused */
INPUT_PORTS_END
static INPUT_PORTS_START( buckrog )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON3 ) // Accel Hi
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) // Accel Lo
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
- PORT_START_TAG("IN1") /* Inputs */
+ PORT_START("IN1") /* Inputs */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -1001,7 +1001,7 @@ static INPUT_PORTS_START( buckrog )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("DSW1") /* DSW 1 */
+ PORT_START("DSW1") /* DSW 1 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coin_A )) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x07, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x06, DEF_STR( 4C_1C ) )
@@ -1027,7 +1027,7 @@ static INPUT_PORTS_START( buckrog )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* DSW 2 */
+ PORT_START("DSW2") /* DSW 2 */
PORT_DIPNAME( 0x01, 0x00, "Collisions" ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/turbosub.c b/src/mame/drivers/turbosub.c
index 102e3c1e4fc..cd8d4a94629 100644
--- a/src/mame/drivers/turbosub.c
+++ b/src/mame/drivers/turbosub.c
@@ -179,7 +179,7 @@ static WRITE8_HANDLER( FDT_W )
}
static INPUT_PORTS_START( turbosub )
-PORT_START
+PORT_START("IN0")
INPUT_PORTS_END
/*
diff --git a/src/mame/drivers/tutankhm.c b/src/mame/drivers/tutankhm.c
index 4dbe41ed159..736ec33ee41 100644
--- a/src/mame/drivers/tutankhm.c
+++ b/src/mame/drivers/tutankhm.c
@@ -126,7 +126,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( tutankhm )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -150,7 +150,7 @@ static INPUT_PORTS_START( tutankhm )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -160,7 +160,7 @@ static INPUT_PORTS_START( tutankhm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -170,7 +170,7 @@ static INPUT_PORTS_START( tutankhm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
@@ -180,7 +180,7 @@ static INPUT_PORTS_START( tutankhm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c
index 6ea39075072..74256fb07bb 100644
--- a/src/mame/drivers/twin16.c
+++ b/src/mame/drivers/twin16.c
@@ -327,7 +327,7 @@ ADDRESS_MAP_END
/* Input Ports */
-#define KONAMI_TWIN_COINAGE PORT_START_TAG("DSW1") \
+#define KONAMI_TWIN_COINAGE PORT_START("DSW1") \
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) \
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) ) \
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) ) \
@@ -364,7 +364,7 @@ ADDRESS_MAP_END
PORT_DIPSETTING( 0x00, "Disabled" )
static INPUT_PORTS_START( devilw )
- PORT_START_TAG("SYSTEM") /* 0xa0001 */
+ PORT_START("SYSTEM") /* 0xa0001 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -374,7 +374,7 @@ static INPUT_PORTS_START( devilw )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P1") /* 0xa0003 */
+ PORT_START("P1") /* 0xa0003 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -384,7 +384,7 @@ static INPUT_PORTS_START( devilw )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) // jump
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2") /* 0xa0005 */
+ PORT_START("P2") /* 0xa0005 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -394,12 +394,12 @@ static INPUT_PORTS_START( devilw )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P3") /* 0xa0007 */
+ PORT_START("P3") /* 0xa0007 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
KONAMI_TWIN_COINAGE
- PORT_START_TAG("DSW2") /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -415,7 +415,7 @@ static INPUT_PORTS_START( devilw )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* DSW3 0xa0019 */
+ PORT_START("DSW3") /* DSW3 0xa0019 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -426,7 +426,7 @@ static INPUT_PORTS_START( devilw )
INPUT_PORTS_END
static INPUT_PORTS_START( darkadv )
- PORT_START_TAG("SYSTEM") /* 0xa0001 */
+ PORT_START("SYSTEM") /* 0xa0001 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -436,7 +436,7 @@ static INPUT_PORTS_START( darkadv )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE2 )
- PORT_START_TAG("P1") /* 0xa0003 */
+ PORT_START("P1") /* 0xa0003 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -446,7 +446,7 @@ static INPUT_PORTS_START( darkadv )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) // dynamite
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE3 )
- PORT_START_TAG("P2") /* 0xa0005 */
+ PORT_START("P2") /* 0xa0005 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -456,7 +456,7 @@ static INPUT_PORTS_START( darkadv )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P3") /* 0xa0007 */
+ PORT_START("P3") /* 0xa0007 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
@@ -466,7 +466,7 @@ static INPUT_PORTS_START( darkadv )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1") /* Coinage */
+ PORT_START("DSW1") /* Coinage */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -486,7 +486,7 @@ static INPUT_PORTS_START( darkadv )
PORT_DIPSETTING( 0x00, "Invalid" )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_START_TAG("DSW2") /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -502,7 +502,7 @@ static INPUT_PORTS_START( darkadv )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* DSW3 0xa0019 */
+ PORT_START("DSW3") /* DSW3 0xa0019 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -513,7 +513,7 @@ static INPUT_PORTS_START( darkadv )
INPUT_PORTS_END
static INPUT_PORTS_START( vulcan )
- PORT_START_TAG("SYSTEM") /* 0xa0001 */
+ PORT_START("SYSTEM") /* 0xa0001 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -523,7 +523,7 @@ static INPUT_PORTS_START( vulcan )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P1") /* 0xa0003 */
+ PORT_START("P1") /* 0xa0003 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -533,7 +533,7 @@ static INPUT_PORTS_START( vulcan )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) // missile
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2") /* 0xa0005 */
+ PORT_START("P2") /* 0xa0005 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -543,12 +543,12 @@ static INPUT_PORTS_START( vulcan )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P3") /* 0xa0007 */
+ PORT_START("P3") /* 0xa0007 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
KONAMI_TWIN_COINAGE
- PORT_START_TAG("DSW2") /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -571,7 +571,7 @@ static INPUT_PORTS_START( vulcan )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* DSW3 0xa0018 */
+ PORT_START("DSW3") /* DSW3 0xa0018 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -585,7 +585,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( gradius2 ) // same as vulcan, different bonus
- PORT_START_TAG("SYSTEM") /* 0xa0001 */
+ PORT_START("SYSTEM") /* 0xa0001 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -595,7 +595,7 @@ static INPUT_PORTS_START( gradius2 ) // same as vulcan, different bonus
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P1") /* 0xa0003 */
+ PORT_START("P1") /* 0xa0003 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -605,7 +605,7 @@ static INPUT_PORTS_START( gradius2 ) // same as vulcan, different bonus
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) // missile
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2") /* 0xa0005 */
+ PORT_START("P2") /* 0xa0005 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -615,12 +615,12 @@ static INPUT_PORTS_START( gradius2 ) // same as vulcan, different bonus
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P3") /* 0xa0007 */
+ PORT_START("P3") /* 0xa0007 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
KONAMI_TWIN_COINAGE
- PORT_START_TAG("DSW2") /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -643,7 +643,7 @@ static INPUT_PORTS_START( gradius2 ) // same as vulcan, different bonus
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* DSW3 0xa0018 */
+ PORT_START("DSW3") /* DSW3 0xa0018 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -656,7 +656,7 @@ static INPUT_PORTS_START( gradius2 ) // same as vulcan, different bonus
INPUT_PORTS_END
static INPUT_PORTS_START( fround )
- PORT_START_TAG("SYSTEM") /* 0xa0001 */
+ PORT_START("SYSTEM") /* 0xa0001 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -666,7 +666,7 @@ static INPUT_PORTS_START( fround )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P1") /* 0xa0003 */
+ PORT_START("P1") /* 0xa0003 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -676,7 +676,7 @@ static INPUT_PORTS_START( fround )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) // defend
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2") /* 0xa0005 */
+ PORT_START("P2") /* 0xa0005 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -686,12 +686,12 @@ static INPUT_PORTS_START( fround )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED)
- PORT_START_TAG("P3") /* 0xa0007 */
+ PORT_START("P3") /* 0xa0007 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
KONAMI_TWIN_COINAGE
- PORT_START_TAG("DSW2") /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x03, 0x02, "Energy" )
PORT_DIPSETTING( 0x03, "18" )
PORT_DIPSETTING( 0x02, "20" )
@@ -707,7 +707,7 @@ static INPUT_PORTS_START( fround )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* DSW3 0xa0018 */
+ PORT_START("DSW3") /* DSW3 0xa0018 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -718,7 +718,7 @@ static INPUT_PORTS_START( fround )
INPUT_PORTS_END
static INPUT_PORTS_START( miaj )
- PORT_START_TAG("SYSTEM") /* 0xa0001 */
+ PORT_START("SYSTEM") /* 0xa0001 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -728,7 +728,7 @@ static INPUT_PORTS_START( miaj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P1") /* 0xa0003 */
+ PORT_START("P1") /* 0xa0003 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -738,7 +738,7 @@ static INPUT_PORTS_START( miaj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) // choice
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2") /* 0xa0005 */
+ PORT_START("P2") /* 0xa0005 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -748,12 +748,12 @@ static INPUT_PORTS_START( miaj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P3") /* 0xa0007 */
+ PORT_START("P3") /* 0xa0007 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
KONAMI_TWIN_COINAGE
- PORT_START_TAG("DSW2") /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -774,7 +774,7 @@ static INPUT_PORTS_START( miaj )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* DSW3 0xa0018 */
+ PORT_START("DSW3") /* DSW3 0xa0018 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -787,7 +787,7 @@ static INPUT_PORTS_START( miaj )
INPUT_PORTS_END
static INPUT_PORTS_START( cuebrckj )
- PORT_START_TAG("SYSTEM") /* 0xa0001 */
+ PORT_START("SYSTEM") /* 0xa0001 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -797,7 +797,7 @@ static INPUT_PORTS_START( cuebrckj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P1") /* 0xa0003 */
+ PORT_START("P1") /* 0xa0003 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -807,7 +807,7 @@ static INPUT_PORTS_START( cuebrckj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) // stop
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2") /* 0xa0005 */
+ PORT_START("P2") /* 0xa0005 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -817,12 +817,12 @@ static INPUT_PORTS_START( cuebrckj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P3") /* 0xa0007 */
+ PORT_START("P3") /* 0xa0007 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
KONAMI_TWIN_COINAGE
- PORT_START_TAG("DSW2") /* DSW2 */
+ PORT_START("DSW2") /* DSW2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -845,7 +845,7 @@ static INPUT_PORTS_START( cuebrckj )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3") /* DSW3 0xa0018 */
+ PORT_START("DSW3") /* DSW3 0xa0018 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/twincobr.c b/src/mame/drivers/twincobr.c
index 7cd3bfb89b6..cc50765db16 100644
--- a/src/mame/drivers/twincobr.c
+++ b/src/mame/drivers/twincobr.c
@@ -269,7 +269,6 @@ ADDRESS_MAP_END
*****************************************************************************/
#define TOAPLAN_PLAYER_INPUT( player ) \
- PORT_START \
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(player) PORT_8WAY \
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(player) PORT_8WAY \
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(player) PORT_8WAY \
@@ -280,7 +279,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
#define TOAPLAN_JAPAN_DSW_A \
- PORT_START /* DSW A */ \
+ PORT_START("DSWA") /* DSW A */ \
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) ) \
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) ) \
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) ) \
@@ -305,12 +304,12 @@ ADDRESS_MAP_END
PORT_DIPSETTING( 0x40, DEF_STR( 1C_2C ) )
#define TWINCOBR_VBLANK_INPUT( active_level ) \
- PORT_START \
+ PORT_START("VBLANK") \
PORT_BIT( 0x7f, active_level, IPT_UNKNOWN ) \
PORT_BIT( 0x80, active_level, IPT_VBLANK )
#define TWINCOBR_SYSTEM_INPUTS \
- PORT_START \
+ PORT_START("SYSTEM") \
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN3 ) \
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_TILT ) \
PORT_DIPNAME( 0x04, 0x00, "Cross Hatch Pattern" ) \
@@ -323,7 +322,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
#define TWINCOBR_DSW_B /* not KTIGER */ \
- PORT_START /* DSW B */ \
+ PORT_START("DSWB") /* DSW B */ \
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) ) \
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) ) \
PORT_DIPSETTING( 0x00, DEF_STR( Normal ) ) \
@@ -347,7 +346,7 @@ ADDRESS_MAP_END
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
#define FSHARK_SYSTEM_INPUTS /* V-Blank is also here */ \
- PORT_START \
+ PORT_START("SYSTEM") \
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN3 ) \
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_TILT ) /* tilt causes freeze */ \
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED ) /* reset button */ \
@@ -358,7 +357,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
#define FSHARK_DSW_B \
- PORT_START /* DSW B */ \
+ PORT_START("DSWB") /* DSW B */ \
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) ) \
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) ) \
PORT_DIPSETTING( 0x00, DEF_STR( Normal ) ) \
@@ -386,10 +385,14 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( twincobr )
TWINCOBR_VBLANK_INPUT( IP_ACTIVE_HIGH )
+
+ PORT_START("P1")
TOAPLAN_PLAYER_INPUT( 1 )
+
+ PORT_START("P2")
TOAPLAN_PLAYER_INPUT( 2 )
- PORT_START /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -414,15 +417,20 @@ static INPUT_PORTS_START( twincobr )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_6C ) )
TWINCOBR_DSW_B
+
TWINCOBR_SYSTEM_INPUTS
INPUT_PORTS_END
static INPUT_PORTS_START( twincobu )
TWINCOBR_VBLANK_INPUT( IP_ACTIVE_HIGH )
+
+ PORT_START("P1")
TOAPLAN_PLAYER_INPUT( 1 )
+
+ PORT_START("P2")
TOAPLAN_PLAYER_INPUT( 2 )
- PORT_START /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -447,16 +455,22 @@ static INPUT_PORTS_START( twincobu )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_2C ) )
TWINCOBR_DSW_B
+
TWINCOBR_SYSTEM_INPUTS
INPUT_PORTS_END
static INPUT_PORTS_START( ktiger )
TWINCOBR_VBLANK_INPUT( IP_ACTIVE_HIGH )
+
+ PORT_START("P1")
TOAPLAN_PLAYER_INPUT( 1 )
+
+ PORT_START("P2")
TOAPLAN_PLAYER_INPUT( 2 )
+
TOAPLAN_JAPAN_DSW_A
- PORT_START /* DSW B */
+ PORT_START("DSWB") /* DSW B */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x00, DEF_STR( Normal ) )
@@ -484,10 +498,14 @@ INPUT_PORTS_END
static INPUT_PORTS_START( fshark )
FSHARK_SYSTEM_INPUTS
+
+ PORT_START("P1")
TOAPLAN_PLAYER_INPUT( 1 )
+
+ PORT_START("P2")
TOAPLAN_PLAYER_INPUT( 2 )
- PORT_START /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -516,10 +534,14 @@ INPUT_PORTS_END
static INPUT_PORTS_START( skyshark )
FSHARK_SYSTEM_INPUTS
+
+ PORT_START("P1")
TOAPLAN_PLAYER_INPUT( 1 )
+
+ PORT_START("P2")
TOAPLAN_PLAYER_INPUT( 2 )
- PORT_START /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -548,18 +570,28 @@ INPUT_PORTS_END
static INPUT_PORTS_START( hishouza )
FSHARK_SYSTEM_INPUTS
+
+ PORT_START("P1")
TOAPLAN_PLAYER_INPUT( 1 )
+
+ PORT_START("P2")
TOAPLAN_PLAYER_INPUT( 2 )
+
TOAPLAN_JAPAN_DSW_A
+
FSHARK_DSW_B
INPUT_PORTS_END
static INPUT_PORTS_START( gulfwar2 )
TWINCOBR_VBLANK_INPUT( IP_ACTIVE_LOW )
+
+ PORT_START("P1")
TOAPLAN_PLAYER_INPUT( 1 )
+
+ PORT_START("P2")
TOAPLAN_PLAYER_INPUT( 2 )
- PORT_START /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -584,6 +616,7 @@ static INPUT_PORTS_START( gulfwar2 )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_6C ) )
TWINCOBR_DSW_B
+
TWINCOBR_SYSTEM_INPUTS
INPUT_PORTS_END
diff --git a/src/mame/drivers/twins.c b/src/mame/drivers/twins.c
index ed44ab0f2db..021370b9b21 100644
--- a/src/mame/drivers/twins.c
+++ b/src/mame/drivers/twins.c
@@ -135,7 +135,7 @@ static VIDEO_UPDATE(twins)
static INPUT_PORTS_START(twins)
- PORT_START /* 8bit */
+ PORT_START("P1") /* 8bit */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_8WAY
@@ -145,7 +145,7 @@ static INPUT_PORTS_START(twins)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_START /* 8bit */
+ PORT_START("P2") /* 8bit */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_8WAY
diff --git a/src/mame/drivers/tx1.c b/src/mame/drivers/tx1.c
index e738332a482..a9a4de9b3b1 100644
--- a/src/mame/drivers/tx1.c
+++ b/src/mame/drivers/tx1.c
@@ -113,7 +113,7 @@ static WRITE16_HANDLER( z80_shared_w )
*************************************/
static INPUT_PORTS_START( tx1 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x001c, 0x0000, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0008, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0004, DEF_STR( 2C_1C ) )
@@ -160,22 +160,22 @@ static INPUT_PORTS_START( tx1 )
PORT_DIPSETTING( 0xc000, "6" )
PORT_DIPSETTING( 0xe000, "7" )
- PORT_START_TAG("AN_STEERING")
+ PORT_START("AN_STEERING")
PORT_BIT( 0x0f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10)
- PORT_START_TAG("AN_ACCELERATOR")
+ PORT_START("AN_ACCELERATOR")
PORT_BIT( 0x1f, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0x1f) PORT_SENSITIVITY(25) PORT_KEYDELTA(10)
- PORT_START_TAG("AN_BRAKE")
+ PORT_START("AN_BRAKE")
PORT_BIT( 0x1f, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0x00,0x1f) PORT_SENSITIVITY(25) PORT_KEYDELTA(10)
- PORT_START_TAG("PPI_PORTC")
+ PORT_START("PPI_PORTC")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_SERVICE( 0x04, IP_ACTIVE_HIGH )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Gear Change") PORT_CODE(KEYCODE_SPACE) PORT_TOGGLE
- PORT_START_TAG("PPI_PORTD")
+ PORT_START("PPI_PORTD")
/* Wire jumper setting on sound PCB */
PORT_DIPNAME( 0xf0, 0x80, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x10, "1" )
@@ -218,7 +218,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( buggyboy )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
/* Dipswitch 0 is unconnected */
PORT_DIPNAME( 0x0003, 0x0003, "Do not change 2" )
PORT_DIPSETTING( 0x0000, "0" )
@@ -272,14 +272,14 @@ static INPUT_PORTS_START( buggyboy )
PORT_DIPSETTING( 0x0600, "6" )
PORT_DIPSETTING( 0x0700, "7" )
- PORT_START_TAG("PPI_PORTA")
+ PORT_START("PPI_PORTA")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Gear Change") PORT_CODE(KEYCODE_SPACE) PORT_TOGGLE
PORT_SERVICE( 0x80, IP_ACTIVE_HIGH )
- PORT_START_TAG("PPI_PORTC")
+ PORT_START("PPI_PORTC")
PORT_DIPNAME( 0xff, 0x80, "Sound PCB Jumper:" )
PORT_DIPSETTING( 0x00, "0" )
PORT_DIPSETTING( 0x01, "1" )
@@ -291,18 +291,18 @@ static INPUT_PORTS_START( buggyboy )
PORT_DIPSETTING( 0x40, "Buggy Boy/Taito" )
PORT_DIPSETTING( 0x80, "Buggy Boy/Tatsumi" )
- PORT_START_TAG("AN_STEERING")
+ PORT_START("AN_STEERING")
PORT_BIT( 0x0f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(25)
- PORT_START_TAG("AN_ACCELERATOR")
+ PORT_START("AN_ACCELERATOR")
PORT_BIT( 0x1f, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0x1f) PORT_SENSITIVITY(25) PORT_KEYDELTA(10)
- PORT_START_TAG("AN_BRAKE")
+ PORT_START("AN_BRAKE")
PORT_BIT( 0x1f, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0x00,0x1f) PORT_SENSITIVITY(25) PORT_KEYDELTA(10)
INPUT_PORTS_END
static INPUT_PORTS_START( buggybjr )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
/* Dipswitch 0 is unconnected */
PORT_DIPNAME( 0x0003, 0x0003, "Do not change 2" )
PORT_DIPSETTING( 0x0000, "0" )
@@ -356,7 +356,7 @@ static INPUT_PORTS_START( buggybjr )
PORT_DIPSETTING( 0x0600, "6" )
PORT_DIPSETTING( 0x0700, "7" )
- PORT_START_TAG("YM2149_IC19_A")
+ PORT_START("YM2149_IC19_A")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -364,7 +364,7 @@ static INPUT_PORTS_START( buggybjr )
PORT_SERVICE( 0x80, IP_ACTIVE_HIGH )
/* Wire jumper setting on sound PCB */
- PORT_START_TAG("YM2149_IC19_B")
+ PORT_START("YM2149_IC19_B")
PORT_DIPNAME( 0xff, 0x80, "Sound PCB Jumper:" )
PORT_DIPSETTING( 0x00, "0" )
PORT_DIPSETTING( 0x01, "1" )
@@ -376,13 +376,13 @@ static INPUT_PORTS_START( buggybjr )
PORT_DIPSETTING( 0x40, "Buggy Boy/Taito" )
PORT_DIPSETTING( 0x80, "Buggy Boy/Tatsumi" )
- PORT_START_TAG("AN_STEERING")
+ PORT_START("AN_STEERING")
PORT_BIT( 0x0f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(25)
- PORT_START_TAG("AN_ACCELERATOR")
+ PORT_START("AN_ACCELERATOR")
PORT_BIT( 0x1f, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00, 0x1f) PORT_SENSITIVITY(25) PORT_KEYDELTA(10)
- PORT_START_TAG("AN_BRAKE")
+ PORT_START("AN_BRAKE")
PORT_BIT( 0x1f, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0x00, 0x1f) PORT_SENSITIVITY(25) PORT_KEYDELTA(10)
INPUT_PORTS_END
diff --git a/src/mame/drivers/uapce.c b/src/mame/drivers/uapce.c
index 1d43b21d35a..a680e6e9162 100644
--- a/src/mame/drivers/uapce.c
+++ b/src/mame/drivers/uapce.c
@@ -125,7 +125,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( uapce )
- PORT_START_TAG( "JOY" )
+ PORT_START( "JOY" )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* button I */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) /* button II */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) /* select */
@@ -135,7 +135,7 @@ static INPUT_PORTS_START( uapce )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
- PORT_START_TAG( "DSW" )
+ PORT_START( "DSW" )
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -158,7 +158,7 @@ static INPUT_PORTS_START( uapce )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG( "COIN" )
+ PORT_START( "COIN" )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
INPUT_PORTS_END
diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c
index e30c5c9684e..01b369c49dd 100644
--- a/src/mame/drivers/ultraman.c
+++ b/src/mame/drivers/ultraman.c
@@ -150,14 +150,14 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( ultraman )
- PORT_START_TAG("IN0") /* Coins + Service */
+ PORT_START("IN0") /* Coins + Service */
PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE_NO_TOGGLE(0x10, IP_ACTIVE_LOW)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -167,7 +167,7 @@ static INPUT_PORTS_START( ultraman )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -177,7 +177,7 @@ static INPUT_PORTS_START( ultraman )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -214,7 +214,7 @@ static INPUT_PORTS_START( ultraman )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) /* Manual states dips 1 & 2 are "Unused" */
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/ultratnk.c b/src/mame/drivers/ultratnk.c
index 6896911d154..1b1e81c4918 100644
--- a/src/mame/drivers/ultratnk.c
+++ b/src/mame/drivers/ultratnk.c
@@ -179,14 +179,14 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( ultratnk )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Option 1") PORT_TOGGLE
- PORT_START_TAG("COLLISION")
+ PORT_START("COLLISION")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM( get_collision, (void *)0 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -196,13 +196,13 @@ static INPUT_PORTS_START( ultratnk )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_TILT ) /* SLAM */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM( get_collision, (void *)3 )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_SERVICE2 ) PORT_NAME("Option 2") PORT_TOGGLE
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE3 ) PORT_NAME("Option 3") PORT_TOGGLE
- PORT_START_TAG("DIP")
+ PORT_START("DIP")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unused ) ) PORT_DIPLOCATION("DIP:8")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -225,7 +225,7 @@ static INPUT_PORTS_START( ultratnk )
PORT_DIPSETTING( 0xc0, "75 Points" )
PORT_DIPSETTING( 0x00, DEF_STR( None ) )
- PORT_START_TAG("ANALOG")
+ PORT_START("ANALOG")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM( get_joystick, "JOY-W" )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
@@ -235,26 +235,26 @@ static INPUT_PORTS_START( ultratnk )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM( get_joystick, "JOY-Z" )
- PORT_START_TAG("JOY-W")
+ PORT_START("JOY-W")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_UP ) PORT_PLAYER(1)
- PORT_START_TAG("JOY-X")
+ PORT_START("JOY-X")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_UP ) PORT_PLAYER(1)
- PORT_START_TAG("JOY-Y")
+ PORT_START("JOY-Y")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_UP ) PORT_PLAYER(2)
- PORT_START_TAG("JOY-Z")
+ PORT_START("JOY-Z")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_UP ) PORT_PLAYER(2)
- PORT_START_TAG("MOTOR1")
+ PORT_START("MOTOR1")
PORT_ADJUSTER( 35, "Motor 1 RPM" )
- PORT_START_TAG("MOTOR2")
+ PORT_START("MOTOR2")
PORT_ADJUSTER( 40, "Motor 2 RPM" )
INPUT_PORTS_END
diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c
index f9cba7f4cb3..6422e93b146 100644
--- a/src/mame/drivers/ultrsprt.c
+++ b/src/mame/drivers/ultrsprt.c
@@ -178,29 +178,29 @@ ADDRESS_MAP_END
/*****************************************************************************/
static INPUT_PORTS_START( ultrsprt )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x4, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x2, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x1, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START_TAG("STICKX1")
+ PORT_START("STICKX1")
PORT_BIT( 0xfff, 0x800, IPT_AD_STICK_X ) PORT_MINMAX(0x000,0xfff) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("STICKY1")
+ PORT_START("STICKY1")
PORT_BIT( 0xfff, 0x800, IPT_AD_STICK_Y ) PORT_MINMAX(0x000,0xfff) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x4, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x2, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x1, IP_ACTIVE_HIGH, IPT_START2 )
- PORT_START_TAG("STICKX2")
+ PORT_START("STICKX2")
PORT_BIT( 0xfff, 0x800, IPT_AD_STICK_X ) PORT_MINMAX(0x000,0xfff) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) PORT_PLAYER(2)
- PORT_START_TAG("STICKY2")
+ PORT_START("STICKY2")
PORT_BIT( 0xfff, 0x800, IPT_AD_STICK_Y ) PORT_MINMAX(0x000,0xfff) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_SERVICE_NO_TOGGLE( 0x1, IP_ACTIVE_LOW )
INPUT_PORTS_END
diff --git a/src/mame/drivers/undrfire.c b/src/mame/drivers/undrfire.c
index 2fcfa88a050..c759743885c 100644
--- a/src/mame/drivers/undrfire.c
+++ b/src/mame/drivers/undrfire.c
@@ -539,7 +539,7 @@ ADDRESS_MAP_END
***********************************************************/
static INPUT_PORTS_START( undrfire )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -557,7 +557,7 @@ static INPUT_PORTS_START( undrfire )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* Frame counter */
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -575,7 +575,7 @@ static INPUT_PORTS_START( undrfire )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_SERVICE_NO_TOGGLE(0x01, IP_ACTIVE_LOW)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -587,19 +587,19 @@ static INPUT_PORTS_START( undrfire )
/* Gun inputs (real range is 0-0xffff: we use standard 0-255 and shift later) */
- PORT_START_TAG("GUNX1") /* IN 3, P1X */
+ PORT_START("GUNX1") /* IN 3, P1X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, -1.0, 0.0, 0) PORT_SENSITIVITY(20) PORT_KEYDELTA(25) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("GUNY1") /* IN 4, P1Y */
+ PORT_START("GUNY1") /* IN 4, P1Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(20) PORT_KEYDELTA(25) PORT_PLAYER(1)
- PORT_START_TAG("GUNX2") /* IN 5, P2X */
+ PORT_START("GUNX2") /* IN 5, P2X */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, -1.0, 0.0, 0) PORT_SENSITIVITY(20) PORT_KEYDELTA(25) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("GUNY2") /* IN 6, P2Y */
+ PORT_START("GUNY2") /* IN 6, P2Y */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(20) PORT_KEYDELTA(25) PORT_PLAYER(2)
- PORT_START_TAG("FAKE")
+ PORT_START("FAKE")
PORT_DIPNAME( 0x01, 0x00, "Show gun target" ) PORT_CODE(KEYCODE_F1) PORT_TOGGLE
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x01, DEF_STR( Yes ) )
@@ -608,7 +608,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( cbombers )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -626,7 +626,7 @@ static INPUT_PORTS_START( cbombers )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* Frame counter */
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -644,7 +644,7 @@ static INPUT_PORTS_START( cbombers )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_SERVICE_NO_TOGGLE(0x01, IP_ACTIVE_LOW)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -654,7 +654,7 @@ static INPUT_PORTS_START( cbombers )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("STEER") /* IN 3, steering wheel */
+ PORT_START("STEER") /* IN 3, steering wheel */
PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_REVERSE PORT_PLAYER(1)
INPUT_PORTS_END
diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c
index 1fec4e3579f..65be0599678 100644
--- a/src/mame/drivers/unico.c
+++ b/src/mame/drivers/unico.c
@@ -329,7 +329,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( burglarx )
- PORT_START_TAG("IN0") //$800000.w
+ PORT_START("IN0") //$800000.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -348,7 +348,7 @@ static INPUT_PORTS_START( burglarx )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") //$800019.b
+ PORT_START("IN1") //$800019.b
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -359,7 +359,7 @@ static INPUT_PORTS_START( burglarx )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") //$80001a.b
+ PORT_START("DSW1") //$80001a.b
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE( 0x0100, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Free_Play ) )
@@ -384,7 +384,7 @@ static INPUT_PORTS_START( burglarx )
PORT_DIPSETTING( 0xa000, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x8000, DEF_STR( 1C_4C ) )
- PORT_START_TAG("DSW2") //$80001c.b
+ PORT_START("DSW2") //$80001c.b
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x0200, DEF_STR( None ) )
@@ -418,7 +418,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( zeropnt )
- PORT_START_TAG("IN0") //$800018.w
+ PORT_START("IN0") //$800018.w
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE( 0x0004, IP_ACTIVE_HIGH)
@@ -438,7 +438,7 @@ static INPUT_PORTS_START( zeropnt )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") //$80001a.b
+ PORT_START("DSW1") //$80001a.b
PORT_BIT( 0x00ff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_DIPNAME( 0x0100, 0x0000, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -465,7 +465,7 @@ static INPUT_PORTS_START( zeropnt )
PORT_DIPSETTING( 0x4000, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x6000, DEF_STR( 1C_4C ) )
- PORT_START_TAG("DSW2") //$80001c.b
+ PORT_START("DSW2") //$80001c.b
PORT_BIT( 0x00ff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_DIPNAME( 0x0100, 0x0000, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -489,16 +489,16 @@ static INPUT_PORTS_START( zeropnt )
PORT_DIPSETTING( 0x8000, "4" )
PORT_DIPSETTING( 0xc000, "5" )
- PORT_START_TAG("Y0") //$800170.b
+ PORT_START("Y0") //$800170.b
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(15) PORT_PLAYER(2)
- PORT_START_TAG("X0") //$800174.b
+ PORT_START("X0") //$800174.b
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(15) PORT_PLAYER(2)
- PORT_START_TAG("Y1") //$800178.b
+ PORT_START("Y1") //$800178.b
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("X1") //$80017c.b
+ PORT_START("X1") //$80017c.b
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(15) PORT_PLAYER(1)
INPUT_PORTS_END
@@ -510,7 +510,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( zeropnt2 )
- PORT_START_TAG("IN0") //$800019.b
+ PORT_START("IN0") //$800019.b
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE( 0x0004, IP_ACTIVE_HIGH)
@@ -521,7 +521,7 @@ static INPUT_PORTS_START( zeropnt2 )
PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") //$80001a.b
+ PORT_START("DSW1") //$80001a.b
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Free_Play ) )
PORT_DIPSETTING( 0x0100, DEF_STR( Off ) )
@@ -547,7 +547,7 @@ static INPUT_PORTS_START( zeropnt2 )
PORT_DIPSETTING( 0xa000, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x8000, DEF_STR( 1C_4C ) )
- PORT_START_TAG("DSW2") //$80001c.b
+ PORT_START("DSW2") //$80001c.b
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x0100, 0x0100, "Korean Language" )
PORT_DIPSETTING( 0x0100, DEF_STR( Off ) )
@@ -573,19 +573,19 @@ static INPUT_PORTS_START( zeropnt2 )
PORT_DIPSETTING( 0x4000, DEF_STR( Harder ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Hardest ) )
- PORT_START_TAG("Y0") //$800140.b
+ PORT_START("Y0") //$800140.b
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(15) PORT_PLAYER(2)
- PORT_START_TAG("X0") //$800144.b
+ PORT_START("X0") //$800144.b
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(15) PORT_PLAYER(2)
- PORT_START_TAG("Y1") //$800148.b
+ PORT_START("Y1") //$800148.b
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("X1") //$80014c.b
+ PORT_START("X1") //$80014c.b
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(15) PORT_PLAYER(1)
- PORT_START_TAG("IN7") //$80015c.b
+ PORT_START("IN7") //$80015c.b
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
diff --git a/src/mame/drivers/upscope.c b/src/mame/drivers/upscope.c
index 0d85409a5c8..5280897d5fe 100644
--- a/src/mame/drivers/upscope.c
+++ b/src/mame/drivers/upscope.c
@@ -253,10 +253,10 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( upscope )
- PORT_START_TAG("POT1DAT")
+ PORT_START("POT1DAT")
PORT_BIT( 0xff, 0x80, IPT_PADDLE) PORT_SENSITIVITY(25) PORT_MINMAX(0x02,0xfe) PORT_KEYDELTA(5) PORT_CENTERDELTA(0) PORT_REVERSE
- PORT_START_TAG("IO0")
+ PORT_START("IO0")
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
diff --git a/src/mame/drivers/usgames.c b/src/mame/drivers/usgames.c
index d5d2da9e38f..50f80993a45 100644
--- a/src/mame/drivers/usgames.c
+++ b/src/mame/drivers/usgames.c
@@ -108,7 +108,7 @@ static ADDRESS_MAP_START( usg185_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
#define USGIN0\
- PORT_START_TAG("IN0")\
+ PORT_START("IN0")\
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Button 1") PORT_CODE(KEYCODE_Z)\
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Button 2") PORT_CODE(KEYCODE_X)\
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Button 3") PORT_CODE(KEYCODE_C)\
@@ -123,7 +123,7 @@ ADDRESS_MAP_END
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
#define USGIN2 \
- PORT_START_TAG("IN2")\
+ PORT_START("IN2")\
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )\
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )\
PORT_DIPSETTING( 0x00, DEF_STR( On ) )\
@@ -150,7 +150,7 @@ ADDRESS_MAP_END
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
#define USGIN3\
- PORT_START_TAG("IN3")\
+ PORT_START("IN3")\
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )\
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )\
PORT_DIPSETTING( 0x00, DEF_STR( On ) )\
@@ -181,7 +181,7 @@ static INPUT_PORTS_START( usg32 )
USGIN0
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, "Service Keyboard Attached?" ) //Not actually a DIP, when keyboard is plugged in, this goes low
PORT_DIPSETTING( 0x01, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
@@ -212,7 +212,7 @@ static INPUT_PORTS_START( usg83 ) //From here, the hardware was slightly upgrade
USGIN0
- PORT_START
+ PORT_START("DSW")
PORT_DIPNAME( 0x01, 0x01, "Service Keyboard Attached?" ) //Not actually a DIP, when keyboard is plugged in, this goes low
PORT_DIPSETTING( 0x01, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c
index 3632e2b53da..27967f8c982 100644
--- a/src/mame/drivers/vamphalf.c
+++ b/src/mame/drivers/vamphalf.c
@@ -435,7 +435,7 @@ static VIDEO_UPDATE( common )
static INPUT_PORTS_START( common )
- PORT_START_TAG("P1_P2")
+ PORT_START("P1_P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -453,7 +453,7 @@ static INPUT_PORTS_START( common )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN2 )
diff --git a/src/mame/drivers/vaportra.c b/src/mame/drivers/vaportra.c
index fc5b9be19a6..4d4db406c8f 100644
--- a/src/mame/drivers/vaportra.c
+++ b/src/mame/drivers/vaportra.c
@@ -117,7 +117,7 @@ ADDRESS_MAP_END
/******************************************************************************/
static INPUT_PORTS_START( vaportra )
- PORT_START_TAG("P1") /* Player 1 controls */
+ PORT_START("P1") /* Player 1 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -127,7 +127,7 @@ static INPUT_PORTS_START( vaportra )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 controls */
+ PORT_START("P2") /* Player 2 controls */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -137,7 +137,7 @@ static INPUT_PORTS_START( vaportra )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("COINS") /* Credits */
+ PORT_START("COINS") /* Credits */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
@@ -147,7 +147,7 @@ static INPUT_PORTS_START( vaportra )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") /* Dip switch bank 1 */
+ PORT_START("DSW1") /* Dip switch bank 1 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -171,7 +171,7 @@ static INPUT_PORTS_START( vaportra )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW2") /* Dip switch bank 2 */
+ PORT_START("DSW2") /* Dip switch bank 2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x03, "3" )
diff --git a/src/mame/drivers/vastar.c b/src/mame/drivers/vastar.c
index e8af4cace2c..3d9efb9faea 100644
--- a/src/mame/drivers/vastar.c
+++ b/src/mame/drivers/vastar.c
@@ -159,7 +159,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( vastar )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -169,7 +169,7 @@ static INPUT_PORTS_START( vastar )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -179,7 +179,7 @@ static INPUT_PORTS_START( vastar )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -189,7 +189,7 @@ static INPUT_PORTS_START( vastar )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -214,7 +214,7 @@ static INPUT_PORTS_START( vastar )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_2C ) )
diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c
index 1e087afbf7a..ca14bdf4048 100644
--- a/src/mame/drivers/vball.c
+++ b/src/mame/drivers/vball.c
@@ -230,7 +230,8 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x9800, 0x9803) AM_WRITE(OKIM6295_data_0_w)
ADDRESS_MAP_END
-#define COMMON_PORTS_BEFORE PORT_START \
+#define COMMON_PORTS_BEFORE \
+ PORT_START("P1") \
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) \
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) \
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) \
@@ -239,7 +240,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) \
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) \
- PORT_START \
+ PORT_START("P2") \
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) \
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) \
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) \
@@ -248,7 +249,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) \
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) \
- PORT_START \
+ PORT_START("SYSTEM") \
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) \
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) \
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) \
@@ -258,7 +259,8 @@ ADDRESS_MAP_END
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) \
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) \
-#define COMMON_PORTS_COINS PORT_START \
+#define COMMON_PORTS_COINS \
+ PORT_START("DSW2") \
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A )) \
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C )) \
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C )) \
@@ -289,7 +291,7 @@ static INPUT_PORTS_START (vball)
/* The dipswitch instructions in naz's dump (vball) don't quite sync here) */
/* Looks like the pins from the dips to the board were mixed up a little. */
- PORT_START
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ))
// I've adjusted these to what I think is correct from gameplay testing - SJE - 03/28/03
PORT_DIPSETTING( 0x02, DEF_STR( Easy ))
@@ -315,7 +317,7 @@ static INPUT_PORTS_START (vball)
COMMON_PORTS_COINS
- PORT_START
+ PORT_START("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
@@ -324,7 +326,8 @@ static INPUT_PORTS_START (vball)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START
+
+ PORT_START("P4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
@@ -338,21 +341,22 @@ INPUT_PORTS_END
static INPUT_PORTS_START (vball2pj)
COMMON_PORTS_BEFORE
-/* The 2-player roms have the game-time in the difficulty spot, and
- I've assumed vice-versa. (VS the instructions scanned in Naz's dump)
-*/
- PORT_START
+ /* The 2-player roms have the game-time in the difficulty spot, and
+ I've assumed vice-versa. (VS the instructions scanned in Naz's dump) */
+
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, "Single Player Game Time")
PORT_DIPSETTING( 0x00, "1:30")
PORT_DIPSETTING( 0x01, "1:45")
PORT_DIPSETTING( 0x03, "2:00")
PORT_DIPSETTING( 0x02, "2:15")
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Difficulty ))
-// This ordering is assumed. Someone has to play it a lot and find out.
+ // This ordering is assumed. Someone has to play it a lot and find out.
PORT_DIPSETTING( 0x04, DEF_STR( Easy ))
PORT_DIPSETTING( 0x00, DEF_STR( Medium ))
PORT_DIPSETTING( 0x08, DEF_STR( Hard ))
PORT_DIPSETTING( 0x0c, DEF_STR( Very_Hard ))
+
COMMON_PORTS_COINS
INPUT_PORTS_END
diff --git a/src/mame/drivers/vegaeo.c b/src/mame/drivers/vegaeo.c
index b4db2b9470a..1e59c585e32 100644
--- a/src/mame/drivers/vegaeo.c
+++ b/src/mame/drivers/vegaeo.c
@@ -95,7 +95,7 @@ static ADDRESS_MAP_START( vega_map, ADDRESS_SPACE_PROGRAM, 32 )
ADDRESS_MAP_END
static INPUT_PORTS_START( crazywar )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_START1 )
@@ -106,7 +106,7 @@ static INPUT_PORTS_START( crazywar )
PORT_BIT( 0x00000080, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xffffff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P1_P2")
+ PORT_START("P1_P2")
PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
diff --git a/src/mame/drivers/vegas.c b/src/mame/drivers/vegas.c
index c91420eca8d..cd18e7746d8 100644
--- a/src/mame/drivers/vegas.c
+++ b/src/mame/drivers/vegas.c
@@ -1733,7 +1733,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( vegas_common )
- PORT_START_TAG("DIPS")
+ PORT_START("DIPS")
PORT_DIPNAME( 0x0001, 0x0001, "Unknown0001" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
@@ -1783,7 +1783,7 @@ static INPUT_PORTS_START( vegas_common )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -1800,7 +1800,7 @@ static INPUT_PORTS_START( vegas_common )
PORT_BIT( 0x6000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BILL1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_8WAY
@@ -1818,7 +1818,7 @@ static INPUT_PORTS_START( vegas_common )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3) PORT_8WAY
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3) PORT_8WAY
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(3) PORT_8WAY
@@ -1945,28 +1945,28 @@ static INPUT_PORTS_START( warfa )
PORT_DIPSETTING( 0x4000, "Medium Res 512x384" )
PORT_DIPSETTING( 0x0000, "VGA Res 640x480" )
- PORT_START_TAG("AN0")
+ PORT_START("AN0")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN3")
+ PORT_START("AN3")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN4")
+ PORT_START("AN4")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN5")
+ PORT_START("AN5")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN6")
+ PORT_START("AN6")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN7")
+ PORT_START("AN7")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
INPUT_PORTS_END
@@ -1989,28 +1989,28 @@ static INPUT_PORTS_START( roadburn )
PORT_DIPSETTING( 0x0200, "Medium Res 512x384" )
PORT_DIPSETTING( 0x0000, "VGA Res 640x480" )
- PORT_START_TAG("AN0")
+ PORT_START("AN0")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10, 0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(5)
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0xff, 0x80, IPT_PEDAL ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 0xff, 0x80, IPT_PEDAL ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(25) PORT_KEYDELTA(100) PORT_PLAYER(2)
- PORT_START_TAG("AN3")
+ PORT_START("AN3")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN4")
+ PORT_START("AN4")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN5")
+ PORT_START("AN5")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN6")
+ PORT_START("AN6")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN7")
+ PORT_START("AN7")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
INPUT_PORTS_END
@@ -2085,28 +2085,28 @@ static INPUT_PORTS_START( sf2049 )
PORT_DIPSETTING( 0x0200, "Medium Res 512x384" )
PORT_DIPSETTING( 0x0300, "VGA Res 640x480" )
- PORT_START_TAG("AN0")
+ PORT_START("AN0")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10, 0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(5)
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0xff, 0x80, IPT_PEDAL ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 0xff, 0x80, IPT_PEDAL ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(25) PORT_KEYDELTA(100) PORT_PLAYER(2)
- PORT_START_TAG("AN3")
+ PORT_START("AN3")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN4")
+ PORT_START("AN4")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN5")
+ PORT_START("AN5")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN6")
+ PORT_START("AN6")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN7")
+ PORT_START("AN7")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
INPUT_PORTS_END
@@ -2116,28 +2116,28 @@ static INPUT_PORTS_START( sf2049se )
PORT_MODIFY("DIPS")
- PORT_START_TAG("AN0")
+ PORT_START("AN0")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10, 0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(5)
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0xff, 0x80, IPT_PEDAL ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 0xff, 0x80, IPT_PEDAL ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(25) PORT_KEYDELTA(100) PORT_PLAYER(2)
- PORT_START_TAG("AN3")
+ PORT_START("AN3")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN4")
+ PORT_START("AN4")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN5")
+ PORT_START("AN5")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN6")
+ PORT_START("AN6")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN7")
+ PORT_START("AN7")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
INPUT_PORTS_END
@@ -2147,28 +2147,28 @@ static INPUT_PORTS_START( sf2049te )
PORT_MODIFY("DIPS")
- PORT_START_TAG("AN0")
+ PORT_START("AN0")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10, 0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(5)
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0xff, 0x80, IPT_PEDAL ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 0xff, 0x80, IPT_PEDAL ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(25) PORT_KEYDELTA(100) PORT_PLAYER(2)
- PORT_START_TAG("AN3")
+ PORT_START("AN3")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN4")
+ PORT_START("AN4")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN5")
+ PORT_START("AN5")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN6")
+ PORT_START("AN6")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN7")
+ PORT_START("AN7")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
INPUT_PORTS_END
@@ -2178,28 +2178,28 @@ static INPUT_PORTS_START( cartfury )
PORT_MODIFY("DIPS")
- PORT_START_TAG("AN0")
+ PORT_START("AN0")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10, 0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(5)
- PORT_START_TAG("AN1")
+ PORT_START("AN1")
PORT_BIT( 0xff, 0x80, IPT_PEDAL ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START_TAG("AN2")
+ PORT_START("AN2")
PORT_BIT( 0xff, 0x80, IPT_PEDAL ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(25) PORT_KEYDELTA(100) PORT_PLAYER(2)
- PORT_START_TAG("AN3")
+ PORT_START("AN3")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN4")
+ PORT_START("AN4")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN5")
+ PORT_START("AN5")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN6")
+ PORT_START("AN6")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
- PORT_START_TAG("AN7")
+ PORT_START("AN7")
PORT_BIT( 0xff, 0x80, IPT_SPECIAL )
INPUT_PORTS_END
diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c
index fd173c8ec8f..cf22cf56caa 100644
--- a/src/mame/drivers/vendetta.c
+++ b/src/mame/drivers/vendetta.c
@@ -363,7 +363,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( vendet4p )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -373,7 +373,7 @@ static INPUT_PORTS_START( vendet4p )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -383,7 +383,7 @@ static INPUT_PORTS_START( vendet4p )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -393,14 +393,14 @@ static INPUT_PORTS_START( vendet4p )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("EEPROM")
+ PORT_START("EEPROM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* EEPROM data */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* EEPROM ready */
PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_VBLANK ) /* not really vblank, object related. Its timed, otherwise sprites flicker */
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
@@ -410,7 +410,7 @@ static INPUT_PORTS_START( vendet4p )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN3 )
- PORT_START_TAG("P4")
+ PORT_START("P4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
@@ -442,7 +442,7 @@ static INPUT_PORTS_START( vendetta )
INPUT_PORTS_END
static INPUT_PORTS_START( esckids )
- PORT_START_TAG("P1") // Player 1 Control
+ PORT_START("P1") // Player 1 Control
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -452,7 +452,7 @@ static INPUT_PORTS_START( esckids )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START_TAG("P2") // Player 2 Control
+ PORT_START("P2") // Player 2 Control
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
@@ -462,7 +462,7 @@ static INPUT_PORTS_START( esckids )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("SERVICE") // Start, Service
+ PORT_START("SERVICE") // Start, Service
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -472,14 +472,14 @@ static INPUT_PORTS_START( esckids )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("EEPROM")
+ PORT_START("EEPROM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* EEPROM data */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* EEPROM ready */
PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_VBLANK ) /* not really vblank, object related. Its timed, otherwise sprites flicker */
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P3") // Player 3 Control ??? (Not used)
+ PORT_START("P3") // Player 3 Control ??? (Not used)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
@@ -489,7 +489,7 @@ static INPUT_PORTS_START( esckids )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN3 )
- PORT_START_TAG("P4") // Player 4 Control ??? (Not used)
+ PORT_START("P4") // Player 4 Control ??? (Not used)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
diff --git a/src/mame/drivers/vertigo.c b/src/mame/drivers/vertigo.c
index f37b3fa15e8..499f9a37a2e 100644
--- a/src/mame/drivers/vertigo.c
+++ b/src/mame/drivers/vertigo.c
@@ -67,16 +67,16 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( vertigo )
- PORT_START_TAG("P1X")
+ PORT_START("P1X")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START_TAG("P1Y")
+ PORT_START("P1Y")
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START_TAG("PADDLE")
+ PORT_START("PADDLE")
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_Y) PORT_CODE_INC(KEYCODE_X)
- PORT_START_TAG("GIO")
+ PORT_START("GIO")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -86,7 +86,7 @@ static INPUT_PORTS_START( vertigo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/vicdual.c b/src/mame/drivers/vicdual.c
index 470ae032526..48958da5e9b 100644
--- a/src/mame/drivers/vicdual.c
+++ b/src/mame/drivers/vicdual.c
@@ -104,7 +104,7 @@ static INPUT_CHANGED( coin_changed )
#define PORT_COIN \
- PORT_START_TAG(COIN_PORT_TAG) \
+ PORT_START(COIN_PORT_TAG) \
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED(coin_changed, NULL) \
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -193,7 +193,7 @@ int vicdual_is_cabinet_color(running_machine *machine)
#define PORT_CABINET_COLOR_OR_BW \
- PORT_START_TAG(COLOR_BW_PORT_TAG) \
+ PORT_START(COLOR_BW_PORT_TAG) \
PORT_CONFNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) \
PORT_CONFSETTING( 0x00, "Color" ) \
PORT_CONFSETTING( 0x01, "Black and White" ) \
@@ -300,7 +300,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( depthch )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
@@ -312,7 +312,7 @@ static INPUT_PORTS_START( depthch )
PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(vicdual_get_64v, 0)
PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(vicdual_read_coin_status, 0)
@@ -384,7 +384,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( safari )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
@@ -394,7 +394,7 @@ static INPUT_PORTS_START( safari )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(vicdual_get_64v, 0)
PORT_BIT( 0x0e, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coinage ) )
@@ -466,7 +466,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( frogs )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY /* The original joystick was a 3-way */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY /* stick, of which Mame's 4-way does */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY /* a fine simulation */
@@ -484,29 +484,29 @@ static INPUT_PORTS_START( frogs )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_1C ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(vicdual_get_64v, 0)
PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(vicdual_read_coin_status, 0)
PORT_COIN
-// PORT_START_TAG("IN2")
+// PORT_START("IN2")
// PORT_ADJUSTER( 25, "Boing Volume" )
-// PORT_START_TAG("IN3")
+// PORT_START("IN3")
// PORT_ADJUSTER( 25, "Buzzz Volume" )
-// PORT_START_TAG("IN4")
+// PORT_START("IN4")
// PORT_ADJUSTER( 25, "Croak Volume" )
-// PORT_START_TAG("IN5")
+// PORT_START("IN5")
// PORT_ADJUSTER( 25, "Hop Volume" )
-// PORT_START_TAG("IN6")
+// PORT_START("IN6")
// PORT_ADJUSTER( 50, "Splash Volume" )
- PORT_START_TAG("R93")
+ PORT_START("R93")
PORT_ADJUSTER( 50, "Zip Volume" )
INPUT_PORTS_END
@@ -597,7 +597,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( headon )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -612,7 +612,7 @@ static INPUT_PORTS_START( headon )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(vicdual_get_64v, 0)
PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(vicdual_read_coin_status, 0)
@@ -624,7 +624,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( supcrash )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
@@ -640,7 +640,7 @@ static INPUT_PORTS_START( supcrash )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(vicdual_get_timer_value, 0)
PORT_DIPNAME( 0x04, 0x04, "Rom Test" )
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
@@ -655,7 +655,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( sspaceat )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -665,7 +665,7 @@ static INPUT_PORTS_START( sspaceat )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x00, "Bonus Life For Final UFO" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -687,7 +687,7 @@ static INPUT_PORTS_START( sspaceat )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(vicdual_get_timer_value, 0)
PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(vicdual_read_coin_status, 0)
@@ -807,7 +807,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( headon2 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
@@ -817,7 +817,7 @@ static INPUT_PORTS_START( headon2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x07, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x18, 0x18, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x18, "4" )
@@ -826,7 +826,7 @@ static INPUT_PORTS_START( headon2 )
/*PORT_DIPSETTING( 0x08, "5" )*/
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(vicdual_get_timer_value, 0)
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -839,7 +839,7 @@ INPUT_PORTS_END
/* this actually seems to ignore the dipswitches and is hardcoded to 2 coins 1 credit, and 2 lives */
static INPUT_PORTS_START( car2 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
/* controls are active_high around on this bootleg */
@@ -850,7 +850,7 @@ static INPUT_PORTS_START( car2 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x07, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x18, 0x18, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x18, "4" )
@@ -859,7 +859,7 @@ static INPUT_PORTS_START( car2 )
/*PORT_DIPSETTING( 0x08, "5" )*/
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(vicdual_get_timer_value, 0)
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -871,7 +871,7 @@ static INPUT_PORTS_START( car2 )
INPUT_PORTS_END
static INPUT_PORTS_START( digger )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -881,7 +881,7 @@ static INPUT_PORTS_START( digger )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -901,7 +901,7 @@ static INPUT_PORTS_START( digger )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(vicdual_get_timer_value, 0)
PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(vicdual_read_coin_status, 0)
@@ -1200,7 +1200,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( invho2 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x04, 0x04, "Head On Lives (1/2)" )
@@ -1213,7 +1213,7 @@ static INPUT_PORTS_START( invho2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x04, 0x00, "Head On Lives (2/2)" )
@@ -1224,7 +1224,7 @@ static INPUT_PORTS_START( invho2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x04, 0x00, "Invinco Lives" )
@@ -1235,7 +1235,7 @@ static INPUT_PORTS_START( invho2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) /* probably unused */
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
/* There's probably a bug in the code: this would likely be the second */
@@ -1254,7 +1254,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( invds )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x04, 0x00, "Invinco Lives (1/2)" )
@@ -1267,7 +1267,7 @@ static INPUT_PORTS_START( invds )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x04, 0x00, "Invinco Lives (2/2)" )
@@ -1278,7 +1278,7 @@ static INPUT_PORTS_START( invds )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x04, 0x00, "Deep Scan Lives (1/2)" )
@@ -1289,7 +1289,7 @@ static INPUT_PORTS_START( invds )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
/* +1 and +2 gives 2 lives instead of 6 */
@@ -1306,7 +1306,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( sspacaho )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_DIPNAME( 0x04, 0x04, "S.A. Lives (1/2)" )
@@ -1319,7 +1319,7 @@ static INPUT_PORTS_START( sspacaho )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x04, 0x00, "S.A. Lives (2/2)" )
@@ -1330,7 +1330,7 @@ static INPUT_PORTS_START( sspacaho )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x04, 0x00, "S.A. Bonus Life" )
@@ -1341,7 +1341,7 @@ static INPUT_PORTS_START( sspacaho )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x04, 0x00, "S.A. Bonus Life For Final UFO" )
@@ -1357,7 +1357,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( tranqgun )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) )
@@ -1370,7 +1370,7 @@ static INPUT_PORTS_START( tranqgun )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) )
@@ -1381,7 +1381,7 @@ static INPUT_PORTS_START( tranqgun )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) )
@@ -1392,7 +1392,7 @@ static INPUT_PORTS_START( tranqgun )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) )
@@ -1408,7 +1408,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( spacetrk )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Lives ) )
@@ -1421,7 +1421,7 @@ static INPUT_PORTS_START( spacetrk )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) ) /* unknown, but used */
@@ -1432,7 +1432,7 @@ static INPUT_PORTS_START( spacetrk )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* must be high for bonus life to work */
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Bonus_Life ) )
@@ -1443,7 +1443,7 @@ static INPUT_PORTS_START( spacetrk )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* must be high for bonus life to work */
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unused ) )
@@ -1459,7 +1459,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( sptrekct )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Lives ) )
@@ -1472,7 +1472,7 @@ static INPUT_PORTS_START( sptrekct )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) ) /* unknown, but used */
@@ -1483,7 +1483,7 @@ static INPUT_PORTS_START( sptrekct )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* must be high for bonus life to work */
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Bonus_Life ) )
@@ -1494,7 +1494,7 @@ static INPUT_PORTS_START( sptrekct )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* must be high for bonus life to work */
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unused ) )
@@ -1510,7 +1510,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( carnival )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unused ) )
@@ -1525,7 +1525,7 @@ static INPUT_PORTS_START( carnival )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unused ) )
@@ -1536,7 +1536,7 @@ static INPUT_PORTS_START( carnival )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unused ) )
@@ -1547,7 +1547,7 @@ static INPUT_PORTS_START( carnival )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unused ) )
@@ -1563,7 +1563,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( carnvckt )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unused ) )
@@ -1578,7 +1578,7 @@ static INPUT_PORTS_START( carnvckt )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unused ) )
@@ -1589,7 +1589,7 @@ static INPUT_PORTS_START( carnvckt )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unused ) )
@@ -1600,7 +1600,7 @@ static INPUT_PORTS_START( carnvckt )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unused ) )
@@ -1616,7 +1616,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( brdrline )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_DIPNAME( 0x04, 0x04, "Infinite Lives" )
@@ -1634,7 +1634,7 @@ static INPUT_PORTS_START( brdrline )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Lives ) )
@@ -1645,7 +1645,7 @@ static INPUT_PORTS_START( brdrline )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Lives ) )
@@ -1656,7 +1656,7 @@ static INPUT_PORTS_START( brdrline )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unused ) )
@@ -1672,7 +1672,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( pulsar )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x04, 0x04, "Lives (1/2)" )
@@ -1685,7 +1685,7 @@ static INPUT_PORTS_START( pulsar )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x04, 0x04, "Lives (2/2)" )
@@ -1696,7 +1696,7 @@ static INPUT_PORTS_START( pulsar )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unused ) )
@@ -1707,7 +1707,7 @@ static INPUT_PORTS_START( pulsar )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unused ) )
@@ -1723,7 +1723,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( heiankyo )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) /* bonus life? */
@@ -1736,7 +1736,7 @@ static INPUT_PORTS_START( heiankyo )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) /* bonus life? */
@@ -1747,7 +1747,7 @@ static INPUT_PORTS_START( heiankyo )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* has to be 0, protection? */
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) /* bonus life? */
@@ -1758,7 +1758,7 @@ static INPUT_PORTS_START( heiankyo )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* has to be 0, protection? */
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) /* probably unused */
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Lives ) )
@@ -1774,7 +1774,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( alphaho )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_DIPNAME( 0x04, 0x00, "Alpha Fighter Lives (1/2)" )
@@ -1787,7 +1787,7 @@ static INPUT_PORTS_START( alphaho )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x04, 0x00, "Alpha Fighter Lives (2/2)" )
@@ -1798,7 +1798,7 @@ static INPUT_PORTS_START( alphaho )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
@@ -1807,7 +1807,7 @@ static INPUT_PORTS_START( alphaho )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x04, 0x00, "Alpha Fighter Unknown" ) // related to soccer frequency (code at 0x4950)
@@ -2017,7 +2017,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( samurai )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_DIPNAME( 0x04, 0x04, DEF_STR( Lives ) )
@@ -2030,7 +2030,7 @@ static INPUT_PORTS_START( samurai )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(samurai_protection_r, (void *)1)
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) ) /* unknown, but used */
@@ -2041,7 +2041,7 @@ static INPUT_PORTS_START( samurai )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(samurai_protection_r, (void *)2)
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unused ) )
@@ -2052,7 +2052,7 @@ static INPUT_PORTS_START( samurai )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(samurai_protection_r, (void *)3)
PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unused ) )
@@ -2130,7 +2130,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( nsub )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -2140,7 +2140,7 @@ static INPUT_PORTS_START( nsub )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(vicdual_get_composite_blank_comp, 0)
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
@@ -2226,7 +2226,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( invinco )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
@@ -2236,7 +2236,7 @@ static INPUT_PORTS_START( invinco )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -2256,7 +2256,7 @@ static INPUT_PORTS_START( invinco )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(vicdual_get_composite_blank_comp, 0)
PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(vicdual_read_coin_status, 0)
diff --git a/src/mame/drivers/victory.c b/src/mame/drivers/victory.c
index c40e07db782..18646bf27a8 100644
--- a/src/mame/drivers/victory.c
+++ b/src/mame/drivers/victory.c
@@ -157,7 +157,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( victory )
- PORT_START /* $00-$03 = SW2 */
+ PORT_START("SW2") /* $00-$03 = SW2 */
PORT_DIPNAME( 0x07, 0x00, "????" )
PORT_DIPSETTING( 0x00, "0" )
PORT_DIPSETTING( 0x01, "1" )
@@ -172,19 +172,19 @@ static INPUT_PORTS_START( victory )
PORT_DIPSETTING( 0x00, "60 Hz" )
PORT_DIPSETTING( 0x80, "50 Hz" )
- PORT_START /* $04-$07 = SW1 */
+ PORT_START("SW1") /* $04-$07 = SW1 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* $08-$09 = PIO K8 port A */
+ PORT_START("DIAL") /* $08-$09 = PIO K8 port A */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_REVERSE
- PORT_START /* $0A-$0B = PIO K8 port B */
+ PORT_START("COIN") /* $0A-$0B = PIO K8 port B */
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )
- PORT_START /* $0C-$0D = PIO L8 port A */
+ PORT_START("BUTTONS") /* $0C-$0D = PIO L8 port A */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON4 )
@@ -194,7 +194,7 @@ static INPUT_PORTS_START( victory )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* $0E-$0F = PIO L8 port B */
+ PORT_START("UNUSED") /* $0E-$0F = PIO L8 port B */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/videopin.c b/src/mame/drivers/videopin.c
index e7e1bf904a5..3857465697a 100644
--- a/src/mame/drivers/videopin.c
+++ b/src/mame/drivers/videopin.c
@@ -214,7 +214,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( videopin )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Left Flipper") PORT_CODE(KEYCODE_LCONTROL)
@@ -224,7 +224,7 @@ static INPUT_PORTS_START( videopin )
PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW") /* IN1 */
+ PORT_START("DSW") /* IN1 */
PORT_DIPNAME( 0xc0, 0x80, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0xc0, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_1C ) )
@@ -248,7 +248,7 @@ static INPUT_PORTS_START( videopin )
PORT_DIPSETTING( 0x00, "180000 (3 balls) / 300000 (5 balls)" )
PORT_DIPSETTING( 0x01, "210000 (3 balls) / 350000 (5 balls)" )
- PORT_START_TAG("IN1") /* IN2 */
+ PORT_START("IN1") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SPECIAL ) /* PLUNGER 1 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* PLUNGER 2 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -258,7 +258,7 @@ static INPUT_PORTS_START( videopin )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Nudge") PORT_CODE(KEYCODE_SPACE)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Ball Shooter") PORT_CODE(KEYCODE_DOWN)
INPUT_PORTS_END
diff --git a/src/mame/drivers/vigilant.c b/src/mame/drivers/vigilant.c
index 818d84be5d5..d583d8cb0b3 100644
--- a/src/mame/drivers/vigilant.c
+++ b/src/mame/drivers/vigilant.c
@@ -142,14 +142,14 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( vigilant )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT(0xF0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
@@ -159,7 +159,7 @@ static INPUT_PORTS_START( vigilant )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_COCKTAIL
@@ -169,7 +169,7 @@ static INPUT_PORTS_START( vigilant )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x02, "2" )
PORT_DIPSETTING( 0x03, "3" )
@@ -200,7 +200,7 @@ static INPUT_PORTS_START( vigilant )
PORT_DIPSETTING( 0x50, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -230,7 +230,7 @@ static INPUT_PORTS_START( vigilant )
INPUT_PORTS_END
static INPUT_PORTS_START( kikcubic )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
@@ -240,7 +240,7 @@ static INPUT_PORTS_START( kikcubic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -250,7 +250,7 @@ static INPUT_PORTS_START( kikcubic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(19)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
@@ -260,7 +260,7 @@ static INPUT_PORTS_START( kikcubic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Medium ) )
@@ -290,7 +290,7 @@ static INPUT_PORTS_START( kikcubic )
// PORT_DIPSETTING( 0x80, "Undefined" )
// PORT_DIPSETTING( 0x90, "Undefined" )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -317,13 +317,13 @@ static INPUT_PORTS_START( kikcubic )
INPUT_PORTS_END
static INPUT_PORTS_START( buccanrs )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_SERVICE( 0x2f, IP_ACTIVE_LOW ) // any of these bits while booting will enable service mode
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
@@ -333,7 +333,7 @@ static INPUT_PORTS_START( buccanrs )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_COCKTAIL
@@ -343,7 +343,7 @@ static INPUT_PORTS_START( buccanrs )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x07, DEF_STR( 3C_1C ) )
@@ -371,7 +371,7 @@ static INPUT_PORTS_START( buccanrs )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/vindictr.c b/src/mame/drivers/vindictr.c
index ac727f2b38a..786fb4fe029 100644
--- a/src/mame/drivers/vindictr.c
+++ b/src/mame/drivers/vindictr.c
@@ -111,7 +111,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( vindictr )
- PORT_START_TAG("260000")
+ PORT_START("260000")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
@@ -122,7 +122,7 @@ static INPUT_PORTS_START( vindictr )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_2WAY PORT_PLAYER(1)
- PORT_START_TAG("260010")
+ PORT_START("260010")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_SERVICE( 0x0002, IP_ACTIVE_LOW )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -138,7 +138,7 @@ static INPUT_PORTS_START( vindictr )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_2WAY PORT_PLAYER(2)
- PORT_START_TAG("260020")
+ PORT_START("260020")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c
index f5c91b92181..b33890a596b 100644
--- a/src/mame/drivers/vmetal.c
+++ b/src/mame/drivers/vmetal.c
@@ -259,7 +259,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( varia )
- PORT_START_TAG("P1_P2") /* IN0 */
+ PORT_START("P1_P2") /* IN0 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -277,7 +277,7 @@ static INPUT_PORTS_START( varia )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("SYSTEM") /* IN1 */
+ PORT_START("SYSTEM") /* IN1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_TILT )
@@ -285,7 +285,7 @@ static INPUT_PORTS_START( varia )
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE2 ) // 'Test'
PORT_BIT( 0xffe0, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused?
- PORT_START_TAG("DSW1") /* Dips 1 */
+ PORT_START("DSW1") /* Dips 1 */
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0005, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0006, DEF_STR( 2C_1C ) )
@@ -311,7 +311,7 @@ static INPUT_PORTS_START( varia )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* Dips 2 */
+ PORT_START("DSW2") /* Dips 2 */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ))
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c
index e295b82f6e3..d95bb4d675e 100644
--- a/src/mame/drivers/volfied.c
+++ b/src/mame/drivers/volfied.c
@@ -95,12 +95,12 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( volfied )
/* Z80 CPU -> 0x10002c ($2c,A5) */
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
TAITO_MACHINE_COCKTAIL
TAITO_COINAGE_WORLD
/* Z80 CPU -> 0x10002e ($2e,A5) */
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Bonus_Life ) ) /* table at 0x003140 - 4 * 6 words - LSB first */
PORT_DIPSETTING( 0x02, "20k 40k 120k 480k 2400k" )
PORT_DIPSETTING( 0x03, "50k 150k 600k 3000k" )
@@ -124,7 +124,7 @@ static INPUT_PORTS_START( volfied )
PORT_DIPSETTING( 0x80, DEF_STR( Japanese ) )
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
- PORT_START_TAG("F00007")
+ PORT_START("F00007")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -134,7 +134,7 @@ static INPUT_PORTS_START( volfied )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("F00009")
+ PORT_START("F00009")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -144,7 +144,7 @@ static INPUT_PORTS_START( volfied )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("F0000B")
+ PORT_START("F0000B")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -154,7 +154,7 @@ static INPUT_PORTS_START( volfied )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("F0000D")
+ PORT_START("F0000D")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c
index 3741da5491e..b730c73d1a6 100644
--- a/src/mame/drivers/vroulet.c
+++ b/src/mame/drivers/vroulet.c
@@ -122,7 +122,7 @@ ADDRESS_MAP_END
/* Input Ports */
static INPUT_PORTS_START( vroulet )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_F1) PORT_NAME("Memory Reset")
@@ -132,7 +132,7 @@ static INPUT_PORTS_START( vroulet )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_4) PORT_NAME("Payout")
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // button1 duplicate
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -142,10 +142,10 @@ static INPUT_PORTS_START( vroulet )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON6 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -170,7 +170,7 @@ static INPUT_PORTS_START( vroulet )
PORT_DIPSETTING( 0x40, "3" )
PORT_DIPSETTING( 0x00, "4" )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/vsnes.c b/src/mame/drivers/vsnes.c
index 08123ff9872..39cc4055d06 100644
--- a/src/mame/drivers/vsnes.c
+++ b/src/mame/drivers/vsnes.c
@@ -248,7 +248,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( vsnes )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) /* BUTTON A on a nes */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) /* BUTTON B on a nes */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 ) /* SELECT on a nes */
@@ -258,7 +258,7 @@ static INPUT_PORTS_START( vsnes )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) /* BUTTON A on a nes */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) /* BUTTON B on a nes */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START2 ) /* SELECT on a nes */
@@ -268,7 +268,7 @@ static INPUT_PORTS_START( vsnes )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_START_TAG("COINS") /* IN2 */
+ PORT_START("COINS") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) /* serial pin from controller */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_IMPULSE(1) /* service credit? */
@@ -303,7 +303,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( vsnes_dual )
/* Left Side Controls */
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) /* BUTTON A on a nes */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) /* BUTTON B on a nes */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 ) /* SELECT on a nes */
@@ -313,7 +313,7 @@ static INPUT_PORTS_START( vsnes_dual )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) /* BUTTON A on a nes */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) /* BUTTON B on a nes */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START2 ) /* SELECT on a nes */
@@ -323,7 +323,7 @@ static INPUT_PORTS_START( vsnes_dual )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_START_TAG("COINS") /* IN2 */
+ PORT_START("COINS") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) /* serial pin from controller */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_IMPULSE(1) /* service credit? */
@@ -334,7 +334,7 @@ static INPUT_PORTS_START( vsnes_dual )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) /* this bit masks irqs - dont change */
/* Right Side Controls */
- PORT_START_TAG("IN2") /* IN3 */
+ PORT_START("IN2") /* IN3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(3) /* BUTTON A on a nes */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(3) /* BUTTON B on a nes */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("2nd Side 1 Player Start") PORT_CODE(KEYCODE_MINUS) /* SELECT on a nes */
@@ -344,7 +344,7 @@ static INPUT_PORTS_START( vsnes_dual )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(3)
- PORT_START_TAG("IN3") /* IN4 */
+ PORT_START("IN3") /* IN4 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(4) /* BUTTON A on a nes */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(4) /* BUTTON B on a nes */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("2nd Side 2 Player Start") PORT_CODE(KEYCODE_EQUALS) /* SELECT on a nes */
@@ -354,7 +354,7 @@ static INPUT_PORTS_START( vsnes_dual )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(4)
- PORT_START_TAG("COINS2") /* IN5 */
+ PORT_START("COINS2") /* IN5 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) /* serial pin from controller */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) PORT_IMPULSE(1) /* service credit? */
@@ -404,7 +404,7 @@ static INPUT_PORTS_START( vsnes_dual_rev )
INPUT_PORTS_END
static INPUT_PORTS_START( vsnes_zapper )
- PORT_START_TAG("IN0") /* IN0 */
+ PORT_START("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -414,7 +414,7 @@ static INPUT_PORTS_START( vsnes_zapper )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) /* sprite hit */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) /* gun trigger */
- PORT_START_TAG("IN1") /* IN1 */
+ PORT_START("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -424,7 +424,7 @@ static INPUT_PORTS_START( vsnes_zapper )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("COINS") /* IN2 */
+ PORT_START("COINS") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) /* serial pin from controller */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_IMPULSE(1) /* service credit? */
@@ -434,10 +434,10 @@ static INPUT_PORTS_START( vsnes_zapper )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(1)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("GUNX") /* IN4 - FAKE - Gun X pos */
+ PORT_START("GUNX") /* IN4 - FAKE - Gun X pos */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(30)
- PORT_START_TAG("GUNY") /* IN5 - FAKE - Gun Y pos */
+ PORT_START("GUNY") /* IN5 - FAKE - Gun Y pos */
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(30)
INPUT_PORTS_END
@@ -445,7 +445,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( topgun )
PORT_INCLUDE( vsnes )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 4C_1C ) )
@@ -474,7 +474,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( platoon )
PORT_INCLUDE( vsnes )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -520,7 +520,7 @@ Lose Hole -1 -2
static INPUT_PORTS_START( golf )
PORT_INCLUDE( vsnes_rev )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x07, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 3C_1C ) )
@@ -560,7 +560,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( vstennis )
PORT_INCLUDE( vsnes_dual )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x03, 0x00, "Difficulty Vs. Computer" )
PORT_DIPSETTING( 0x00, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -584,7 +584,7 @@ static INPUT_PORTS_START( vstennis )
PORT_DIPSETTING( 0x00, DEF_STR( Japan ) )
PORT_DIPSETTING( 0x80, DEF_STR( USA ) )
- PORT_START_TAG("DSW1") /* DSW1 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW1") /* DSW1 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_SERVICE( 0x01, IP_ACTIVE_HIGH )
PORT_DIPNAME( 0x06, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
@@ -610,7 +610,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( wrecking )
PORT_INCLUDE( vsnes_dual )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -635,7 +635,7 @@ static INPUT_PORTS_START( wrecking )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW1") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x07, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 3C_1C ) )
@@ -665,7 +665,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( balonfgt )
PORT_INCLUDE( vsnes_dual )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -689,7 +689,7 @@ static INPUT_PORTS_START( balonfgt )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_HIGH )
- PORT_START_TAG("DSW1") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW1") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -718,7 +718,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( vsmahjng )
PORT_INCLUDE( vsnes_dual )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -743,7 +743,7 @@ static INPUT_PORTS_START( vsmahjng )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW1") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_SERVICE( 0x01, IP_ACTIVE_HIGH )
PORT_DIPNAME( 0x06, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
@@ -769,7 +769,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( vsbball )
PORT_INCLUDE( vsnes_dual )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_SERVICE( 0x01, IP_ACTIVE_HIGH )
PORT_DIPNAME( 0x06, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
@@ -792,7 +792,7 @@ static INPUT_PORTS_START( vsbball )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW1") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x03, 0x02, "Player Defense Strenght" )
PORT_DIPSETTING( 0x00, "Weak" )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -818,7 +818,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( vsbballj )
PORT_INCLUDE( vsnes_dual )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x03, 0x02, "Player Defense Strenght" )
PORT_DIPSETTING( 0x00, "Weak" )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -840,7 +840,7 @@ static INPUT_PORTS_START( vsbballj )
PORT_DIPSETTING( 0x40, "Strong" )
PORT_DIPSETTING( 0xc0, "Very Strong" )
- PORT_START_TAG("DSW1") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW1") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_SERVICE( 0x01, IP_ACTIVE_HIGH )
PORT_DIPNAME( 0x06, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
@@ -868,7 +868,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( iceclmrj )
PORT_INCLUDE( vsnes_dual_rev )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x07, 0x00, "Coinage (Left Side)" )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -893,7 +893,7 @@ static INPUT_PORTS_START( iceclmrj )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW1") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x07, 0x00, "Coinage (Right Side)" )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -922,7 +922,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( drmario )
PORT_INCLUDE( vsnes_rev )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x03, 0x00, "Drop Rate Increases After" )
PORT_DIPSETTING( 0x00, "7 Pills" )
PORT_DIPSETTING( 0x01, "8 Pills" )
@@ -949,7 +949,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( rbibb )
PORT_INCLUDE( vsnes_rev )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
@@ -975,7 +975,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( btlecity )
PORT_INCLUDE( vsnes_rev )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x01, 0x01, "Credits for 2 Players" )
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x01, "2" )
@@ -1004,7 +1004,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( cluclu )
PORT_INCLUDE( vsnes_rev )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -1033,7 +1033,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( cstlevna )
PORT_INCLUDE( vsnes )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 4C_1C ) )
@@ -1062,7 +1062,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( iceclimb )
PORT_INCLUDE( vsnes_rev )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -1107,7 +1107,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( excitebk )
PORT_INCLUDE( vsnes )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -1147,7 +1147,7 @@ static INPUT_PORTS_START( jajamaru )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -1175,7 +1175,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( machridr )
PORT_INCLUDE( vsnes )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -1217,7 +1217,7 @@ static INPUT_PORTS_START( machridj )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -1244,7 +1244,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( suprmrio )
PORT_INCLUDE( vsnes )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 2C_1C ) )
@@ -1273,7 +1273,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( duckhunt )
PORT_INCLUDE( vsnes_zapper )
- PORT_START_TAG("DSW0") /* IN3 */
+ PORT_START("DSW0") /* IN3 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 4C_1C ) )
@@ -1301,7 +1301,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( hogalley )
PORT_INCLUDE( vsnes_zapper )
- PORT_START_TAG("DSW0") /* IN3 */
+ PORT_START("DSW0") /* IN3 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 4C_1C ) )
@@ -1329,7 +1329,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( vsgshoe )
PORT_INCLUDE( vsnes_zapper )
- PORT_START_TAG("DSW0") /* IN3 */
+ PORT_START("DSW0") /* IN3 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 4C_1C ) )
@@ -1358,7 +1358,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( vsfdf )
PORT_INCLUDE( vsnes_zapper )
- PORT_START_TAG("DSW0") /* IN3 */
+ PORT_START("DSW0") /* IN3 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 4C_1C ) )
@@ -1388,7 +1388,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( vstetris )
PORT_INCLUDE( vsnes_rev )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1422,7 +1422,7 @@ static INPUT_PORTS_START( vsskykid )
PORT_MODIFY("IN1")
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* SELECT on a nes */
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x00, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x01, DEF_STR( Normal ) )
@@ -1448,7 +1448,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( vspinbal )
PORT_INCLUDE( vsnes )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x07, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 3C_1C ) )
@@ -1484,7 +1484,7 @@ static INPUT_PORTS_START( vspinblj )
PORT_MODIFY("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) /* Left flipper */
- PORT_START_TAG("COIN") /* IN2 */
+ PORT_START("COIN") /* IN2 */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* service credit? */
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 )
@@ -1493,7 +1493,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( goonies )
PORT_INCLUDE( vsnes )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 4C_1C ) )
@@ -1522,7 +1522,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( vssoccer )
PORT_INCLUDE( vsnes_rev )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -1550,7 +1550,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( vsgradus )
PORT_INCLUDE( vsnes_rev )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 4C_1C ) )
@@ -1579,7 +1579,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( vsslalom )
PORT_INCLUDE( vsnes )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 4C_1C ) )
@@ -1608,7 +1608,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( starlstr )
PORT_INCLUDE( vsnes_dual )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -1631,14 +1631,14 @@ static INPUT_PORTS_START( starlstr )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* no DSW1? */
+ PORT_START("DSW1") /* no DSW1? */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( tkoboxng )
PORT_INCLUDE( vsnes )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
@@ -1679,7 +1679,7 @@ static INPUT_PORTS_START( bnglngby )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -1706,7 +1706,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mightybj )
PORT_INCLUDE( vsnes )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x07, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
@@ -1743,7 +1743,7 @@ static INPUT_PORTS_START( supxevs )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
+ PORT_START("DSW0") /* DSW0 - bit 0 and 1 read from bit 3 and 4 on $4016, rest of the bits read on $4017 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
diff --git a/src/mame/drivers/vulgus.c b/src/mame/drivers/vulgus.c
index c26e66a62b5..250200d831d 100644
--- a/src/mame/drivers/vulgus.c
+++ b/src/mame/drivers/vulgus.c
@@ -98,7 +98,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( vulgus )
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
@@ -108,7 +108,7 @@ static INPUT_PORTS_START( vulgus )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -118,7 +118,7 @@ static INPUT_PORTS_START( vulgus )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
@@ -128,7 +128,7 @@ static INPUT_PORTS_START( vulgus )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* DSW0 */
+ PORT_START("DSW1") /* DSW0 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -155,9 +155,9 @@ static INPUT_PORTS_START( vulgus )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
- PORT_START /* DSW1 */
-/* not sure about difficulty
- Code perform a read and (& 0x03). NDMix*/
+ PORT_START("DSW2") /* DSW1 */
+ /* Not sure about difficulty
+ Code perform a read and (& 0x03). NDMix */
PORT_DIPNAME( 0x03, 0x03, "Difficulty?" )
PORT_DIPSETTING( 0x02, "Easy?" )
PORT_DIPSETTING( 0x03, "Normal?" )
diff --git a/src/mame/drivers/wallc.c b/src/mame/drivers/wallc.c
index 005f3206b03..055bb665014 100644
--- a/src/mame/drivers/wallc.c
+++ b/src/mame/drivers/wallc.c
@@ -160,7 +160,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( wallc )
- PORT_START /* DSW - read from b000 */
+ PORT_START("DSW1") /* DSW - read from b000 */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "5" )
PORT_DIPSETTING( 0x02, "4" )
@@ -183,7 +183,7 @@ static INPUT_PORTS_START( wallc )
PORT_DIPSETTING( 0x80, "Free Play With Level Select" )
PORT_DIPSETTING( 0x00, DEF_STR( Normal ) )
- PORT_START /* b200 */
+ PORT_START("SYSTEM") /* b200 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) //Right curve button; select current playfield in test mode
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) //not used ?
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) //service?? plays loud,high-pitched sound
@@ -193,10 +193,10 @@ static INPUT_PORTS_START( wallc )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 ) //ok
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) //ok
- PORT_START /* b400 - player position 8 bit analog input - value read is used as position of the player directly - what type of input is that ? DIAL ?*/
+ PORT_START("DIAL") /* b400 - player position 8 bit analog input - value read is used as position of the player directly - what type of input is that ? DIAL ?*/
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(3) PORT_REVERSE PORT_PLAYER(1)
- PORT_START /* b600 - bits 0-5: coinage */
+ PORT_START("DSW2") /* b600 - bits 0-5: coinage */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c
index a957f27d172..d6103aca5d2 100644
--- a/src/mame/drivers/wardner.c
+++ b/src/mame/drivers/wardner.c
@@ -261,8 +261,7 @@ ADDRESS_MAP_END
player 1 start button when in the cross-hatch screen.
*****************************************************************************/
-#define WARDNER_PLAYER_INPUT( player ) \
- PORT_START /* Player 1 button 3 skips video RAM tests */ \
+#define WARDNER_PLAYER_INPUT( player ) /* Player 1 button 3 skips video RAM tests */ \
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(player) PORT_8WAY \
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(player) PORT_8WAY \
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(player) PORT_8WAY \
@@ -273,7 +272,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_PLAYER(player) /* Shot D */
#define WARDNER_SYSTEM_INPUTS \
- PORT_START /* test button doesnt seem to do anything ? */ \
+ PORT_START("SYSTEM") /* test button doesnt seem to do anything ? */ \
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN3 ) /* Service button */ \
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_TILT ) \
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Test button */ \
@@ -284,7 +283,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK ) /* V-Blank */
#define PYROS_DSW_A \
- PORT_START /* DSW A */ \
+ PORT_START("DSWA") /* DSW A */ \
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) ) \
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) ) \
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) ) \
@@ -309,7 +308,7 @@ ADDRESS_MAP_END
PORT_DIPSETTING( 0x40, DEF_STR( 1C_2C ) )
#define WARDNER_DSW_B \
- PORT_START /* DSW B */ \
+ PORT_START("DSWB") /* DSW B */ \
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) ) \
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) ) \
PORT_DIPSETTING( 0x00, DEF_STR( Normal ) ) \
@@ -336,10 +335,14 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( wardner )
WARDNER_SYSTEM_INPUTS
+
+ PORT_START("P1")
WARDNER_PLAYER_INPUT( 1 )
+
+ PORT_START("P2")
WARDNER_PLAYER_INPUT( 2 )
- PORT_START /* DSW A */
+ PORT_START("DSWA") /* DSW A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -368,11 +371,16 @@ INPUT_PORTS_END
static INPUT_PORTS_START( pyros )
WARDNER_SYSTEM_INPUTS
+
+ PORT_START("P1")
WARDNER_PLAYER_INPUT( 1 )
+
+ PORT_START("P2")
WARDNER_PLAYER_INPUT( 2 )
+
PYROS_DSW_A
- PORT_START /* DSW B */
+ PORT_START("DSWB") /* DSW B */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x00, DEF_STR( Normal ) )
@@ -398,9 +406,15 @@ INPUT_PORTS_END
static INPUT_PORTS_START( wardnerj )
WARDNER_SYSTEM_INPUTS
+
+ PORT_START("P1")
WARDNER_PLAYER_INPUT( 1 )
+
+ PORT_START("P2")
WARDNER_PLAYER_INPUT( 2 )
+
PYROS_DSW_A
+
WARDNER_DSW_B
INPUT_PORTS_END
diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c
index 5e20a311a90..3041004be83 100644
--- a/src/mame/drivers/warpwarp.c
+++ b/src/mame/drivers/warpwarp.c
@@ -341,7 +341,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( geebee )
- PORT_START_TAG("SW0")
+ PORT_START("SW0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -350,10 +350,10 @@ static INPUT_PORTS_START( geebee )
PORT_SERVICE( 0x20, IP_ACTIVE_LOW )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SW1")
+ PORT_START("SW1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail) )
@@ -373,15 +373,15 @@ static INPUT_PORTS_START( geebee )
PORT_DIPSETTING( 0x0c, DEF_STR( Free_Play ) )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff, 0x58, IPT_PADDLE ) PORT_MINMAX(0x10,0xa0) PORT_SENSITIVITY(30) PORT_KEYDELTA(15) PORT_CENTERDELTA(0) PORT_REVERSE
- PORT_START_TAG("IN2") /* Cocktail */
+ PORT_START("IN2") /* Cocktail */
PORT_BIT( 0xff, 0x58, IPT_PADDLE ) PORT_MINMAX(0x10,0xa0) PORT_SENSITIVITY(30) PORT_KEYDELTA(15) PORT_CENTERDELTA(0) PORT_REVERSE PORT_COCKTAIL
INPUT_PORTS_END
static INPUT_PORTS_START( navarone )
- PORT_START_TAG("SW0")
+ PORT_START("SW0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -390,10 +390,10 @@ static INPUT_PORTS_START( navarone )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SW1")
+ PORT_START("SW1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail) )
@@ -413,17 +413,17 @@ static INPUT_PORTS_START( navarone )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* Fake input port to support digital joystick */
+ PORT_START("IN1") /* Fake input port to support digital joystick */
PORT_BIT( 0x01, 0x00, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x02, 0x00, IPT_JOYSTICK_LEFT )
- PORT_START_TAG("IN2") /* Fake input port to support digital joystick */
+ PORT_START("IN2") /* Fake input port to support digital joystick */
PORT_BIT( 0x01, 0x00, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
PORT_BIT( 0x02, 0x00, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
INPUT_PORTS_END
static INPUT_PORTS_START( kaitei )
- PORT_START_TAG("SW0")
+ PORT_START("SW0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -432,10 +432,10 @@ static INPUT_PORTS_START( kaitei )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SW1")
+ PORT_START("SW1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "3" )
@@ -453,23 +453,23 @@ static INPUT_PORTS_START( kaitei )
PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* Fake input port to support digital joystick */
+ PORT_START("IN1") /* Fake input port to support digital joystick */
PORT_BIT( 0x01, 0x00, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x02, 0x00, IPT_JOYSTICK_LEFT )
- PORT_START_TAG("IN2") /* Fake input port to support digital joystick */
+ PORT_START("IN2") /* Fake input port to support digital joystick */
PORT_BIT( 0x01, 0x00, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
PORT_BIT( 0x02, 0x00, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
INPUT_PORTS_END
static INPUT_PORTS_START( kaiteik )
- PORT_START_TAG("SW0")
+ PORT_START("SW0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xf2, 0xa0, IPT_UNKNOWN ) // game verifies these bits and freezes if they don't match
- PORT_START_TAG("SW1")
+ PORT_START("SW1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -478,7 +478,7 @@ static INPUT_PORTS_START( kaiteik )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xc0, 0x80, IPT_UNKNOWN ) // game verifies these two bits and freezes if they don't match
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -497,17 +497,17 @@ static INPUT_PORTS_START( kaiteik )
PORT_DIPSETTING( 0x20, DEF_STR( On ) )
PORT_BIT( 0xc0, 0x80, IPT_UNKNOWN ) // game verifies these two bits and freezes if they don't match
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x3f, 0x00, IPT_UNKNOWN )
PORT_BIT( 0xc0, 0x80, IPT_UNKNOWN ) // game verifies these two bits and freezes if they don't match
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x3f, 0x00, IPT_UNKNOWN )
PORT_BIT( 0xc0, 0x80, IPT_UNKNOWN ) // game verifies these two bits and freezes if they don't match
INPUT_PORTS_END
static INPUT_PORTS_START( sos )
- PORT_START_TAG("SW0")
+ PORT_START("SW0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -516,10 +516,10 @@ static INPUT_PORTS_START( sos )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SW1")
+ PORT_START("SW1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail) )
@@ -538,17 +538,17 @@ static INPUT_PORTS_START( sos )
PORT_DIPSETTING( 0x20, DEF_STR( On ) )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* Fake input port to support digital joystick */
+ PORT_START("IN1") /* Fake input port to support digital joystick */
PORT_BIT( 0x01, 0x00, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x02, 0x00, IPT_JOYSTICK_LEFT )
- PORT_START_TAG("IN2") /* Fake input port to support digital joystick */
+ PORT_START("IN2") /* Fake input port to support digital joystick */
PORT_BIT( 0x01, 0x00, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL
PORT_BIT( 0x02, 0x00, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL
INPUT_PORTS_END
static INPUT_PORTS_START( bombbee )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -560,7 +560,7 @@ static INPUT_PORTS_START( bombbee )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -584,10 +584,10 @@ static INPUT_PORTS_START( bombbee )
PORT_DIPSETTING( 0xc0, "150000" )
PORT_DIPSETTING( 0xe0, DEF_STR( None ) )
- PORT_START_TAG("VOLIN1") /* Mux input - player 1 controller - handled by warpwarp_vol_r */
+ PORT_START("VOLIN1") /* Mux input - player 1 controller - handled by warpwarp_vol_r */
PORT_BIT( 0xff, 0x60, IPT_PADDLE ) PORT_MINMAX(0x14,0xac) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_REVERSE
- PORT_START_TAG("VOLIN2") /* Mux input - player 2 controller - handled by warpwarp_vol_r */
+ PORT_START("VOLIN2") /* Mux input - player 2 controller - handled by warpwarp_vol_r */
PORT_BIT( 0xff, 0x60, IPT_PADDLE ) PORT_MINMAX(0x14,0xac) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_REVERSE PORT_COCKTAIL
INPUT_PORTS_END
@@ -607,7 +607,7 @@ static INPUT_PORTS_START( cutieq )
INPUT_PORTS_END
static INPUT_PORTS_START( warpwarp )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -619,7 +619,7 @@ static INPUT_PORTS_START( warpwarp )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -651,13 +651,13 @@ static INPUT_PORTS_START( warpwarp )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("VOLIN1") /* FAKE - input port to simulate an analog stick - handled by warpwarp_vol_r */
+ PORT_START("VOLIN1") /* FAKE - input port to simulate an analog stick - handled by warpwarp_vol_r */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
- PORT_START_TAG("VOLIN2") /* FAKE - input port to simulate an analog stick - handled by warpwarp_vol_r */
+ PORT_START("VOLIN2") /* FAKE - input port to simulate an analog stick - handled by warpwarp_vol_r */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c
index 248a44be591..db8fb54b803 100644
--- a/src/mame/drivers/warriorb.c
+++ b/src/mame/drivers/warriorb.c
@@ -268,7 +268,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( darius2d )
/* 0x800000 -> 0x109e16 ($1e16,A5) and 0x109e1a ($1e1a,A5) */
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:1") /* code at 0x0170f2 ('darius2d') or 0x01705c ('drius2do') */
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -279,7 +279,7 @@ static INPUT_PORTS_START( darius2d )
TAITO_COINAGE_JAPAN_OLD_LOC(SW1)
/* 0x800002 -> 0x109e18 ($1e18,A5) and 0x109e1c ($1e1c,A5) */
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY_LOC(SW2)
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:3,4")
PORT_DIPSETTING( 0x0c, "every 700k" )
@@ -296,7 +296,7 @@ static INPUT_PORTS_START( darius2d )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -306,10 +306,10 @@ static INPUT_PORTS_START( darius2d )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
TAITO_JOY_DUAL_UDLR( 1, 2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/wc90.c b/src/mame/drivers/wc90.c
index def9cdda6e2..25e00b9470d 100644
--- a/src/mame/drivers/wc90.c
+++ b/src/mame/drivers/wc90.c
@@ -172,7 +172,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( wc90 )
- PORT_START /* IN0 bit 0-5 */
+ PORT_START("P1") /* IN0 bit 0-5 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -182,7 +182,7 @@ static INPUT_PORTS_START( wc90 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN1 bit 0-5 */
+ PORT_START("P2") /* IN1 bit 0-5 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -192,7 +192,7 @@ static INPUT_PORTS_START( wc90 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* DSWA */
+ PORT_START("DSW1") /* DSWA */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:8,7,6,5")
PORT_DIPSETTING( 0x00, "10 Coins/1 Credit" )
PORT_DIPSETTING( 0x08, DEF_STR( 9C_1C ) )
@@ -222,7 +222,7 @@ static INPUT_PORTS_START( wc90 )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* DSWB */
+ PORT_START("DSW2") /* DSWB */
PORT_DIPNAME( 0x03, 0x03, "1 Player Game Time" ) PORT_DIPLOCATION("SW2:8,7")
PORT_DIPSETTING( 0x01, "1:00" )
PORT_DIPSETTING( 0x02, "1:30" )
@@ -245,7 +245,7 @@ static INPUT_PORTS_START( wc90 )
PORT_DIPSETTING( 0x00, DEF_STR( English ) ) /* ON by default */
PORT_DIPSETTING( 0x80, DEF_STR( Japanese ) )
- PORT_START /* IN2 bit 0-3 */
+ PORT_START("SYSTEM") /* IN2 bit 0-3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
diff --git a/src/mame/drivers/wc90b.c b/src/mame/drivers/wc90b.c
index 083a81ba9e9..fb901ed36f9 100644
--- a/src/mame/drivers/wc90b.c
+++ b/src/mame/drivers/wc90b.c
@@ -208,7 +208,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( wc90b )
- PORT_START /* IN0 bit 0-5 */
+ PORT_START("P1") /* IN0 bit 0-5 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -218,7 +218,7 @@ static INPUT_PORTS_START( wc90b )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START /* IN1 bit 0-5 */
+ PORT_START("P2") /* IN1 bit 0-5 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -228,7 +228,7 @@ static INPUT_PORTS_START( wc90b )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START /* DSWA */
+ PORT_START("DSW1") /* DSWA */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, "10 Coins/1 Credit" )
PORT_DIPSETTING( 0x08, DEF_STR( 9C_1C ) )
@@ -258,7 +258,7 @@ static INPUT_PORTS_START( wc90b )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* DSWB */
+ PORT_START("DSW2") /* DSWB */
PORT_DIPNAME( 0x03, 0x03, "1 Player Game Time" )
PORT_DIPSETTING( 0x01, "1:00" )
PORT_DIPSETTING( 0x02, "1:30" )
diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c
index 45b9ffbd488..71ea86ed23a 100644
--- a/src/mame/drivers/wecleman.c
+++ b/src/mame/drivers/wecleman.c
@@ -799,7 +799,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( wecleman )
- PORT_START_TAG("IN0") /* IN0 - Controls and Coins - $140011.b */
+ PORT_START("IN0") /* IN0 - Controls and Coins - $140011.b */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_HIGH )
@@ -809,14 +809,14 @@ static INPUT_PORTS_START( wecleman )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Brake")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN1") /* IN1 - Motor? - $140013.b */
+ PORT_START("IN1") /* IN1 - Motor? - $140013.b */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE2 ) // right sw
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // left sw
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE4 ) // thermo
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) // from sound cpu ?
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA") /* IN2 - DSW A (Coinage) - $140015.b */
+ PORT_START("DSWA") /* IN2 - DSW A (Coinage) - $140015.b */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
@@ -851,7 +851,7 @@ static INPUT_PORTS_START( wecleman )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
- PORT_START_TAG("DSWB") /* IN3 - DSW B (options) - $140017.b */
+ PORT_START("DSWB") /* IN3 - DSW B (options) - $140017.b */
PORT_DIPNAME( 0x01, 0x01, "Speed Unit" )
PORT_DIPSETTING( 0x01, "km/h" )
PORT_DIPSETTING( 0x00, "mph" )
@@ -876,10 +876,10 @@ static INPUT_PORTS_START( wecleman )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("ACCEL") /* IN4 - Accelerator - $140021.b (0) */
+ PORT_START("ACCEL") /* IN4 - Accelerator - $140021.b (0) */
PORT_BIT( 0xff, 0, IPT_PEDAL ) PORT_MINMAX(0,0x80) PORT_SENSITIVITY(30) PORT_KEYDELTA(10)
- PORT_START_TAG("STEER") /* IN5 - Steering Wheel - $140021.b (2) */
+ PORT_START("STEER") /* IN5 - Steering Wheel - $140021.b (2) */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5)
INPUT_PORTS_END
@@ -889,7 +889,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( hotchase )
- PORT_START_TAG("IN0") /* IN0 - Controls and Coins - $140011.b */
+ PORT_START("IN0") /* IN0 - Controls and Coins - $140011.b */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
@@ -899,14 +899,14 @@ static INPUT_PORTS_START( hotchase )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Brake")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1") /* IN1 - Motor? - $140013.b */
+ PORT_START("IN1") /* IN1 - Motor? - $140013.b */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE2 ) // right sw
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // left sw
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE4 ) // thermo
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) // from sound cpu ?
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW2") /* IN2 - DSW 2 (options) - $140015.b */
+ PORT_START("DSW2") /* IN2 - DSW 2 (options) - $140015.b */
PORT_DIPNAME( 0x01, 0x01, "Speed Unit" )
PORT_DIPSETTING( 0x01, "KM" )
PORT_DIPSETTING( 0x00, "M.P.H." )
@@ -932,7 +932,7 @@ static INPUT_PORTS_START( hotchase )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* IN3 - DSW 1 (Coinage) - $140017.b */
+ PORT_START("DSW1") /* IN3 - DSW 1 (Coinage) - $140017.b */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
@@ -967,10 +967,10 @@ static INPUT_PORTS_START( hotchase )
PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ) )
PORT_DIPSETTING( 0x00, "1 Coin/99 Credits" )
- PORT_START_TAG("ACCEL") /* IN4 - Accelerator - $140021.b (0) */
+ PORT_START("ACCEL") /* IN4 - Accelerator - $140021.b (0) */
PORT_BIT( 0xff, 0, IPT_PEDAL ) PORT_MINMAX(0,0x80) PORT_SENSITIVITY(30) PORT_KEYDELTA(10)
- PORT_START_TAG("STEER") /* IN5 - Steering Wheel - $140021.b (2) */
+ PORT_START("STEER") /* IN5 - Steering Wheel - $140021.b (2) */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5)
INPUT_PORTS_END
diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c
index 3ca7a19300f..70646c667ed 100644
--- a/src/mame/drivers/welltris.c
+++ b/src/mame/drivers/welltris.c
@@ -404,7 +404,7 @@ static ADDRESS_MAP_START( sound_port_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( welltris )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -414,7 +414,7 @@ static INPUT_PORTS_START( welltris )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) /* Service (adds a coin) */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* pending sound command */
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -424,7 +424,7 @@ static INPUT_PORTS_START( welltris )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -437,7 +437,7 @@ static INPUT_PORTS_START( welltris )
#if WELLTRIS_4P_HACK
/* These can actually be read in the test mode even if they're not used by the game without patching the code
might be useful if a real 4 player version ever turns up if it was ever produced */
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -447,7 +447,7 @@ static INPUT_PORTS_START( welltris )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P4")
+ PORT_START("P4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(4)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4)
@@ -457,7 +457,7 @@ static INPUT_PORTS_START( welltris )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
#else
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -467,7 +467,7 @@ static INPUT_PORTS_START( welltris )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P4")
+ PORT_START("P4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -478,7 +478,7 @@ static INPUT_PORTS_START( welltris )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
#endif
- PORT_START_TAG("EXTRA")
+ PORT_START("EXTRA")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN4 )
#if WELLTRIS_4P_HACK
@@ -493,7 +493,7 @@ static INPUT_PORTS_START( welltris )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0006, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0007, DEF_STR( 4C_1C ) )
@@ -529,7 +529,7 @@ static INPUT_PORTS_START( welltris )
PORT_DIPSETTING( 0x00b0, DEF_STR( 1C_5C ) )
PORT_DIPSETTING( 0x00a0, DEF_STR( 1C_6C ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
@@ -564,7 +564,7 @@ static INPUT_PORTS_START( welltris )
INPUT_PORTS_END
static INPUT_PORTS_START( quiz18k )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
@@ -574,7 +574,7 @@ static INPUT_PORTS_START( quiz18k )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* pending sound command */
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -584,7 +584,7 @@ static INPUT_PORTS_START( quiz18k )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -594,16 +594,16 @@ static INPUT_PORTS_START( quiz18k )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P3")
+ PORT_START("P3")
PORT_BIT (0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P4")
+ PORT_START("P4")
PORT_BIT (0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("EXTRA")
+ PORT_START("EXTRA")
PORT_BIT (0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -629,7 +629,7 @@ static INPUT_PORTS_START( quiz18k )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) /* Flip Screen Not Currently Supported */
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c
index f5f6f94a17c..98020bed6db 100644
--- a/src/mame/drivers/wgp.c
+++ b/src/mame/drivers/wgp.c
@@ -709,7 +709,7 @@ ADDRESS_MAP_END
***********************************************************/
static INPUT_PORTS_START( wgp_joy_generic )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x01, 0x01, "Gear Shift" ) /* see notes */
PORT_DIPSETTING( 0x01, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x00, "Normal / Racing" )
@@ -728,7 +728,7 @@ static INPUT_PORTS_START( wgp_joy_generic )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
TAITO_DIFFICULTY
PORT_DIPNAME( 0x04, 0x04, "Shift Pattern Select" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -739,7 +739,7 @@ static INPUT_PORTS_START( wgp_joy_generic )
PORT_DIPUNUSED( 0x40, IP_ACTIVE_LOW ) /* see notes */
PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW ) /* see notes */
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) /* shift up - see notes */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) /* shift down - see notes */
@@ -749,7 +749,7 @@ static INPUT_PORTS_START( wgp_joy_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -759,7 +759,7 @@ static INPUT_PORTS_START( wgp_joy_generic )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) /* brake */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -799,14 +799,14 @@ static INPUT_PORTS_START( wgp_no_joy_generic )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG(STEER_PORT_TAG)
+ PORT_START(STEER_PORT_TAG)
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(25) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG(UNKNOWN_PORT_TAG)
+ PORT_START(UNKNOWN_PORT_TAG)
PORT_BIT( 0xff, 0x00, IPT_AD_STICK_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_PLAYER(2)
/* fake inputs, allowing digital steer etc. */
- PORT_START_TAG(FAKE_PORT_TAG)
+ PORT_START(FAKE_PORT_TAG)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1)
diff --git a/src/mame/drivers/wheelfir.c b/src/mame/drivers/wheelfir.c
index 8e846da3d66..ae5092e4959 100644
--- a/src/mame/drivers/wheelfir.c
+++ b/src/mame/drivers/wheelfir.c
@@ -406,7 +406,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( wheelfir )
- PORT_START_TAG("IN0") /* 16bit */
+ PORT_START("IN0") /* 16bit */
PORT_DIPNAME( 0x0001, 0x0001, "0" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -456,7 +456,7 @@ static INPUT_PORTS_START( wheelfir )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN1") /* 16bit */
+ PORT_START("IN1") /* 16bit */
PORT_DIPNAME( 0x0001, 0x0001, "1" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -506,7 +506,7 @@ static INPUT_PORTS_START( wheelfir )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("P1") /* 16bit */
+ PORT_START("P1") /* 16bit */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -526,7 +526,7 @@ static INPUT_PORTS_START( wheelfir )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P2") /* 16bit */
+ PORT_START("P2") /* 16bit */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/williams.c b/src/mame/drivers/williams.c
index 1b0e816cba7..483ee577a47 100644
--- a/src/mame/drivers/williams.c
+++ b/src/mame/drivers/williams.c
@@ -696,7 +696,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( defender )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Fire")
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Thrust")
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Smart Bomb")
@@ -706,11 +706,11 @@ static INPUT_PORTS_START( defender )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME(DEF_STR( Reverse ))
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN) PORT_2WAY
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_2WAY
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Auto Up") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Advance") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -723,7 +723,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mayday )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Fire")
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Mayday")
@@ -733,11 +733,11 @@ static INPUT_PORTS_START( mayday )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN) PORT_8WAY
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Auto Up") PORT_CODE(KEYCODE_F1) /* ? */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Advance") PORT_CODE(KEYCODE_F2) /* ? */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 )
@@ -750,7 +750,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( colony7 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
@@ -760,11 +760,11 @@ static INPUT_PORTS_START( colony7 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON3 )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ))
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "3")
@@ -787,7 +787,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( jin )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
@@ -797,7 +797,7 @@ static INPUT_PORTS_START( jin )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON2 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -823,7 +823,7 @@ static INPUT_PORTS_START( jin )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -850,7 +850,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( stargate )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Fire")
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Thrust")
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Smart Bomb")
@@ -860,12 +860,12 @@ static INPUT_PORTS_START( stargate )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME(DEF_STR( Reverse ))
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Inviso")
PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Auto Up") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Advance") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -878,7 +878,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( robotron )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_UP )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_LEFT )
@@ -888,12 +888,12 @@ static INPUT_PORTS_START( robotron )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_UP )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_DOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_LEFT )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_RIGHT )
PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Auto Up") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Advance") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -906,16 +906,16 @@ INPUT_PORTS_END
static INPUT_PORTS_START( joust )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(williams_mux_r, "INP2\0INP1")
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Auto Up") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Advance") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -925,13 +925,13 @@ static INPUT_PORTS_START( joust )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_TILT )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("INP2") /* muxed into IN0 */
+ PORT_START("INP2") /* muxed into IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("INP1") /* muxed into IN0 */
+ PORT_START("INP1") /* muxed into IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
@@ -940,7 +940,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( bubbles )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
@@ -949,10 +949,10 @@ static INPUT_PORTS_START( bubbles )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Auto Up") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Advance") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -965,16 +965,16 @@ INPUT_PORTS_END
static INPUT_PORTS_START( splat )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0xcf, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(williams_mux_r, "INP2\0INP1")
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(williams_mux_r, "INP2A\0INP1A")
PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Auto Up") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Advance") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -983,7 +983,7 @@ static INPUT_PORTS_START( splat )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_TILT )
- PORT_START_TAG("INP2") /* muxed into IN0 */
+ PORT_START("INP2") /* muxed into IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -993,7 +993,7 @@ static INPUT_PORTS_START( splat )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_DOWN ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("INP1") /* muxed into IN0 */
+ PORT_START("INP1") /* muxed into IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -1003,11 +1003,11 @@ static INPUT_PORTS_START( splat )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_DOWN ) PORT_8WAY PORT_PLAYER(1)
- PORT_START_TAG("INP2A") /* muxed into IN1 */
+ PORT_START("INP2A") /* muxed into IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_START_TAG("INP1A") /* muxed into IN1 */
+ PORT_START("INP1A") /* muxed into IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -1015,17 +1015,17 @@ INPUT_PORTS_END
static INPUT_PORTS_START( sinistar )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
/* pseudo analog joystick, see below */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Auto Up") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Advance") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -1035,26 +1035,26 @@ static INPUT_PORTS_START( sinistar )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_TILT )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("49WAYX") /* converted by williams_49way_port_0_r() */
+ PORT_START("49WAYX") /* converted by williams_49way_port_0_r() */
PORT_BIT( 0xff, 0x38, IPT_AD_STICK_X ) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START_TAG("49WAYY") /* converted by williams_49way_port_0_r() */
+ PORT_START("49WAYY") /* converted by williams_49way_port_0_r() */
PORT_BIT( 0xff, 0x38, IPT_AD_STICK_Y ) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE
INPUT_PORTS_END
static INPUT_PORTS_START( playball )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Auto Up") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Advance") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -1067,10 +1067,10 @@ INPUT_PORTS_END
static INPUT_PORTS_START( blaster )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
/* pseudo analog joystick, see below */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 )
@@ -1079,7 +1079,7 @@ static INPUT_PORTS_START( blaster )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Auto Up") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Advance") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -1089,23 +1089,23 @@ static INPUT_PORTS_START( blaster )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_TILT )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("49WAYX") /* converted by williams_49way_port_0_r() */
+ PORT_START("49WAYX") /* converted by williams_49way_port_0_r() */
PORT_BIT( 0xff, 0x38, IPT_AD_STICK_X ) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START_TAG("49WAYY") /* converted by williams_49way_port_0_r() */
+ PORT_START("49WAYY") /* converted by williams_49way_port_0_r() */
PORT_BIT( 0xff, 0x38, IPT_AD_STICK_Y ) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE
INPUT_PORTS_END
static INPUT_PORTS_START( blastkit )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
/* pseudo analog joystick, see below */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Auto Up") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Advance") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -1115,13 +1115,13 @@ static INPUT_PORTS_START( blastkit )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_TILT )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("49WAYX") /* converted by williams_49way_port_0_r() */
+ PORT_START("49WAYX") /* converted by williams_49way_port_0_r() */
PORT_BIT( 0xff, 0x38, IPT_AD_STICK_X ) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START_TAG("49WAYY") /* converted by williams_49way_port_0_r() */
+ PORT_START("49WAYY") /* converted by williams_49way_port_0_r() */
PORT_BIT( 0xff, 0x38, IPT_AD_STICK_Y ) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
@@ -1131,13 +1131,13 @@ INPUT_PORTS_END
static INPUT_PORTS_START( spdball )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Auto Up") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Advance") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -1147,7 +1147,7 @@ static INPUT_PORTS_START( spdball )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_TILT )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
@@ -1157,7 +1157,7 @@ static INPUT_PORTS_START( spdball )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN4")
+ PORT_START("IN4")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -1167,30 +1167,30 @@ static INPUT_PORTS_START( spdball )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
- PORT_START_TAG("AN0") /* analog */
+ PORT_START("AN0") /* analog */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("AN1") /* analog */
+ PORT_START("AN1") /* analog */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_PLAYER(1)
- PORT_START_TAG("AN2") /* analog */
+ PORT_START("AN2") /* analog */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_REVERSE PORT_PLAYER(2)
- PORT_START_TAG("AN3") /* analog */
+ PORT_START("AN3") /* analog */
PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_PLAYER(2)
INPUT_PORTS_END
static INPUT_PORTS_START( alienar )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0xcf, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(williams_mux_r, "INP2\0INP1")
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Auto Up") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Advance") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -1200,7 +1200,7 @@ static INPUT_PORTS_START( alienar )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_TILT )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("INP2") /* muxed into IN0 */
+ PORT_START("INP2") /* muxed into IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
@@ -1210,7 +1210,7 @@ static INPUT_PORTS_START( alienar )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_START_TAG("INP1") /* muxed into IN0 */
+ PORT_START("INP1") /* muxed into IN0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
@@ -1223,7 +1223,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( lottofun )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
@@ -1232,10 +1232,10 @@ static INPUT_PORTS_START( lottofun )
PORT_BIT( 0x60, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* Used by ticket dispenser */
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Memory Protect") PORT_CODE(KEYCODE_F1) PORT_TOGGLE
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Advance") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN2 )
@@ -1248,7 +1248,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mysticm )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
@@ -1258,10 +1258,10 @@ static INPUT_PORTS_START( mysticm )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Key */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Auto Up") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Advance") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("High Score Reset") PORT_CODE(KEYCODE_9)
@@ -1274,19 +1274,19 @@ INPUT_PORTS_END
static INPUT_PORTS_START( tshoot )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x3f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(williams_mux_r, "INP1X\0INP1Y")
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 )
PORT_BIT( 0x3C, IP_ACTIVE_HIGH, IPT_UNUSED ) /* 0011-1100 output */
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Auto Up") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Advance") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("High Score Reset") PORT_CODE(KEYCODE_9)
@@ -1296,26 +1296,26 @@ static INPUT_PORTS_START( tshoot )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_TILT )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("INP1X") /* muxed into IN0 */
+ PORT_START("INP1X") /* muxed into IN0 */
PORT_BIT( 0x3F, 0x20, IPT_AD_STICK_Y ) PORT_MINMAX(0,0x3F) PORT_SENSITIVITY(25) PORT_KEYDELTA(10)
- PORT_START_TAG("INP1Y") /* muxed into IN0 */
+ PORT_START("INP1Y") /* muxed into IN0 */
PORT_BIT( 0x3F, 0x20, IPT_AD_STICK_X ) PORT_MINMAX(0,0x3F) PORT_SENSITIVITY(25) PORT_KEYDELTA(10)
INPUT_PORTS_END
static INPUT_PORTS_START( inferno )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0xFF, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(williams_mux_r, "INP1\0INP2")
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x3C, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Auto Up") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Advance") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("High Score Reset") PORT_CODE(KEYCODE_9)
@@ -1325,7 +1325,7 @@ static INPUT_PORTS_START( inferno )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_TILT )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("INP1") /* muxed into IN0 */
+ PORT_START("INP1") /* muxed into IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_PLAYER(1)
@@ -1335,7 +1335,7 @@ static INPUT_PORTS_START( inferno )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_PLAYER(1)
- PORT_START_TAG("INP2") /* muxed into IN0 */
+ PORT_START("INP2") /* muxed into IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_PLAYER(2)
@@ -1348,16 +1348,16 @@ INPUT_PORTS_END
static INPUT_PORTS_START( joust2 )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(williams_mux_r, "INP1\0INP2")
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Auto Up") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Advance") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("High Score Reset") PORT_CODE(KEYCODE_9)
@@ -1367,13 +1367,13 @@ static INPUT_PORTS_START( joust2 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_TILT )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("INP1") /* muxed into IN0 */
+ PORT_START("INP1") /* muxed into IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("INP2") /* muxed into IN0 */
+ PORT_START("INP2") /* muxed into IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c
index 944c34bfdf3..561867f6ba2 100644
--- a/src/mame/drivers/wink.c
+++ b/src/mame/drivers/wink.c
@@ -137,10 +137,10 @@ static ADDRESS_MAP_START( wink_sound_io, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( wink )
- PORT_START_TAG("DIAL1")
+ PORT_START("DIAL1")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(3) PORT_REVERSE
- PORT_START_TAG("INPUTS1")
+ PORT_START("INPUTS1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) // right curve
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) // left curve
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
@@ -150,7 +150,7 @@ static INPUT_PORTS_START( wink )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) // slam
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -176,7 +176,7 @@ static INPUT_PORTS_START( wink )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, "2" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -202,7 +202,7 @@ static INPUT_PORTS_START( wink )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW3")
+ PORT_START("DSW3")
PORT_DIPNAME( 0x01, 0x01, "3" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -228,7 +228,7 @@ static INPUT_PORTS_START( wink )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW4")
+ PORT_START("DSW4")
PORT_DIPNAME( 0x01, 0x01, "Summary" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/wiping.c b/src/mame/drivers/wiping.c
index b91a23b3be5..ebc86385fb5 100644
--- a/src/mame/drivers/wiping.c
+++ b/src/mame/drivers/wiping.c
@@ -118,7 +118,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( wiping )
- PORT_START_TAG("P1") /* 0 */
+ PORT_START("P1") /* 0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -126,7 +126,7 @@ static INPUT_PORTS_START( wiping )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("P2") /* 1 */
+ PORT_START("P2") /* 1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -134,19 +134,19 @@ static INPUT_PORTS_START( wiping )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN2") /* 2 */
+ PORT_START("IN2") /* 2 */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN3") /* 3 */
+ PORT_START("IN3") /* 3 */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN4") /* 4 */
+ PORT_START("IN4") /* 4 */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN5") /* 5 */
+ PORT_START("IN5") /* 5 */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("SYSTEM") /* 6 */
+ PORT_START("SYSTEM") /* 6 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x05, IP_ACTIVE_LOW, IPT_COIN2 ) /* note that this changes two bits */
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START1 )
@@ -159,7 +159,7 @@ static INPUT_PORTS_START( wiping )
PORT_DIPSETTING( 0x00, "30000 70000" )
PORT_DIPSETTING( 0x80, "50000 150000" )
- PORT_START_TAG("DSW") /* 7 */
+ PORT_START("DSW") /* 7 */
PORT_DIPNAME( 0x07, 0x01, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
@@ -187,7 +187,7 @@ INPUT_PORTS_END
/* identical apart from bonus life */
static INPUT_PORTS_START( rugrats )
- PORT_START_TAG("P1") /* 0 */
+ PORT_START("P1") /* 0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
@@ -195,7 +195,7 @@ static INPUT_PORTS_START( rugrats )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("P2") /* 1 */
+ PORT_START("P2") /* 1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
@@ -203,19 +203,19 @@ static INPUT_PORTS_START( rugrats )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN2") /* 2 */
+ PORT_START("IN2") /* 2 */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN3") /* 3 */
+ PORT_START("IN3") /* 3 */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN4") /* 4 */
+ PORT_START("IN4") /* 4 */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN5") /* 5 */
+ PORT_START("IN5") /* 5 */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("SYSTEM") /* 6 */
+ PORT_START("SYSTEM") /* 6 */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x05, IP_ACTIVE_LOW, IPT_COIN2 ) /* note that this changes two bits */
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START1 )
@@ -228,7 +228,7 @@ static INPUT_PORTS_START( rugrats )
PORT_DIPSETTING( 0x00, "100000 200000" )
PORT_DIPSETTING( 0x80, "150000 300000" )
- PORT_START_TAG("DSW") /* 7 */
+ PORT_START("DSW") /* 7 */
PORT_DIPNAME( 0x07, 0x01, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c
index 636d56f62d0..3a39ef66c67 100644
--- a/src/mame/drivers/witch.c
+++ b/src/mame/drivers/witch.c
@@ -473,7 +473,7 @@ static ADDRESS_MAP_START( map_sub, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( witch )
- PORT_START_TAG("SERVICE") /* DSW */
+ PORT_START("SERVICE") /* DSW */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -494,7 +494,7 @@ static INPUT_PORTS_START( witch )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("A00E") /* DSW */
+ PORT_START("A00E") /* DSW */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_NAME("Key In")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Reset ?")
@@ -512,7 +512,7 @@ static INPUT_PORTS_START( witch )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("UNK") /* DSW ?*/
+ PORT_START("UNK") /* DSW ?*/
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -538,7 +538,7 @@ static INPUT_PORTS_START( witch )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("INPUTS") /* Inputs */
+ PORT_START("INPUTS") /* Inputs */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Left Flipper")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Big")
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Small")
@@ -554,7 +554,7 @@ F180 kkkbbppp ; Read onPORT 0xA005
bb = MAX BET | 20 ; 30 ; 40 ; 60
kkk = KEY IN | 1-10 ; 1-20 ; 1-40 ; 1-50 ; 1-100 ; 1-200 ; 1-250 ; 1-500
*/
- PORT_START_TAG("A005") /* DSW */
+ PORT_START("A005") /* DSW */
PORT_DIPNAME( 0x07, 0x07, "PAY OUT" )
PORT_DIPSETTING( 0x07, "60" )
PORT_DIPSETTING( 0x06, "65" )
@@ -583,7 +583,7 @@ F180 kkkbbppp ; Read onPORT 0xA005
d = DOUBLE UP | ON ; OFF
cccc = COIN IN1 | 1-1 ; 1-2 ; 1-3 ; 1-4 ; 1-5 ; 1-6 ; 1-7 ; 1-8 ; 1-9 ; 1-10 ; 1-15 ; 1-20 ; 1-25 ; 1-30 ; 1-40 ; 1-50
*/
- PORT_START_TAG("A004") /* DSW */
+ PORT_START("A004") /* DSW */
PORT_DIPNAME( 0x01, 0x00, "DOUBLE UP" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -612,7 +612,7 @@ F180 kkkbbppp ; Read onPORT 0xA005
tt = TIME | 40 ; 45 ; 50 ; 55
s = DEMO SOUND | ON ; OFF
*/
- PORT_START_TAG("YM_PortA") /* DSW */
+ PORT_START("YM_PortA") /* DSW */
PORT_DIPNAME( 0x0f, 0x0f, "COIN IN2" )
PORT_DIPSETTING( 0x0f, "1-1" )
PORT_DIPSETTING( 0x0e, "1-2" )
@@ -648,7 +648,7 @@ F180 kkkbbppp ; Read onPORT 0xA005
ll = GAME LIMIT | 500 ; 1000 ; 5000 ; 990000
h = HOPPER ACTIVE | LOW ; HIGH
*/
- PORT_START_TAG("YM_PortB") /* DSW */
+ PORT_START("YM_PortB") /* DSW */
PORT_DIPNAME( 0x01, 0x01, "AUTO BET" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c
index 12e83d7f324..b9ec756d784 100644
--- a/src/mame/drivers/wiz.c
+++ b/src/mame/drivers/wiz.c
@@ -272,7 +272,7 @@ ADDRESS_MAP_END
#define COMMON_IN01\
- PORT_START_TAG("IN0")\
+ PORT_START("IN0")\
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )\
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL\
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 )\
@@ -281,7 +281,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN2 )\
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 )\
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL\
- PORT_START_TAG("IN1")\
+ PORT_START("IN1")\
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY\
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY\
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL\
@@ -292,7 +292,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
#define COMMON_DSW0\
- PORT_START_TAG("DSW0")\
+ PORT_START("DSW0")\
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )\
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )\
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )\
@@ -320,7 +320,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( stinger )
COMMON_IN01
COMMON_DSW0
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, "Debug Mode" ) /* See notes */
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -350,7 +350,7 @@ static INPUT_PORTS_START( stinger2 )
COMMON_IN01
COMMON_DSW0
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, "Debug Mode" ) /* See notes */
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -380,7 +380,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( scion )
COMMON_IN01
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -404,7 +404,7 @@ COMMON_IN01
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x07, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
@@ -431,7 +431,7 @@ COMMON_IN01
INPUT_PORTS_END
static INPUT_PORTS_START( kungfut )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -441,7 +441,7 @@ static INPUT_PORTS_START( kungfut )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2)
@@ -451,7 +451,7 @@ static INPUT_PORTS_START( kungfut )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x07, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
@@ -476,7 +476,7 @@ static INPUT_PORTS_START( kungfut )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x00, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x01, DEF_STR( Hard ) )
@@ -502,7 +502,7 @@ static INPUT_PORTS_START( kungfut )
INPUT_PORTS_END
static INPUT_PORTS_START( wiz )
- PORT_START_TAG("IN1") //Are Buttons 1 and 2 the right way around? Because the majority of hardware
+ PORT_START("IN1") //Are Buttons 1 and 2 the right way around? Because the majority of hardware
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) // In this driver has 2 first, then 1 (See COMMON_IN01 macro)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 )
@@ -512,7 +512,7 @@ static INPUT_PORTS_START( wiz )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -522,7 +522,7 @@ static INPUT_PORTS_START( wiz )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x07, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
@@ -547,7 +547,7 @@ static INPUT_PORTS_START( wiz )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
diff --git a/src/mame/drivers/wldarrow.c b/src/mame/drivers/wldarrow.c
index abd622e6799..7722e77775d 100644
--- a/src/mame/drivers/wldarrow.c
+++ b/src/mame/drivers/wldarrow.c
@@ -183,7 +183,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( wldarrow )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_DIPNAME( 0x04, 0x00, "Monitor" )
@@ -205,7 +205,7 @@ static INPUT_PORTS_START( wldarrow )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("BITSW")
PORT_DIPNAME( 0x01, 0x00, "Bit Switch 1" ) PORT_DIPLOCATION("BITSWITCH:1") PORT_CODE(KEYCODE_1_PAD) PORT_TOGGLE
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -231,7 +231,7 @@ static INPUT_PORTS_START( wldarrow )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Stop Reel 3") /* Skill Stop only? */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Stop Reel 2") /* Skill Stop only? */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Stop Reel 1") /* Skill Stop only? */
@@ -247,14 +247,14 @@ static INPUT_PORTS_START( wldarrow )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED)
INPUT_PORTS_END
static INPUT_PORTS_START( mdrawpkr )
- PORT_START
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_DIPNAME( 0x04, 0x04, "0-2" )
@@ -276,7 +276,7 @@ static INPUT_PORTS_START( mdrawpkr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("BITSW")
PORT_DIPNAME( 0x01, 0x00, "Bit Switch 1" ) PORT_DIPLOCATION("BITSWITCH:1") PORT_CODE(KEYCODE_1_PAD) PORT_TOGGLE
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -302,7 +302,7 @@ static INPUT_PORTS_START( mdrawpkr )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN2")
PORT_DIPNAME( 0x01, 0x01, "2-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -328,7 +328,7 @@ static INPUT_PORTS_START( mdrawpkr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START("IN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED)
INPUT_PORTS_END
diff --git a/src/mame/drivers/wolfpack.c b/src/mame/drivers/wolfpack.c
index 37964696c41..6f196f847e7 100644
--- a/src/mame/drivers/wolfpack.c
+++ b/src/mame/drivers/wolfpack.c
@@ -178,7 +178,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( wolfpack )
- PORT_START_TAG("INPUTS")
+ PORT_START("INPUTS")
PORT_BIT ( 0x03, IP_ACTIVE_HIGH, IPT_UNUSED ) /* dial connects here */
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 )
@@ -187,7 +187,7 @@ static INPUT_PORTS_START( wolfpack )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
@@ -210,7 +210,7 @@ static INPUT_PORTS_START( wolfpack )
PORT_DIPSETTING( 0x80, "16000" )
PORT_DIPSETTING( 0xc0, "20000" )
- PORT_START_TAG("DIAL")
+ PORT_START("DIAL")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(5)
INPUT_PORTS_END
diff --git a/src/mame/drivers/wrally.c b/src/mame/drivers/wrally.c
index 25d3d596e43..318bebdb670 100644
--- a/src/mame/drivers/wrally.c
+++ b/src/mame/drivers/wrally.c
@@ -154,7 +154,7 @@ static const ds5002fp_config dallas_config =
};
static INPUT_PORTS_START( wrally )
-PORT_START /* DSW #1 & #2 */
+ PORT_START("DSW") /* DSW #1 & #2 */
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) )
@@ -199,7 +199,7 @@ PORT_START /* DSW #1 & #2 */
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
-PORT_START /* INPUTS, COINSW & STARTSW */
+ PORT_START("P1_P2") /* INPUTS, COINSW & STARTSW */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -217,11 +217,11 @@ PORT_START /* INPUTS, COINSW & STARTSW */
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
-PORT_START /* Wheel control */
+ PORT_START("WHEEL") /* Wheel control */
PORT_BIT( 0xff00, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_RIGHT) PORT_CODE_INC(KEYCODE_LEFT) PORT_REVERSE
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
-PORT_START /* INPUTS, TEST & SERVICE */
+ PORT_START("SYSTEM") /* INPUTS, TEST & SERVICE */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE2 ) /* Go to test mode NOW */
PORT_BIT( 0xfffc, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/wwfsstar.c b/src/mame/drivers/wwfsstar.c
index 11b600d26d5..88df0f1be43 100644
--- a/src/mame/drivers/wwfsstar.c
+++ b/src/mame/drivers/wwfsstar.c
@@ -291,7 +291,7 @@ static READ16_HANDLER( input_port_2_word_r_cust )
*******************************************************************************/
static INPUT_PORTS_START( wwfsstar )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
@@ -301,7 +301,7 @@ static INPUT_PORTS_START( wwfsstar )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Button A (1P VS CPU - Power Up)")
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
@@ -311,7 +311,7 @@ static INPUT_PORTS_START( wwfsstar )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_START3 ) PORT_NAME("Button C (1P/2P VS CPU)")
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 ) PORT_NAME("Button B (1P VS 2P - Buy-in)")
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* VBlank */
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -321,7 +321,7 @@ static INPUT_PORTS_START( wwfsstar )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW0") /* DSW0 */
+ PORT_START("DSW0") /* DSW0 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
@@ -347,7 +347,7 @@ static INPUT_PORTS_START( wwfsstar )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW1") /* DSW1 */
+ PORT_START("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
diff --git a/src/mame/drivers/wwfwfest.c b/src/mame/drivers/wwfwfest.c
index 2f8aefb9801..3d3e387bb20 100644
--- a/src/mame/drivers/wwfwfest.c
+++ b/src/mame/drivers/wwfwfest.c
@@ -193,7 +193,7 @@ static WRITE16_HANDLER ( wwfwfest_soundwrite )
*******************************************************************************/
static INPUT_PORTS_START( wwfwfest )
- PORT_START_TAG("P1") /* Player 1 */
+ PORT_START("P1") /* Player 1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
@@ -203,7 +203,7 @@ static INPUT_PORTS_START( wwfwfest )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2") /* Player 2 */
+ PORT_START("P2") /* Player 2 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
@@ -213,7 +213,7 @@ static INPUT_PORTS_START( wwfwfest )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("P3") /* Player 3 */
+ PORT_START("P3") /* Player 3 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(3)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(3)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3)
@@ -223,7 +223,7 @@ static INPUT_PORTS_START( wwfwfest )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START_TAG("P4") /* Player 4 */
+ PORT_START("P4") /* Player 4 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(4)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(4)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(4)
@@ -233,7 +233,7 @@ static INPUT_PORTS_START( wwfwfest )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START4 )
- PORT_START_TAG("SYSTEM") /* Misc 1 */
+ PORT_START("SYSTEM") /* Misc 1 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -243,7 +243,7 @@ static INPUT_PORTS_START( wwfwfest )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("VBLANK") /* Misc 2 */
+ PORT_START("VBLANK") /* Misc 2 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_VBLANK )
@@ -255,7 +255,7 @@ static INPUT_PORTS_START( wwfwfest )
/* Nb: There are actually 3 dips on the board, 2 * 8, and 1 *4 */
- PORT_START_TAG("DSW1") /* Dips 1 */
+ PORT_START("DSW1") /* Dips 1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
@@ -280,7 +280,7 @@ static INPUT_PORTS_START( wwfwfest )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW2") /* Dips 2 */
+ PORT_START("DSW2") /* Dips 2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
diff --git a/src/mame/drivers/xain.c b/src/mame/drivers/xain.c
index 5d8db675c27..a9735d43af1 100644
--- a/src/mame/drivers/xain.c
+++ b/src/mame/drivers/xain.c
@@ -323,7 +323,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( xsleena )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -333,7 +333,7 @@ static INPUT_PORTS_START( xsleena )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -343,7 +343,7 @@ static INPUT_PORTS_START( xsleena )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -367,7 +367,7 @@ static INPUT_PORTS_START( xsleena )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -389,7 +389,7 @@ static INPUT_PORTS_START( xsleena )
PORT_DIPSETTING( 0x40, "6")
PORT_DIPSETTING( 0x00, "Infinite (Cheat")
- PORT_START_TAG("VBLANK")
+ PORT_START("VBLANK")
PORT_BIT( 0x03, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* when 0, 68705 is ready to send data */
diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c
index 940b8a04920..ee9b4e5d012 100644
--- a/src/mame/drivers/xexex.c
+++ b/src/mame/drivers/xexex.c
@@ -406,7 +406,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( xexex )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -416,14 +416,14 @@ static INPUT_PORTS_START( xexex )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("EEPROM")
+ PORT_START("EEPROM")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM ready (always 1) */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_SERVICE_NO_TOGGLE( 0x08, IP_ACTIVE_LOW )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -433,7 +433,7 @@ static INPUT_PORTS_START( xexex )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c
index 3fc4abe2f93..37b110a7618 100644
--- a/src/mame/drivers/xmen.c
+++ b/src/mame/drivers/xmen.c
@@ -270,7 +270,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( xmen )
- PORT_START_TAG("P2_P4")
+ PORT_START("P2_P4")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -288,7 +288,7 @@ static INPUT_PORTS_START( xmen )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN4 )
- PORT_START_TAG("P1_P3")
+ PORT_START("P1_P3")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -306,7 +306,7 @@ static INPUT_PORTS_START( xmen )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN3 )
- PORT_START_TAG("EEPROM") /* COIN EEPROM and service */
+ PORT_START("EEPROM") /* COIN EEPROM and service */
PORT_BIT( 0x003f, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */
PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* EEPROM data */
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* EEPROM status - always 1 */
@@ -320,7 +320,7 @@ static INPUT_PORTS_START( xmen )
INPUT_PORTS_END
static INPUT_PORTS_START( xmen6p )
- PORT_START_TAG("P2_P4")
+ PORT_START("P2_P4")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -338,7 +338,7 @@ static INPUT_PORTS_START( xmen6p )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN4 )
- PORT_START_TAG("P1_P3")
+ PORT_START("P1_P3")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -356,7 +356,7 @@ static INPUT_PORTS_START( xmen6p )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN3 )
- PORT_START_TAG("EEPROM") /* COIN EEPROM and service */
+ PORT_START("EEPROM") /* COIN EEPROM and service */
PORT_BIT( 0x003f, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */
PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* EEPROM data */
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* EEPROM status - always 1 */
@@ -369,7 +369,7 @@ static INPUT_PORTS_START( xmen6p )
PORT_SERVICE_NO_TOGGLE( 0x4000, IP_ACTIVE_LOW )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* screen indicator? */
- PORT_START_TAG("P5_P6")
+ PORT_START("P5_P6")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(5)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(5)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(5)
@@ -389,7 +389,7 @@ static INPUT_PORTS_START( xmen6p )
INPUT_PORTS_END
static INPUT_PORTS_START( xmen2p )
- PORT_START_TAG("P2_P4")
+ PORT_START("P2_P4")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -400,7 +400,7 @@ static INPUT_PORTS_START( xmen2p )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("P1_P3")
+ PORT_START("P1_P3")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -411,7 +411,7 @@ static INPUT_PORTS_START( xmen2p )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("EEPROM") /* COIN EEPROM and service */
+ PORT_START("EEPROM") /* COIN EEPROM and service */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE2 )
PORT_BIT( 0x003c, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */
diff --git a/src/mame/drivers/xorworld.c b/src/mame/drivers/xorworld.c
index 82bcc8b6bd2..84b5dcd1740 100644
--- a/src/mame/drivers/xorworld.c
+++ b/src/mame/drivers/xorworld.c
@@ -118,7 +118,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( xorworld )
- PORT_START_TAG("DSW") // DSW0
+ PORT_START("DSW") // DSW0
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_2C ) )
@@ -139,7 +139,7 @@ static INPUT_PORTS_START( xorworld )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("P1") // IN0
+ PORT_START("P1") // IN0
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -149,7 +149,7 @@ static INPUT_PORTS_START( xorworld )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START_TAG("P2") // IN1
+ PORT_START("P2") // IN1
PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/xtheball.c b/src/mame/drivers/xtheball.c
index 2e001198a48..aa1d895350f 100644
--- a/src/mame/drivers/xtheball.c
+++ b/src/mame/drivers/xtheball.c
@@ -264,7 +264,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( xtheball )
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0700, 0x0000, "Target Tickets")
PORT_DIPSETTING( 0x0000, "3" )
@@ -295,34 +295,34 @@ static INPUT_PORTS_START( xtheball )
hit F2 to enter bookkeeping mode; hit service1 (9) to exit
hold service 1 (9) and hit F2 to enter test mode; hit service2 (0) to exit
*/
- PORT_START_TAG("COIN1")
+ PORT_START("COIN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
PORT_BIT( 0xfffe, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SERVICE2")
+ PORT_START("SERVICE2")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE2 )
PORT_BIT( 0xfffe, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("COIN3")
+ PORT_START("COIN3")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN3 )
PORT_BIT( 0xfffe, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("BUTTON1")
+ PORT_START("BUTTON1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xfffe, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SERVICE")
+ PORT_START("SERVICE")
PORT_SERVICE_NO_TOGGLE( 0x0001, IP_ACTIVE_HIGH )
PORT_BIT( 0xfffe, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SERVICE1")
+ PORT_START("SERVICE1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0xfffe, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("ANALOGX")
+ PORT_START("ANALOGX")
PORT_BIT( 0x00ff, 0x0000, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
- PORT_START_TAG("ANALOGY")
+ PORT_START("ANALOGY")
PORT_BIT( 0x00ff, 0x0000, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
INPUT_PORTS_END
diff --git a/src/mame/drivers/xxmissio.c b/src/mame/drivers/xxmissio.c
index ddabae0bc94..eb59dfd097b 100644
--- a/src/mame/drivers/xxmissio.c
+++ b/src/mame/drivers/xxmissio.c
@@ -155,7 +155,7 @@ ADDRESS_MAP_END
/****************************************************************************/
static INPUT_PORTS_START( xxmissio )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
@@ -165,7 +165,7 @@ static INPUT_PORTS_START( xxmissio )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
@@ -175,7 +175,7 @@ static INPUT_PORTS_START( xxmissio )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) )
@@ -198,7 +198,7 @@ static INPUT_PORTS_START( xxmissio )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW2")
+ PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x01, "2" )
PORT_DIPSETTING( 0x03, "3" )
@@ -222,7 +222,7 @@ static INPUT_PORTS_START( xxmissio )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
INPUT_PORTS_END
diff --git a/src/mame/drivers/xybots.c b/src/mame/drivers/xybots.c
index 48c44f751e9..762a4a04b12 100644
--- a/src/mame/drivers/xybots.c
+++ b/src/mame/drivers/xybots.c
@@ -112,7 +112,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( xybots )
- PORT_START_TAG("FFE100") /* ffe100 */
+ PORT_START("FFE100") /* ffe100 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("P2 Twist Right") PORT_CODE(KEYCODE_W) PORT_PLAYER(2)
@@ -130,7 +130,7 @@ static INPUT_PORTS_START( xybots )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
- PORT_START_TAG("FFE200") /* ffe200 */
+ PORT_START("FFE200") /* ffe200 */
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE( 0x0100, IP_ACTIVE_LOW )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNUSED ) /* /AUDBUSY */
diff --git a/src/mame/drivers/xyonix.c b/src/mame/drivers/xyonix.c
index 777683c8b17..e2bd8160f39 100644
--- a/src/mame/drivers/xyonix.c
+++ b/src/mame/drivers/xyonix.c
@@ -167,7 +167,7 @@ ADDRESS_MAP_END
/* Inputs Ports **************************************************************/
static INPUT_PORTS_START( xyonix )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -177,7 +177,7 @@ static INPUT_PORTS_START( xyonix )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) /* handled by xyonix_io_r() */
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
@@ -187,7 +187,7 @@ static INPUT_PORTS_START( xyonix )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) /* handled by xyonix_io_r() */
- PORT_START_TAG("DSW")
+ PORT_START("DSW")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
diff --git a/src/mame/drivers/yiear.c b/src/mame/drivers/yiear.c
index e8278a3ae52..0edf0aa7a02 100644
--- a/src/mame/drivers/yiear.c
+++ b/src/mame/drivers/yiear.c
@@ -111,7 +111,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( yiear )
- PORT_START /* IN0 */
+ PORT_START("SYSTEM") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -121,7 +121,7 @@ static INPUT_PORTS_START( yiear )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -131,7 +131,7 @@ static INPUT_PORTS_START( yiear )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN2 */
+ PORT_START("P2") /* IN2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -141,7 +141,7 @@ static INPUT_PORTS_START( yiear )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* DSW0 */
+ PORT_START("DSW1") /* DSW0 */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -163,7 +163,7 @@ static INPUT_PORTS_START( yiear )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW1 */
+ PORT_START("DSW2") /* DSW1 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -173,7 +173,7 @@ static INPUT_PORTS_START( yiear )
PORT_SERVICE( 0x04, IP_ACTIVE_LOW )
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* DSW2 */
+ PORT_START("DSW3") /* DSW2 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/yumefuda.c b/src/mame/drivers/yumefuda.c
index cd1a4251bdd..f05331ba8d8 100644
--- a/src/mame/drivers/yumefuda.c
+++ b/src/mame/drivers/yumefuda.c
@@ -254,7 +254,7 @@ MACHINE_DRIVER_END
/***************************************************************************************/
static INPUT_PORTS_START( yumefuda )
- PORT_START_TAG( "IN0")
+ PORT_START( "IN0")
PORT_DIPNAME( 0x01, 0x01, "Port 0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -276,7 +276,7 @@ static INPUT_PORTS_START( yumefuda )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG( "IN1")
+ PORT_START( "IN1")
PORT_DIPNAME( 0x01, 0x01, "Port 1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -298,7 +298,7 @@ static INPUT_PORTS_START( yumefuda )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG( "IN2")
+ PORT_START( "IN2")
PORT_DIPNAME( 0x01, 0x01, "Port 2" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -316,7 +316,7 @@ static INPUT_PORTS_START( yumefuda )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 )
- PORT_START_TAG( "IN3")
+ PORT_START( "IN3")
PORT_DIPNAME( 0x01, 0x01, "Port 3" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -338,7 +338,7 @@ static INPUT_PORTS_START( yumefuda )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG( "IN4")
+ PORT_START( "IN4")
PORT_DIPNAME( 0x01, 0x01, "Port 4" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -364,7 +364,7 @@ static INPUT_PORTS_START( yumefuda )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
/*
- PORT_START_TAG( "IN5")
+ PORT_START( "IN5")
PORT_DIPNAME( 0x01, 0x01, "Port 5" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -390,7 +390,7 @@ static INPUT_PORTS_START( yumefuda )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG( "IN6")
+ PORT_START( "IN6")
PORT_DIPNAME( 0x01, 0x01, "Port 6" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c
index 55caf67151c..61caeab9337 100644
--- a/src/mame/drivers/yunsun16.c
+++ b/src/mame/drivers/yunsun16.c
@@ -206,7 +206,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( magicbub )
- PORT_START_TAG("IN0") // $800000.w
+ PORT_START("IN0") // $800000.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -224,7 +224,7 @@ static INPUT_PORTS_START( magicbub )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") // $800019.b
+ PORT_START("IN1") // $800019.b
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -234,7 +234,7 @@ static INPUT_PORTS_START( magicbub )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") // $80001b.b -> $ff0003.b
+ PORT_START("DSW1") // $80001b.b -> $ff0003.b
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0004, DEF_STR( 2C_1C ) )
@@ -255,7 +255,7 @@ static INPUT_PORTS_START( magicbub )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_SERVICE( 0x0080, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW2") // $80001d.b -> $ff0004.b
+ PORT_START("DSW2") // $80001d.b -> $ff0004.b
PORT_DIPUNUSED( 0x0001, IP_ACTIVE_LOW )
PORT_DIPUNUSED( 0x0002, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x000c, 0x000c, "1P Vs 2P Rounds (Start)" )
@@ -291,7 +291,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( shocking )
- PORT_START_TAG("IN0") // $800000.w
+ PORT_START("IN0") // $800000.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -309,7 +309,7 @@ static INPUT_PORTS_START( shocking )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") // $800019.b
+ PORT_START("IN1") // $800019.b
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -319,7 +319,7 @@ static INPUT_PORTS_START( shocking )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") // $80001b.b -> $ff0c06.b
+ PORT_START("DSW1") // $80001b.b -> $ff0c06.b
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 2C_1C ) )
@@ -337,7 +337,7 @@ static INPUT_PORTS_START( shocking )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) /* "Korean" */
PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) /* "English" */
- PORT_START_TAG("DSW2") // $80001d.b -> $ff0c07.b
+ PORT_START("DSW2") // $80001d.b -> $ff0c07.b
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0004, DEF_STR( Easiest ) )
PORT_DIPSETTING( 0x0005, DEF_STR( Easier ) )
@@ -364,7 +364,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( bombkick )
- PORT_START_TAG("IN0") // $800000.w
+ PORT_START("IN0") // $800000.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -382,7 +382,7 @@ static INPUT_PORTS_START( bombkick )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") // $800019.b
+ PORT_START("IN1") // $800019.b
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -392,7 +392,7 @@ static INPUT_PORTS_START( bombkick )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") // $80001b.b -> $ff0004.b
+ PORT_START("DSW1") // $80001b.b -> $ff0004.b
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0004, DEF_STR( 2C_1C ) )
@@ -415,7 +415,7 @@ static INPUT_PORTS_START( bombkick )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_SERVICE( 0x0080, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW2") // $80001d.b -> $ff0005.b
+ PORT_START("DSW2") // $80001d.b -> $ff0005.b
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0000, "2" )
PORT_DIPSETTING( 0x0003, "3" )
@@ -446,7 +446,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( paprazzi )
- PORT_START_TAG("IN0") // $800000.w
+ PORT_START("IN0") // $800000.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
@@ -464,7 +464,7 @@ static INPUT_PORTS_START( paprazzi )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1") // $800019.b
+ PORT_START("IN1") // $800019.b
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -474,7 +474,7 @@ static INPUT_PORTS_START( paprazzi )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW1") // $80001b.b -> $ff0aca.b
+ PORT_START("DSW1") // $80001b.b -> $ff0aca.b
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) )
@@ -494,7 +494,7 @@ static INPUT_PORTS_START( paprazzi )
PORT_DIPSETTING( 0x0080, "120" )
PORT_DIPSETTING( 0x00c0, "150" )
- PORT_START_TAG("DSW2") // $80001d.b -> $ff0acb.b
+ PORT_START("DSW2") // $80001d.b -> $ff0acb.b
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Difficulty ) ) //not sure what is it . tested all 3 bits tested @ $be48
PORT_DIPSETTING( 0x0004, DEF_STR( Easiest ) )
PORT_DIPSETTING( 0x0005, DEF_STR( Easier ) )
diff --git a/src/mame/drivers/yunsung8.c b/src/mame/drivers/yunsung8.c
index f932585d12b..7be30ae736a 100644
--- a/src/mame/drivers/yunsung8.c
+++ b/src/mame/drivers/yunsung8.c
@@ -180,7 +180,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( magix )
- PORT_START // IN0 - Coins
+ PORT_START("SYSTEM") // IN0 - Coins
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -190,7 +190,7 @@ static INPUT_PORTS_START( magix )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START // IN1 - Player 1
+ PORT_START("P1") // IN1 - Player 1
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) // same as button1 !?
@@ -200,7 +200,7 @@ static INPUT_PORTS_START( magix )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_START // IN2 - Player 2
+ PORT_START("P2") // IN2 - Player 2
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) // same as button1 !?
@@ -210,7 +210,7 @@ static INPUT_PORTS_START( magix )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
- PORT_START // IN3 - DSW 1
+ PORT_START("DSW1") // IN3 - DSW 1
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x06, 0x06, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x00, DEF_STR( Easy ) )
@@ -233,7 +233,7 @@ static INPUT_PORTS_START( magix )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_4C ) )
- PORT_START // IN4 - DSW 2
+ PORT_START("DSW2") // IN4 - DSW 2
PORT_DIPNAME( 0x01, 0x01, "Title" )
PORT_DIPSETTING( 0x01, "Magix" )
PORT_DIPSETTING( 0x00, "Rock" )
@@ -268,7 +268,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( cannball )
- PORT_START // IN0 - Coins
+ PORT_START("SYSTEM") // IN0 - Coins
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -278,7 +278,7 @@ static INPUT_PORTS_START( cannball )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START // IN1 - Player 1
+ PORT_START("P1") // IN1 - Player 1
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
@@ -288,7 +288,7 @@ static INPUT_PORTS_START( cannball )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_START // IN2 - Player 2
+ PORT_START("P2") // IN2 - Player 2
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
@@ -298,7 +298,7 @@ static INPUT_PORTS_START( cannball )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
- PORT_START // IN3 - DSW 1
+ PORT_START("DSW1") // IN3 - DSW 1
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x06, 0x06, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x00, DEF_STR( Easy ) )
@@ -321,7 +321,7 @@ static INPUT_PORTS_START( cannball )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_4C ) )
- PORT_START // IN4 - DSW 2
+ PORT_START("DSW2") // IN4 - DSW 2
PORT_DIPNAME( 0x01, 0x01, "Unknown 2-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -354,7 +354,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( rocktris )
- PORT_START // IN0 - Coins
+ PORT_START("SYSTEM") // IN0 - Coins
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -364,7 +364,7 @@ static INPUT_PORTS_START( rocktris )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
- PORT_START // IN1 - Player 1
+ PORT_START("P1") // IN1 - Player 1
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) // same as button1 !?
@@ -374,7 +374,7 @@ static INPUT_PORTS_START( rocktris )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_START // IN2 - Player 2
+ PORT_START("P2") // IN2 - Player 2
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) // same as button1 !?
@@ -384,7 +384,7 @@ static INPUT_PORTS_START( rocktris )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
- PORT_START // IN3 - DSW 1
+ PORT_START("DSW1") // IN3 - DSW 1
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x06, 0x06, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x00, DEF_STR( Easy ) )
@@ -407,7 +407,7 @@ static INPUT_PORTS_START( rocktris )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_4C ) )
- PORT_START // IN4 - DSW 2
+ PORT_START("DSW2") // IN4 - DSW 2
PORT_DIPNAME( 0x01, 0x01, "Unknown 2-0" ) // the rest seems unused
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/zac2650.c b/src/mame/drivers/zac2650.c
index 9bb5a679647..9e0078a976a 100644
--- a/src/mame/drivers/zac2650.c
+++ b/src/mame/drivers/zac2650.c
@@ -41,7 +41,7 @@ static ADDRESS_MAP_START( port_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( tinvader )
- PORT_START_TAG("1E80")
+ PORT_START("1E80")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -51,7 +51,7 @@ static INPUT_PORTS_START( tinvader )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Missile-Background Collision */
- PORT_START_TAG("1E81")
+ PORT_START("1E81")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -74,7 +74,7 @@ static INPUT_PORTS_START( tinvader )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x40, DEF_STR( Yes ) )
- PORT_START_TAG("1E82")
+ PORT_START("1E82")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -84,13 +84,13 @@ static INPUT_PORTS_START( tinvader )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SENSE")
+ PORT_START("SENSE")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("1E85")
+ PORT_START("1E85")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("1E86")
+ PORT_START("1E86")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
@@ -106,7 +106,7 @@ static INPUT_PORTS_START( sinvader )
INPUT_PORTS_END
static INPUT_PORTS_START( dodgem )
- PORT_START_TAG("1E80")
+ PORT_START("1E80")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -116,7 +116,7 @@ static INPUT_PORTS_START( dodgem )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Missile-Background Collision */
- PORT_START_TAG("1E81")
+ PORT_START("1E81")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -142,7 +142,7 @@ static INPUT_PORTS_START( dodgem )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("1E82")
+ PORT_START("1E82")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -152,10 +152,10 @@ static INPUT_PORTS_START( dodgem )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("SENSE")
+ PORT_START("SENSE")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_START_TAG("1E85")
+ PORT_START("1E85")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x00, DEF_STR( Very_Easy) )
PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
@@ -180,7 +180,7 @@ static INPUT_PORTS_START( dodgem )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("1E86")
+ PORT_START("1E86")
PORT_DIPNAME( 0x01, 0x01, "Collision Detection (Cheat)" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c
index dd3600bbb93..94949bda41d 100644
--- a/src/mame/drivers/zaccaria.c
+++ b/src/mame/drivers/zaccaria.c
@@ -369,7 +369,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( monymony )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "3" )
@@ -394,7 +394,7 @@ static INPUT_PORTS_START( monymony )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x01, "200000" )
PORT_DIPSETTING( 0x02, "300000" )
@@ -417,7 +417,7 @@ static INPUT_PORTS_START( monymony )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_HIGH )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_1C ) )
@@ -442,7 +442,7 @@ static INPUT_PORTS_START( monymony )
PORT_DIPSETTING( 0x10, DEF_STR( 1C_5C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_7C ) )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -452,7 +452,7 @@ static INPUT_PORTS_START( monymony )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -462,14 +462,14 @@ static INPUT_PORTS_START( monymony )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
/* other bits are outputs */
- PORT_START_TAG("COINS")
+ PORT_START("COINS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
diff --git a/src/mame/drivers/zaxxon.c b/src/mame/drivers/zaxxon.c
index 2bb75cb7641..250208a5fa7 100644
--- a/src/mame/drivers/zaxxon.c
+++ b/src/mame/drivers/zaxxon.c
@@ -554,7 +554,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( zaxxon )
- PORT_START_TAG("SW00")
+ PORT_START("SW00")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
@@ -562,7 +562,7 @@ static INPUT_PORTS_START( zaxxon )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("SW01")
+ PORT_START("SW01")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
@@ -570,7 +570,7 @@ static INPUT_PORTS_START( zaxxon )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("SW100")
+ PORT_START("SW100")
PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START2 )
@@ -579,15 +579,15 @@ static INPUT_PORTS_START( zaxxon )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(zaxxon_coin_r, (void *)1)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(zaxxon_coin_r, (void *)2)
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED(zaxxon_coin_inserted, (void *)0)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_CHANGED(zaxxon_coin_inserted, (void *)1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED(zaxxon_coin_inserted, (void *)2)
- PORT_START_TAG("SERVICESW")
+ PORT_START("SERVICESW")
PORT_SERVICE_NO_TOGGLE( 0x01, IP_ACTIVE_HIGH ) PORT_CHANGED(service_switch, 0)
- PORT_START_TAG("DSW02")
+ PORT_START("DSW02")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:!1,!2")
PORT_DIPSETTING( 0x03, "10000" )
PORT_DIPSETTING( 0x01, "20000" )
@@ -611,7 +611,7 @@ static INPUT_PORTS_START( zaxxon )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW03")
+ PORT_START("DSW03")
PORT_DIPNAME( 0x0f, 0x03, DEF_STR ( Coin_B ) ) PORT_DIPLOCATION("SW2:!1,!2,!3,!4")
PORT_DIPSETTING( 0x0f, DEF_STR ( 4C_1C ) )
PORT_DIPSETTING( 0x07, DEF_STR ( 3C_1C ) )
@@ -735,48 +735,48 @@ INPUT_PORTS_END
static INPUT_PORTS_START( razmataz )
- PORT_START_TAG("SW00")
+ PORT_START("SW00")
PORT_BIT( 0xff, 0x00, IPT_SPECIAL) PORT_CUSTOM(razmataz_dial_r, (void *)0)
- PORT_START_TAG("DIAL0")
+ PORT_START("DIAL0")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15) PORT_RESET PORT_PLAYER(1)
- PORT_START_TAG("SW01")
+ PORT_START("SW01")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SW04")
+ PORT_START("SW04")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x1e, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("SW08")
+ PORT_START("SW08")
PORT_BIT( 0xff, 0x00, IPT_SPECIAL) PORT_CUSTOM(razmataz_dial_r, (void *)1)
- PORT_START_TAG("DIAL1")
+ PORT_START("DIAL1")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15) PORT_RESET PORT_PLAYER(2)
- PORT_START_TAG("SW0C")
+ PORT_START("SW0C")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x1e, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("SW100")
+ PORT_START("SW100")
PORT_BIT( 0x1f, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(zaxxon_coin_r, (void *)0)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(zaxxon_coin_r, (void *)1)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(zaxxon_coin_r, (void *)2)
- PORT_START_TAG("COIN")
+ PORT_START("COIN")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED(zaxxon_coin_inserted, (void *)0)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_CHANGED(zaxxon_coin_inserted, (void *)1)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED(zaxxon_coin_inserted, (void *)2)
- PORT_START_TAG("SERVICESW")
+ PORT_START("SERVICESW")
PORT_SERVICE_NO_TOGGLE( 0x01, IP_ACTIVE_HIGH )
- PORT_START_TAG("DSW02")
+ PORT_START("DSW02")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x00, "50000" )
PORT_DIPSETTING( 0x01, "100000" )
@@ -797,7 +797,7 @@ static INPUT_PORTS_START( razmataz )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW03")
+ PORT_START("DSW03")
PORT_DIPNAME( 0x07, 0x03, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x00, DEF_STR ( 4C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR ( 3C_1C ) )
diff --git a/src/mame/drivers/zerozone.c b/src/mame/drivers/zerozone.c
index 68e21821c90..6387636c5ac 100644
--- a/src/mame/drivers/zerozone.c
+++ b/src/mame/drivers/zerozone.c
@@ -86,7 +86,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( zerozone )
- PORT_START_TAG("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -96,7 +96,7 @@ static INPUT_PORTS_START( zerozone )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P1")
+ PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1)
@@ -106,7 +106,7 @@ static INPUT_PORTS_START( zerozone )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_NAME("P1 Score Line (Cheat)")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2")
+ PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2)
@@ -116,7 +116,7 @@ static INPUT_PORTS_START( zerozone )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("P2 Score Line (Cheat)")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSWA")
+ PORT_START("DSWA")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
@@ -138,7 +138,7 @@ static INPUT_PORTS_START( zerozone )
PORT_DIPUNUSED( 0x40, IP_ACTIVE_LOW )
PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSWB")
+ PORT_START("DSWB")
PORT_DIPUNUSED( 0x01, IP_ACTIVE_LOW )
PORT_DIPUNUSED( 0x02, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x04, 0x04, "Helps" )
diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c
index dc2212c0cc5..8c72867bfab 100644
--- a/src/mame/drivers/zn.c
+++ b/src/mame/drivers/zn.c
@@ -2842,7 +2842,7 @@ static MACHINE_DRIVER_START( coh1002ml )
MACHINE_DRIVER_END
static INPUT_PORTS_START( zn )
- PORT_START_TAG("P1") /* IN0 */
+ PORT_START("P1") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -2852,7 +2852,7 @@ static INPUT_PORTS_START( zn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("P2") /* IN1 */
+ PORT_START("P2") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -2862,35 +2862,35 @@ static INPUT_PORTS_START( zn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SERVICE") /* IN2 */
+ PORT_START("SERVICE") /* IN2 */
PORT_SERVICE_NO_TOGGLE( 0x01, IP_ACTIVE_LOW )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT )
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("SYSTEM") /* IN3 */
+ PORT_START("SYSTEM") /* IN3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0xcc, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("EXTRA1") /* IN4 */
+ PORT_START("EXTRA1") /* IN4 */
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON4 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON5 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON6 )
PORT_BIT( 0x8f, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("EXTRA2") /* IN5 */
+ PORT_START("EXTRA2") /* IN5 */
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(2)
PORT_BIT( 0x8f, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("UNK") /* IN6 */
+ PORT_START("UNK") /* IN6 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("DSW") /* IN7 */
+ PORT_START("DSW") /* IN7 */
PORT_DIPNAME( 0x01, 0x01, "Freeze" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/zodiack.c b/src/mame/drivers/zodiack.c
index 4367c948f84..8cf21a4bf2a 100644
--- a/src/mame/drivers/zodiack.c
+++ b/src/mame/drivers/zodiack.c
@@ -86,10 +86,10 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( zodiack )
- PORT_START_TAG("DSW0") /* never read in this game */
+ PORT_START("DSW0") /* never read in this game */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -114,7 +114,7 @@ static INPUT_PORTS_START( zodiack )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
@@ -124,7 +124,7 @@ static INPUT_PORTS_START( zodiack )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -136,7 +136,7 @@ static INPUT_PORTS_START( zodiack )
INPUT_PORTS_END
static INPUT_PORTS_START( dogfight )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coin_B ) )
PORT_DIPSETTING( 0x05, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x06, DEF_STR( 3C_2C ) )
@@ -162,7 +162,7 @@ static INPUT_PORTS_START( dogfight )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -187,7 +187,7 @@ static INPUT_PORTS_START( dogfight )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
@@ -197,7 +197,7 @@ static INPUT_PORTS_START( dogfight )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
@@ -209,10 +209,10 @@ static INPUT_PORTS_START( dogfight )
INPUT_PORTS_END
static INPUT_PORTS_START( moguchan )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -237,7 +237,7 @@ static INPUT_PORTS_START( moguchan )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -247,7 +247,7 @@ static INPUT_PORTS_START( moguchan )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -259,7 +259,7 @@ static INPUT_PORTS_START( moguchan )
INPUT_PORTS_END
static INPUT_PORTS_START( percuss )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -282,7 +282,7 @@ static INPUT_PORTS_START( percuss )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "4" )
PORT_DIPSETTING( 0x01, "5" )
@@ -306,7 +306,7 @@ static INPUT_PORTS_START( percuss )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -316,7 +316,7 @@ static INPUT_PORTS_START( percuss )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
@@ -328,7 +328,7 @@ static INPUT_PORTS_START( percuss )
INPUT_PORTS_END
static INPUT_PORTS_START( bounty )
- PORT_START_TAG("DSW0")
+ PORT_START("DSW0")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -352,7 +352,7 @@ static INPUT_PORTS_START( bounty )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW1")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -376,7 +376,7 @@ static INPUT_PORTS_START( bounty )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -386,7 +386,7 @@ static INPUT_PORTS_START( bounty )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c
index b5d42a3f70d..104683cfc52 100644
--- a/src/mame/drivers/zr107.c
+++ b/src/mame/drivers/zr107.c
@@ -585,7 +585,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( midnrun )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) // View switch
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) // Shift up
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) // Shift down
@@ -593,14 +593,14 @@ static INPUT_PORTS_START( midnrun )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Service Button") PORT_CODE(KEYCODE_8)
PORT_BIT( 0x0b, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x7f, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(adcdo_r, 0)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Service Button") PORT_CODE(KEYCODE_8)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -617,19 +617,19 @@ static INPUT_PORTS_START( midnrun )
PORT_DIPSETTING( 0x01, DEF_STR( Single ) )
PORT_DIPSETTING( 0x00, "Twin" )
- PORT_START_TAG("ANALOG1") // Steering wheel
+ PORT_START("ANALOG1") // Steering wheel
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
- PORT_START_TAG("ANALOG2") // Acceleration pedal
+ PORT_START("ANALOG2") // Acceleration pedal
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
- PORT_START_TAG("ANALOG3") // Brake pedal
+ PORT_START("ANALOG3") // Brake pedal
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
INPUT_PORTS_END
static INPUT_PORTS_START( windheat )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) // View switch
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) // Shift up
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) // Shift down
@@ -637,14 +637,14 @@ static INPUT_PORTS_START( windheat )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Service Button") PORT_CODE(KEYCODE_8)
PORT_BIT( 0x0b, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x7f, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(adcdo_r, 0)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Service Button") PORT_CODE(KEYCODE_8)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -661,19 +661,19 @@ static INPUT_PORTS_START( windheat )
PORT_DIPSETTING( 0x01, DEF_STR( Single ) )
PORT_DIPSETTING( 0x00, "Twin" )
- PORT_START_TAG("ANALOG1") // Steering wheel
+ PORT_START("ANALOG1") // Steering wheel
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5) PORT_REVERSE
- PORT_START_TAG("ANALOG2") // Acceleration pedal
+ PORT_START("ANALOG2") // Acceleration pedal
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
- PORT_START_TAG("ANALOG3") // Brake pedal
+ PORT_START("ANALOG3") // Brake pedal
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
INPUT_PORTS_END
static INPUT_PORTS_START( jetwave )
- PORT_START_TAG("IN0")
+ PORT_START("IN0")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 )
@@ -681,14 +681,14 @@ static INPUT_PORTS_START( jetwave )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Service Button") PORT_CODE(KEYCODE_8)
PORT_BIT( 0x0b, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START("IN1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN2")
+ PORT_START("IN2")
PORT_BIT( 0x7f, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(adcdo_r, 0)
- PORT_START_TAG("IN3")
+ PORT_START("IN3")
PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Service Button") PORT_CODE(KEYCODE_8)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -706,13 +706,13 @@ static INPUT_PORTS_START( jetwave )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("ANALOG1") // Steering wheel
+ PORT_START("ANALOG1") // Steering wheel
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5) PORT_REVERSE
- PORT_START_TAG("ANALOG2") // Acceleration pedal
+ PORT_START("ANALOG2") // Acceleration pedal
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
- PORT_START_TAG("ANALOG3") // Brake pedal
+ PORT_START("ANALOG3") // Brake pedal
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5)
INPUT_PORTS_END
diff --git a/src/mame/includes/megasys1.h b/src/mame/includes/megasys1.h
index fa045578545..760e41cedc3 100644
--- a/src/mame/includes/megasys1.h
+++ b/src/mame/includes/megasys1.h
@@ -24,7 +24,7 @@
/* IN0 - COINS */
#define COINS \
- PORT_START_TAG("IN0")\
+ PORT_START("IN0")\
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )\
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )\
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )\
diff --git a/src/mame/includes/mw8080bw.h b/src/mame/includes/mw8080bw.h
index 1665b2b5360..28b62bd758b 100644
--- a/src/mame/includes/mw8080bw.h
+++ b/src/mame/includes/mw8080bw.h
@@ -69,11 +69,11 @@ int invaders_is_cabinet_cocktail(running_machine *machine);
#define BLUESHRK_SPEAR_PORT_TAG ("SPEAR")
#define INVADERS_CONTROL_PORT_P1 \
- PORT_START_TAG(INVADERS_P1_CONTROL_PORT_TAG) \
+ PORT_START(INVADERS_P1_CONTROL_PORT_TAG) \
INVADERS_CONTROL_PORT_PLAYER(1)
#define INVADERS_CONTROL_PORT_P2 \
- PORT_START_TAG(INVADERS_P2_CONTROL_PORT_TAG) \
+ PORT_START(INVADERS_P2_CONTROL_PORT_TAG) \
INVADERS_CONTROL_PORT_PLAYER(2)
#define INVADERS_CONTROL_PORT_PLAYER(player) \
@@ -83,7 +83,7 @@ int invaders_is_cabinet_cocktail(running_machine *machine);
PORT_BIT( 0xf8, IP_ACTIVE_HIGH, IPT_UNUSED )
#define INVADERS_CAB_TYPE_PORT \
- PORT_START_TAG(INVADERS_CAB_TYPE_PORT_TAG) \
+ PORT_START(INVADERS_CAB_TYPE_PORT_TAG) \
PORT_CONFNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) \
PORT_CONFSETTING( 0x00, DEF_STR( Upright ) ) \
PORT_CONFSETTING( 0x01, DEF_STR( Cocktail ) )
diff --git a/src/mame/machine/nb1413m3.c b/src/mame/machine/nb1413m3.c
index d563e8c724c..d5c0e5ae94e 100644
--- a/src/mame/machine/nb1413m3.c
+++ b/src/mame/machine/nb1413m3.c
@@ -685,7 +685,7 @@ WRITE8_HANDLER( nb1413m3_vcrctrl_w )
/* Nichibutsu Mahjong games share a common control panel */
INPUT_PORTS_START( nbmjcontrols )
- PORT_START_TAG("KEY0") /* (3) PORT 1-1 */
+ PORT_START("KEY0") /* (3) PORT 1-1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_M )
@@ -695,7 +695,7 @@ INPUT_PORTS_START( nbmjcontrols )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY1") /* (4) PORT 1-2 */
+ PORT_START("KEY1") /* (4) PORT 1-2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_N )
@@ -705,7 +705,7 @@ INPUT_PORTS_START( nbmjcontrols )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY2") /* (5) PORT 1-3 */
+ PORT_START("KEY2") /* (5) PORT 1-3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
@@ -715,7 +715,7 @@ INPUT_PORTS_START( nbmjcontrols )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY3") /* (6) PORT 1-4 */
+ PORT_START("KEY3") /* (6) PORT 1-4 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
@@ -725,7 +725,7 @@ INPUT_PORTS_START( nbmjcontrols )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY4") /* (7) PORT 1-5 */
+ PORT_START("KEY4") /* (7) PORT 1-5 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
@@ -735,7 +735,7 @@ INPUT_PORTS_START( nbmjcontrols )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY5") /* (6) PORT 2-1 */
+ PORT_START("KEY5") /* (6) PORT 2-1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_M ) PORT_PLAYER(2)
@@ -745,7 +745,7 @@ INPUT_PORTS_START( nbmjcontrols )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY6") /* (7) PORT 2-2 */
+ PORT_START("KEY6") /* (7) PORT 2-2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_N ) PORT_PLAYER(2)
@@ -755,7 +755,7 @@ INPUT_PORTS_START( nbmjcontrols )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY7") /* (8) PORT 2-3 */
+ PORT_START("KEY7") /* (8) PORT 2-3 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) PORT_PLAYER(2)
@@ -765,7 +765,7 @@ INPUT_PORTS_START( nbmjcontrols )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY8") /* (9) PORT 2-4 */
+ PORT_START("KEY8") /* (9) PORT 2-4 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) PORT_PLAYER(2)
@@ -775,7 +775,7 @@ INPUT_PORTS_START( nbmjcontrols )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("KEY9") /* (10) PORT 2-5 */
+ PORT_START("KEY9") /* (10) PORT 2-5 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_BIG ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP ) PORT_PLAYER(2)
diff --git a/src/mame/machine/pckeybrd.c b/src/mame/machine/pckeybrd.c
index eb3e6c062f6..2ade8d5f323 100644
--- a/src/mame/machine/pckeybrd.c
+++ b/src/mame/machine/pckeybrd.c
@@ -1008,7 +1008,7 @@ static int at_keyboard_queue_chars(const unicode_char *text, size_t text_len)
***************************************************************************/
INPUT_PORTS_START( pc_keyboard )
- PORT_START_TAG("pc_keyboard_0")
+ PORT_START("pc_keyboard_0")
PORT_BIT ( 0x0001, 0x0000, IPT_UNUSED ) /* unused scancode 0 */
PORT_BIT( 0x0002, 0x0000, IPT_KEYBOARD) PORT_CODE(KEYCODE_ESC) PORT_CHAR(27) /* Esc 01 81 */
PORT_BIT( 0x0004, 0x0000, IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!') /* 1 02 82 */
@@ -1026,7 +1026,7 @@ INPUT_PORTS_START( pc_keyboard )
PORT_BIT( 0x4000, 0x0000, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8) /* Backspace 0E 8E */
PORT_BIT( 0x8000, 0x0000, IPT_KEYBOARD) PORT_CODE(KEYCODE_TAB) PORT_CHAR(9) /* Tab 0F 8F */
- PORT_START_TAG("pc_keyboard_1")
+ PORT_START("pc_keyboard_1")
PORT_BIT( 0x0001, 0x0000, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q') /* Q 10 90 */
PORT_BIT( 0x0002, 0x0000, IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('W') /* W 11 91 */
PORT_BIT( 0x0004, 0x0000, IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('E') /* E 12 92 */
@@ -1044,7 +1044,7 @@ INPUT_PORTS_START( pc_keyboard )
PORT_BIT( 0x4000, 0x0000, IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('A') /* A 1E 9E */
PORT_BIT( 0x8000, 0x0000, IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('S') /* S 1F 9F */
- PORT_START_TAG("pc_keyboard_2")
+ PORT_START("pc_keyboard_2")
PORT_BIT( 0x0001, 0x0000, IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('D') /* D 20 A0 */
PORT_BIT( 0x0002, 0x0000, IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('F') /* F 21 A1 */
PORT_BIT( 0x0004, 0x0000, IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('G') /* G 22 A2 */
@@ -1062,7 +1062,7 @@ INPUT_PORTS_START( pc_keyboard )
PORT_BIT( 0x4000, 0x0000, IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('C') /* C 2E AE */
PORT_BIT( 0x8000, 0x0000, IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('V') /* V 2F AF */
- PORT_START_TAG("pc_keyboard_3")
+ PORT_START("pc_keyboard_3")
PORT_BIT( 0x0001, 0x0000, IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('B') /* B 30 B0 */
PORT_BIT( 0x0002, 0x0000, IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('N') /* N 31 B1 */
PORT_BIT( 0x0004, 0x0000, IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('M') /* M 32 B2 */
@@ -1080,7 +1080,7 @@ INPUT_PORTS_START( pc_keyboard )
PORT_BIT( 0x4000, 0x0000, IPT_KEYBOARD) PORT_CODE(KEYCODE_F4) PORT_CHAR(UCHAR_MAMEKEY(F4)) /* F4 3E BE */
PORT_BIT( 0x8000, 0x0000, IPT_KEYBOARD) PORT_CODE(KEYCODE_F5) PORT_CHAR(UCHAR_MAMEKEY(F5)) /* F5 3F BF */
- PORT_START_TAG("pc_keyboard_4")
+ PORT_START("pc_keyboard_4")
PORT_BIT( 0x0001, 0x0000, IPT_KEYBOARD) PORT_CODE(KEYCODE_F6) PORT_CHAR(UCHAR_MAMEKEY(F6)) /* F6 40 C0 */
PORT_BIT( 0x0002, 0x0000, IPT_KEYBOARD) PORT_CODE(KEYCODE_F7) PORT_CHAR(UCHAR_MAMEKEY(F7)) /* F7 41 C1 */
PORT_BIT( 0x0004, 0x0000, IPT_KEYBOARD) PORT_CODE(KEYCODE_F8) PORT_CHAR(UCHAR_MAMEKEY(F8)) /* F8 42 C2 */
@@ -1098,7 +1098,7 @@ INPUT_PORTS_START( pc_keyboard )
PORT_BIT(0x4000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("KP +") PORT_CODE(KEYCODE_PLUS_PAD) /* Keypad + 4E CE */
PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("KP 1 (End)") PORT_CODE(KEYCODE_1_PAD) PORT_CODE(KEYCODE_END ) /* Keypad 1 (End) 4F CF */
- PORT_START_TAG("pc_keyboard_5")
+ PORT_START("pc_keyboard_5")
PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("KP 2 (Down)") PORT_CODE(KEYCODE_2_PAD) PORT_CODE(KEYCODE_DOWN ) /* Keypad 2 (Down arrow) 50 D0 */
PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("KP 3 (PgDn)") PORT_CODE(KEYCODE_3_PAD) PORT_CODE(KEYCODE_PGDN ) /* Keypad 3 (PgDn) 51 D1 */
PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("KP 0 (Ins)") PORT_CODE(KEYCODE_0_PAD) PORT_CODE(KEYCODE_INSERT ) /* Keypad 0 (Ins) 52 D2 */
@@ -1107,17 +1107,17 @@ INPUT_PORTS_START( pc_keyboard )
PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("(84/102)\\") PORT_CODE(KEYCODE_BACKSLASH2) /* Backslash 2 56 D6 */
PORT_BIT ( 0xff80, 0x0000, IPT_UNUSED )
- PORT_START_TAG("pc_keyboard_6")
+ PORT_START("pc_keyboard_6")
PORT_BIT ( 0xffff, 0x0000, IPT_UNUSED )
- PORT_START_TAG("pc_keyboard_7")
+ PORT_START("pc_keyboard_7")
PORT_BIT ( 0xffff, 0x0000, IPT_UNUSED )
INPUT_PORTS_END
INPUT_PORTS_START( at_keyboard )
- PORT_START_TAG("pc_keyboard_0")
+ PORT_START("pc_keyboard_0")
PORT_BIT ( 0x0001, 0x0000, IPT_UNUSED ) /* unused scancode 0 */
PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Esc") PORT_CODE(KEYCODE_ESC) /* Esc 01 81 */
PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("1 !") PORT_CODE(KEYCODE_1) /* 1 02 82 */
@@ -1135,7 +1135,7 @@ INPUT_PORTS_START( at_keyboard )
PORT_BIT(0x4000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("<--") PORT_CODE(KEYCODE_BACKSPACE) /* Backspace 0E 8E */
PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Tab") PORT_CODE(KEYCODE_TAB) /* Tab 0F 8F */
- PORT_START_TAG("pc_keyboard_1")
+ PORT_START("pc_keyboard_1")
PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Q") PORT_CODE(KEYCODE_Q) /* Q 10 90 */
PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("W") PORT_CODE(KEYCODE_W) /* W 11 91 */
PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("E") PORT_CODE(KEYCODE_E) /* E 12 92 */
@@ -1153,7 +1153,7 @@ INPUT_PORTS_START( at_keyboard )
PORT_BIT(0x4000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("A") PORT_CODE(KEYCODE_A) /* A 1E 9E */
PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("S") PORT_CODE(KEYCODE_S) /* S 1F 9F */
- PORT_START_TAG("pc_keyboard_2")
+ PORT_START("pc_keyboard_2")
PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("D") PORT_CODE(KEYCODE_D) /* D 20 A0 */
PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("F") PORT_CODE(KEYCODE_F) /* F 21 A1 */
PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("G") PORT_CODE(KEYCODE_G) /* G 22 A2 */
@@ -1171,7 +1171,7 @@ INPUT_PORTS_START( at_keyboard )
PORT_BIT(0x4000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("C") PORT_CODE(KEYCODE_C) /* C 2E AE */
PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("V") PORT_CODE(KEYCODE_V) /* V 2F AF */
- PORT_START_TAG("pc_keyboard_3")
+ PORT_START("pc_keyboard_3")
PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("B") PORT_CODE(KEYCODE_B) /* B 30 B0 */
PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("N") PORT_CODE(KEYCODE_N) /* N 31 B1 */
PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("M") PORT_CODE(KEYCODE_M) /* M 32 B2 */
@@ -1189,7 +1189,7 @@ INPUT_PORTS_START( at_keyboard )
PORT_BIT(0x4000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("F4") PORT_CODE(KEYCODE_F4) /* F4 3E BE */
PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("F5") PORT_CODE(KEYCODE_F5) /* F5 3F BF */
- PORT_START_TAG("pc_keyboard_4")
+ PORT_START("pc_keyboard_4")
PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("F6") PORT_CODE(KEYCODE_F6) /* F6 40 C0 */
PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("F7") PORT_CODE(KEYCODE_F7) /* F7 41 C1 */
PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("F8") PORT_CODE(KEYCODE_F8) /* F8 42 C2 */
@@ -1207,7 +1207,7 @@ INPUT_PORTS_START( at_keyboard )
PORT_BIT(0x4000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("KP +") PORT_CODE(KEYCODE_PLUS_PAD) /* Keypad + 4E CE */
PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("KP 1 (End)") PORT_CODE(KEYCODE_1_PAD ) /* Keypad 1 (End) 4F CF */
- PORT_START_TAG("pc_keyboard_5")
+ PORT_START("pc_keyboard_5")
PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("KP 2 (Down)") PORT_CODE(KEYCODE_2_PAD ) /* Keypad 2 (Down arrow) 50 D0 */
PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("KP 3 (PgDn)") PORT_CODE(KEYCODE_3_PAD ) /* Keypad 3 (PgDn) 51 D1 */
PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("KP 0 (Ins)") PORT_CODE(KEYCODE_0_PAD ) /* Keypad 0 (Ins) 52 D2 */
@@ -1218,7 +1218,7 @@ INPUT_PORTS_START( at_keyboard )
PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("(MF2)F12") PORT_CODE(KEYCODE_F12) /* F12 58 D8 */
PORT_BIT ( 0xfe00, 0x0000, IPT_UNUSED )
- PORT_START_TAG("pc_keyboard_6")
+ PORT_START("pc_keyboard_6")
PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("(MF2)KP Enter") PORT_CODE(KEYCODE_ENTER_PAD) /* PAD Enter 60 e0 */
PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("(MF2)Right Control") PORT_CODE(KEYCODE_RCONTROL) /* Right Control 61 e1 */
PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("(MF2)KP /") PORT_CODE(KEYCODE_SLASH_PAD) /* PAD Slash 62 e2 */
@@ -1236,7 +1236,7 @@ INPUT_PORTS_START( at_keyboard )
PORT_BIT(0x4000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("(MF2)Delete") PORT_CODE(KEYCODE_DEL) /* Delete 6f ef */
PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("(MF2)Pause") PORT_CODE(KEYCODE_PAUSE) /* Pause 65 e5 */
- PORT_START_TAG("pc_keyboard_7")
+ PORT_START("pc_keyboard_7")
PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Print Screen") PORT_CODE(KEYCODE_PRTSCR) /* Print Screen alternate 77 f7 */
PORT_BIT ( 0xfffe, 0x0000, IPT_UNUSED )
INPUT_PORTS_END