summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-06-26 15:13:34 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-06-26 15:13:34 +0000
commite5acd1aa3f36251770884c080f601024c1de6937 (patch)
tree7d3cc0e8096a0d472387f0bc681cee220bd283e1
parent01f5d8cb9346b04a93062e24b27f509e9fad660d (diff)
From: Fabio Priuli [mailto:doge.fabio@gmail.com]
Subject: more indexed reads removed Hi, attached please find a bunch of patches (against u6) to change input_port_read_indexed and AM_READ to their tagged counterparts. As in the case of the last patches I sent, I tested with mame_regtest the changes and no port is missing. In details: * midway.diff updates the whole mid*unit family of drivers + seattle & zeus which shared some input code. You may want to take a look at the fact that hyperdriv seems to have a redundant 9th analog port the driver never check (I added a comment about it in the source) * namco.diff updates most namco systems + a couple of old drivers sharing the input handling. Notice I haven't modified system22 which seems to have problems with the new strict checks and I guessed it could have changed since the last release (I'll take a look to it later) * patch1.diff -> patch9.diff update most of the M->Q drivers + finally removes indexed reads from megadriv.c (without breaking ssf2ghw) Let me know if something fails to apply. Regards, Fabio
-rw-r--r--src/mame/audio/mw8080bw.c4
-rw-r--r--src/mame/drivers/genesis.c4
-rw-r--r--src/mame/drivers/m72.c399
-rw-r--r--src/mame/drivers/m79amb.c13
-rw-r--r--src/mame/drivers/macrossp.c8
-rw-r--r--src/mame/drivers/magicfly.c10
-rw-r--r--src/mame/drivers/mainsnk.c36
-rw-r--r--src/mame/drivers/malzak.c20
-rw-r--r--src/mame/drivers/mappy.c2
-rw-r--r--src/mame/drivers/marinedt.c20
-rw-r--r--src/mame/drivers/marvins.c2
-rw-r--r--src/mame/drivers/maxaflex.c6
-rw-r--r--src/mame/drivers/mayumi.c113
-rw-r--r--src/mame/drivers/mazerbla.c45
-rw-r--r--src/mame/drivers/mcatadv.c6
-rw-r--r--src/mame/drivers/mcr68.c24
-rw-r--r--src/mame/drivers/mediagx.c9
-rw-r--r--src/mame/drivers/megadriv.c32
-rw-r--r--src/mame/drivers/megasys1.c18
-rw-r--r--src/mame/drivers/metlclsh.c26
-rw-r--r--src/mame/drivers/metro.c526
-rw-r--r--src/mame/drivers/mexico86.c28
-rw-r--r--src/mame/drivers/mgolf.c42
-rw-r--r--src/mame/drivers/mhavoc.c74
-rw-r--r--src/mame/drivers/micro3d.c70
-rw-r--r--src/mame/drivers/midas.c24
-rw-r--r--src/mame/drivers/midtunit.c40
-rw-r--r--src/mame/drivers/midvunit.c54
-rw-r--r--src/mame/drivers/midwunit.c40
-rw-r--r--src/mame/drivers/midxunit.c2
-rw-r--r--src/mame/drivers/midyunit.c115
-rw-r--r--src/mame/drivers/midzeus.c32
-rw-r--r--src/mame/drivers/missile.c42
-rw-r--r--src/mame/drivers/mitchell.c451
-rw-r--r--src/mame/drivers/mjkjidai.c47
-rw-r--r--src/mame/drivers/mjsister.c89
-rw-r--r--src/mame/drivers/model1.c11
-rw-r--r--src/mame/drivers/model2.c48
-rw-r--r--src/mame/drivers/model3.c137
-rw-r--r--src/mame/drivers/momoko.c8
-rw-r--r--src/mame/drivers/moo.c82
-rw-r--r--src/mame/drivers/mpu4.c7
-rw-r--r--src/mame/drivers/mrflea.c28
-rw-r--r--src/mame/drivers/ms32.c40
-rw-r--r--src/mame/drivers/msisaac.c14
-rw-r--r--src/mame/drivers/mugsmash.c54
-rw-r--r--src/mame/drivers/multigam.c18
-rw-r--r--src/mame/drivers/mystwarr.c80
-rw-r--r--src/mame/drivers/n8080.c60
-rw-r--r--src/mame/drivers/namcofl.c14
-rw-r--r--src/mame/drivers/namcona1.c71
-rw-r--r--src/mame/drivers/namconb1.c52
-rw-r--r--src/mame/drivers/namcos12.c52
-rw-r--r--src/mame/drivers/namcos2.c72
-rw-r--r--src/mame/drivers/naughtyb.c10
-rw-r--r--src/mame/drivers/nemesis.c286
-rw-r--r--src/mame/drivers/nitedrvr.c12
-rw-r--r--src/mame/drivers/nmk16.c516
-rw-r--r--src/mame/drivers/nova2001.c28
-rw-r--r--src/mame/drivers/nwk-tr.c26
-rw-r--r--src/mame/drivers/nycaptor.c300
-rw-r--r--src/mame/drivers/nyny.c10
-rw-r--r--src/mame/drivers/ojankohs.c269
-rw-r--r--src/mame/drivers/omegrace.c128
-rw-r--r--src/mame/drivers/oneshot.c38
-rw-r--r--src/mame/drivers/orbit.c20
-rw-r--r--src/mame/drivers/overdriv.c32
-rw-r--r--src/mame/drivers/pacland.c18
-rw-r--r--src/mame/drivers/pacman.c214
-rw-r--r--src/mame/drivers/paranoia.c2
-rw-r--r--src/mame/drivers/pgm.c85
-rw-r--r--src/mame/drivers/pirates.c8
-rw-r--r--src/mame/drivers/playch10.c12
-rw-r--r--src/mame/drivers/playmark.c84
-rw-r--r--src/mame/drivers/plygonet.c13
-rw-r--r--src/mame/drivers/pmpoker.c14
-rw-r--r--src/mame/drivers/pntnpuzl.c28
-rw-r--r--src/mame/drivers/polepos.c78
-rw-r--r--src/mame/drivers/policetr.c12
-rw-r--r--src/mame/drivers/polyplay.c8
-rw-r--r--src/mame/drivers/poolshrk.c23
-rw-r--r--src/mame/drivers/popeye.c40
-rw-r--r--src/mame/drivers/popper.c20
-rw-r--r--src/mame/drivers/powerbal.c20
-rw-r--r--src/mame/drivers/prehisle.c10
-rw-r--r--src/mame/drivers/progolf.c8
-rw-r--r--src/mame/drivers/psikyo.c94
-rw-r--r--src/mame/drivers/psikyo4.c322
-rw-r--r--src/mame/drivers/psikyosh.c20
-rw-r--r--src/mame/drivers/psychic5.c4
-rw-r--r--src/mame/drivers/punchout.c8
-rw-r--r--src/mame/drivers/qdrmfgp.c18
-rw-r--r--src/mame/drivers/qix.c74
-rw-r--r--src/mame/drivers/quantum.c18
-rw-r--r--src/mame/drivers/quasar.c26
-rw-r--r--src/mame/drivers/seattle.c133
-rw-r--r--src/mame/drivers/uapce.c6
-rw-r--r--src/mame/machine/mcr.c4
-rw-r--r--src/mame/machine/mexico86.c8
-rw-r--r--src/mame/machine/mhavoc.c10
-rw-r--r--src/mame/machine/midtunit.c4
-rw-r--r--src/mame/machine/midwayic.c8
-rw-r--r--src/mame/machine/midwunit.c14
-rw-r--r--src/mame/machine/midyunit.c16
-rw-r--r--src/mame/machine/namcoio.c2
-rw-r--r--src/mame/machine/namcos2.c58
-rw-r--r--src/mame/machine/nitedrvr.c12
-rw-r--r--src/mame/machine/pcecommn.c2
-rw-r--r--src/mame/machine/pgmprot.c10
-rw-r--r--src/mame/machine/playch10.c12
-rw-r--r--src/mame/machine/qix.c8
-rw-r--r--src/mame/video/m62.c2
-rw-r--r--src/mame/video/m72.c4
-rw-r--r--src/mame/video/momoko.c2
-rw-r--r--src/mame/video/n8080.c4
-rw-r--r--src/mame/video/namcofl.c16
-rw-r--r--src/mame/video/namconb1.c12
-rw-r--r--src/mame/video/naughtyb.c4
-rw-r--r--src/mame/video/nmk16.c24
-rw-r--r--src/mame/video/oneshot.c8
-rw-r--r--src/mame/video/orbit.c2
-rw-r--r--src/mame/video/polepos.c2
-rw-r--r--src/mame/video/policetr.c8
-rw-r--r--src/mame/video/prehisle.c10
-rw-r--r--src/mame/video/psikyo.c2
-rw-r--r--src/mame/video/psychic5.c10
126 files changed, 2965 insertions, 3729 deletions
diff --git a/src/mame/audio/mw8080bw.c b/src/mame/audio/mw8080bw.c
index d810abc929d..fdd1bc7caf4 100644
--- a/src/mame/audio/mw8080bw.c
+++ b/src/mame/audio/mw8080bw.c
@@ -570,7 +570,7 @@ MACHINE_DRIVER_END
void maze_write_discrete(running_machine *machine, UINT8 maze_tone_timing_state)
{
/* controls need to be active low */
- int controls = ~input_port_read_indexed(machine, 0) & 0xff;
+ int controls = ~input_port_read(machine, "IN0") & 0xff;
discrete_sound_w(machine, MAZE_TONE_TIMING, maze_tone_timing_state);
discrete_sound_w(machine, MAZE_P1_DATA, controls & 0x0f);
@@ -582,7 +582,7 @@ void maze_write_discrete(running_machine *machine, UINT8 maze_tone_timing_state)
/* A better option might be to update it at vblank or set a timer to do it. */
/* The only noticeable difference doing it here, is that the controls don't */
/* imediately start making tones if pressed right after the coin is inserted. */
- discrete_sound_w(machine, MAZE_COIN, (~input_port_read_indexed(machine, 1) >> 3) & 0x01);
+ discrete_sound_w(machine, MAZE_COIN, (~input_port_read(machine, "IN1") >> 3) & 0x01);
}
diff --git a/src/mame/drivers/genesis.c b/src/mame/drivers/genesis.c
index 6be3dd7c6e7..2d081a29b30 100644
--- a/src/mame/drivers/genesis.c
+++ b/src/mame/drivers/genesis.c
@@ -318,8 +318,8 @@ READ16_HANDLER ( megaplay_68k_to_z80_r )
if ((offset >= 0x2000) && (offset <= 0x3fff))
{
offset &=0x1fff;
-// if(offset == 0)
-// return (input_port_read_indexed(machine, 8) << 8) ^ 0xff00;
+// if(offset == 0) /* this read handler was used around MAME0.82 to read DSWB. Now it's (DSW0 & 0xff) */
+// return (input_port_read(machine, "DSW0") << 8) ^ 0xff00;
return (ic36_ram[offset] << 8) + ic36_ram[offset+1];
}
diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c
index 258dca5ee56..94acd5a6d9c 100644
--- a/src/mame/drivers/m72.c
+++ b/src/mame/drivers/m72.c
@@ -609,6 +609,7 @@ static WRITE16_HANDLER( soundram_w )
static READ16_HANDLER( poundfor_trackball_r )
{
static int prev[4],diff[4];
+ static const char *axisnames[] = { "TRACK0_X", "TRACK0_Y", "TRACK1_X", "TRACK1_Y" };
if (offset == 0)
{
@@ -616,7 +617,7 @@ static READ16_HANDLER( poundfor_trackball_r )
for (i = 0;i < 4;i++)
{
- curr = input_port_read_indexed(machine, 3+i);
+ curr = input_port_read(machine, axisnames[i]);
diff[i] = (curr - prev[i]);
prev[i] = curr;
}
@@ -628,7 +629,7 @@ static READ16_HANDLER( poundfor_trackball_r )
case 0:
return (diff[0] & 0xff) | ((diff[2] & 0xff) << 8);
case 1:
- return ((diff[0] >> 8) & 0x1f) | (diff[2] & 0x1f00) | (input_port_read_indexed(machine, 0) & 0xe0e0);
+ return ((diff[0] >> 8) & 0x1f) | (diff[2] & 0x1f00) | (input_port_read(machine, "IN0") & 0xe0e0);
case 2:
return (diff[1] & 0xff) | ((diff[3] & 0xff) << 8);
case 3:
@@ -739,9 +740,9 @@ AM_RANGE(0xb4000, 0xb4001) AM_WRITE(SMH_NOP) /* ??? */
ADDRESS_MAP_END
static ADDRESS_MAP_START( m72_portmap, ADDRESS_SPACE_IO, 16 )
- AM_RANGE(0x00, 0x01) AM_READ(input_port_0_word_r)
- AM_RANGE(0x02, 0x03) AM_READ(input_port_1_word_r)
- AM_RANGE(0x04, 0x05) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x00, 0x01) AM_READ_PORT("IN0")
+ AM_RANGE(0x02, 0x03) AM_READ_PORT("IN1")
+ AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW1")
AM_RANGE(0x00, 0x01) AM_WRITE(m72_sound_command_w)
AM_RANGE(0x02, 0x03) AM_WRITE(m72_port02_w) /* coin counters, reset sound cpu, other stuff? */
AM_RANGE(0x04, 0x05) AM_WRITE(m72_dmaon_w)
@@ -755,9 +756,9 @@ static ADDRESS_MAP_START( m72_portmap, ADDRESS_SPACE_IO, 16 )
ADDRESS_MAP_END
static ADDRESS_MAP_START( rtype2_portmap, ADDRESS_SPACE_IO, 16 )
- AM_RANGE(0x00, 0x01) AM_READ(input_port_0_word_r)
- AM_RANGE(0x02, 0x03) AM_READ(input_port_1_word_r)
- AM_RANGE(0x04, 0x05) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x00, 0x01) AM_READ_PORT("IN0")
+ AM_RANGE(0x02, 0x03) AM_READ_PORT("IN1")
+ AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW1")
AM_RANGE(0x00, 0x01) AM_WRITE(m72_sound_command_w)
AM_RANGE(0x02, 0x03) AM_WRITE(rtype2_port02_w)
AM_RANGE(0x40, 0x43) AM_WRITE(SMH_NOP) /* Interrupt controller, only written to at bootup */
@@ -768,8 +769,8 @@ static ADDRESS_MAP_START( rtype2_portmap, ADDRESS_SPACE_IO, 16 )
ADDRESS_MAP_END
static ADDRESS_MAP_START( poundfor_portmap, ADDRESS_SPACE_IO, 16 )
- AM_RANGE(0x02, 0x03) AM_READ(input_port_1_word_r)
- AM_RANGE(0x04, 0x05) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x02, 0x03) AM_READ_PORT("IN1")
+ AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW1")
AM_RANGE(0x08, 0x0f) AM_READ(poundfor_trackball_r)
AM_RANGE(0x00, 0x01) AM_WRITE(m72_sound_command_w)
AM_RANGE(0x02, 0x03) AM_WRITE(rtype2_port02_w)
@@ -781,9 +782,9 @@ static ADDRESS_MAP_START( poundfor_portmap, ADDRESS_SPACE_IO, 16 )
ADDRESS_MAP_END
static ADDRESS_MAP_START( majtitle_portmap, ADDRESS_SPACE_IO, 16 )
- AM_RANGE(0x00, 0x01) AM_READ(input_port_0_word_r)
- AM_RANGE(0x02, 0x03) AM_READ(input_port_1_word_r)
- AM_RANGE(0x04, 0x05) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x00, 0x01) AM_READ_PORT("IN0")
+ AM_RANGE(0x02, 0x03) AM_READ_PORT("IN1")
+ AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW1")
AM_RANGE(0x00, 0x01) AM_WRITE(m72_sound_command_w)
AM_RANGE(0x02, 0x03) AM_WRITE(rtype2_port02_w)
AM_RANGE(0x40, 0x43) AM_WRITE(SMH_NOP) /* Interrupt controller, only written to at bootup */
@@ -795,9 +796,9 @@ static ADDRESS_MAP_START( majtitle_portmap, ADDRESS_SPACE_IO, 16 )
ADDRESS_MAP_END
static ADDRESS_MAP_START( hharry_portmap, ADDRESS_SPACE_IO, 16 )
- AM_RANGE(0x00, 0x01) AM_READ(input_port_0_word_r)
- AM_RANGE(0x02, 0x03) AM_READ(input_port_1_word_r)
- AM_RANGE(0x04, 0x05) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x00, 0x01) AM_READ_PORT("IN0")
+ AM_RANGE(0x02, 0x03) AM_READ_PORT("IN1")
+ AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW1")
AM_RANGE(0x00, 0x01) AM_WRITE(m72_sound_command_w)
AM_RANGE(0x02, 0x03) AM_WRITE(rtype2_port02_w) /* coin counters, reset sound cpu, other stuff? */
AM_RANGE(0x04, 0x05) AM_WRITE(m72_dmaon_w)
@@ -810,9 +811,9 @@ static ADDRESS_MAP_START( hharry_portmap, ADDRESS_SPACE_IO, 16 )
ADDRESS_MAP_END
static ADDRESS_MAP_START( kengo_portmap, ADDRESS_SPACE_IO, 16 )
- AM_RANGE(0x00, 0x01) AM_READ(input_port_0_word_r)
- AM_RANGE(0x02, 0x03) AM_READ(input_port_1_word_r)
- AM_RANGE(0x04, 0x05) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x00, 0x01) AM_READ_PORT("IN0")
+ AM_RANGE(0x02, 0x03) AM_READ_PORT("IN1")
+ AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW1")
AM_RANGE(0x00, 0x01) AM_WRITE(m72_sound_command_w)
AM_RANGE(0x02, 0x03) AM_WRITE(rtype2_port02_w)
AM_RANGE(0x80, 0x81) AM_WRITE(m72_scrolly1_w)
@@ -907,9 +908,8 @@ ADDRESS_MAP_END
PORT_DIPSETTING( 0x0040, DEF_STR( 1C_5C ) ) \
PORT_DIPSETTING( 0x0000, DEF_STR( 1C_6C ) )
-
-static INPUT_PORTS_START( rtype )
- PORT_START
+static INPUT_PORTS_START( common )
+ PORT_START_TAG("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( rtype )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
- PORT_START
+ PORT_START_TAG("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 )
@@ -931,8 +931,12 @@ static INPUT_PORTS_START( rtype )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) /* sprite DMA complete */
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( rtype )
+ PORT_INCLUDE( common )
- PORT_START
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0002, "2" )
PORT_DIPSETTING( 0x0003, "3" )
@@ -975,95 +979,18 @@ INPUT_PORTS_END
/* identical but Demo Sounds is inverted */
static INPUT_PORTS_START( rtypep )
- PORT_START
- JOYSTICK_1
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON4 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 )
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON1 )
- JOYSTICK_2
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_COCKTAIL
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
+ PORT_INCLUDE( rtype )
- PORT_START
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE ) /* 0x20 is another test mode */
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) /* sprite DMA complete */
- PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START
- PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
- PORT_DIPSETTING( 0x0002, "2" )
- PORT_DIPSETTING( 0x0003, "3" )
- PORT_DIPSETTING( 0x0001, "4" )
- PORT_DIPSETTING( 0x0000, "5" )
+ PORT_MODIFY("DSW1")
PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0004, DEF_STR( On ) )
- PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Bonus_Life ) )
- PORT_DIPSETTING( 0x0000, "50K 150K 250K 400K 600K" )
- PORT_DIPSETTING( 0x0008, "100K 200K 350K 500K 700K" )
- /* Coin Mode 1 */
- COIN_MODE_1
- /* Coin Mode 2, not supported yet */
- // COIN_MODE_2
- PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Flip_Screen ) )
- PORT_DIPSETTING( 0x0100, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0200, 0x0000, DEF_STR( Cabinet ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( Upright ) )
- PORT_DIPSETTING( 0x0200, DEF_STR( Cocktail ) )
- PORT_DIPNAME( 0x0400, 0x0400, "Coin Mode" )
- PORT_DIPSETTING( 0x0400, "Mode 1" )
- PORT_DIPSETTING( 0x0000, "Mode 2" )
- PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Difficulty ) )
- PORT_DIPSETTING( 0x0800, DEF_STR( Normal ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( Hard ) )
- PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Allow_Continue ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( No ) )
- PORT_DIPSETTING( 0x1000, DEF_STR( Yes ) )
- /* In stop mode, press 2 to stop and 1 to restart */
- PORT_DIPNAME( 0x2000, 0x2000, "Stop Mode" )
- PORT_DIPSETTING( 0x2000, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x4000, 0x4000, "Invulnerability" )
- PORT_DIPSETTING( 0x4000, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_SERVICE( 0x8000, IP_ACTIVE_LOW )
INPUT_PORTS_END
static INPUT_PORTS_START( bchopper )
- PORT_START
- JOYSTICK_1
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON4 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 )
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON1 )
- JOYSTICK_2
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_COCKTAIL
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
-
- PORT_START
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE ) /* 0x20 is another test mode */
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) /* sprite DMA complete */
- PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_INCLUDE( common )
- PORT_START
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0000, "1" )
PORT_DIPSETTING( 0x0002, "2" )
@@ -1105,30 +1032,9 @@ static INPUT_PORTS_START( bchopper )
INPUT_PORTS_END
static INPUT_PORTS_START( nspirit )
- PORT_START
- JOYSTICK_1
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON4 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 )
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON1 )
- JOYSTICK_2
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_COCKTAIL
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
+ PORT_INCLUDE( common )
- PORT_START
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE ) /* 0x20 is another test mode */
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) /* sprite DMA complete */
- PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0002, "2" )
PORT_DIPSETTING( 0x0003, "3" )
@@ -1169,30 +1075,9 @@ static INPUT_PORTS_START( nspirit )
INPUT_PORTS_END
static INPUT_PORTS_START( imgfight )
- PORT_START
- JOYSTICK_1
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON4 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 )
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON1 )
- JOYSTICK_2
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_COCKTAIL
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
-
- PORT_START
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE ) /* 0x20 is another test mode */
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) /* sprite DMA complete */
- PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_INCLUDE( common )
- PORT_START
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0002, "2" )
PORT_DIPSETTING( 0x0003, "3" )
@@ -1231,30 +1116,9 @@ static INPUT_PORTS_START( imgfight )
INPUT_PORTS_END
static INPUT_PORTS_START( loht )
- PORT_START
- JOYSTICK_1
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON4 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 )
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON1 )
- JOYSTICK_2
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_COCKTAIL
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
-
- PORT_START
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE ) /* 0x20 is another test mode */
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) /* sprite DMA complete */
- PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_INCLUDE( common )
- PORT_START
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0000, "2" )
PORT_DIPSETTING( 0x0003, "3" )
@@ -1293,28 +1157,7 @@ static INPUT_PORTS_START( loht )
INPUT_PORTS_END
static INPUT_PORTS_START( xmultipl )
- PORT_START
- JOYSTICK_1
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON4 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 )
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON1 )
- JOYSTICK_2
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_COCKTAIL
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
-
- PORT_START
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE ) /* 0x20 is another test mode */
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) /* sprite DMA complete */
- PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_INCLUDE( common )
PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )
@@ -1356,30 +1199,9 @@ static INPUT_PORTS_START( xmultipl )
INPUT_PORTS_END
static INPUT_PORTS_START( dbreed )
- PORT_START
- JOYSTICK_1
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON4 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 )
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON1 )
- JOYSTICK_2
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_COCKTAIL
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
+ PORT_INCLUDE( common )
- PORT_START
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE ) /* 0x20 is another test mode */
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) /* sprite DMA complete */
- PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0002, "2" )
PORT_DIPSETTING( 0x0003, "3" )
@@ -1418,30 +1240,9 @@ static INPUT_PORTS_START( dbreed )
INPUT_PORTS_END
static INPUT_PORTS_START( rtype2 )
- PORT_START
- JOYSTICK_1
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON4 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 )
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON1 )
- JOYSTICK_2
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_COCKTAIL
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
-
- PORT_START
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE ) /* 0x0020 is another test mode */
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) /* sprite DMA complete */
- PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_INCLUDE( common )
- PORT_START
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0002, "2" )
PORT_DIPSETTING( 0x0003, "3" )
@@ -1478,30 +1279,9 @@ static INPUT_PORTS_START( rtype2 )
INPUT_PORTS_END
static INPUT_PORTS_START( hharry )
- PORT_START
- JOYSTICK_1
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON4 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 )
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON1 )
- JOYSTICK_2
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_COCKTAIL
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
-
- PORT_START
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE ) /* 0x0020 is another test mode */
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) /* sprite DMA complete */
- PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_INCLUDE( common )
- PORT_START
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0002, "2" )
PORT_DIPSETTING( 0x0003, "3" )
@@ -1555,7 +1335,7 @@ static INPUT_PORTS_START( hharry )
INPUT_PORTS_END
static INPUT_PORTS_START( poundfor )
- PORT_START
+ PORT_START_TAG("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)
@@ -1565,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
+ PORT_START_TAG("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 )
@@ -1576,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
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, "Round Time" )
PORT_DIPSETTING( 0x0002, "60" )
PORT_DIPSETTING( 0x0003, "90" )
@@ -1630,44 +1410,23 @@ static INPUT_PORTS_START( poundfor )
/* Coin Mode 2, not supported yet */
// COIN_MODE_2
- PORT_START
+ PORT_START_TAG("TRACK0_X")
PORT_BIT( 0xffff, 0x0000, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(30) PORT_PLAYER(1)
- PORT_START
+ PORT_START_TAG("TRACK0_Y")
PORT_BIT( 0xffff, 0x0000, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(30) PORT_REVERSE PORT_PLAYER(1)
- PORT_START
+ PORT_START_TAG("TRACK1_X")
PORT_BIT( 0xffff, 0x0000, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(30) PORT_REVERSE PORT_PLAYER(2)
- PORT_START
+ PORT_START_TAG("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_START
- JOYSTICK_1
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON4 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 )
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON1 )
- JOYSTICK_2
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_COCKTAIL
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
-
- PORT_START
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE ) /* 0x0020 is another test mode */
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) /* sprite DMA complete */
- PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_INCLUDE( common )
- PORT_START
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0002, "2" )
PORT_DIPSETTING( 0x0003, "3" )
@@ -1713,30 +1472,9 @@ static INPUT_PORTS_START( airduel )
INPUT_PORTS_END
static INPUT_PORTS_START( gallop )
- PORT_START
- JOYSTICK_1
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON4 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 )
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON1 )
- JOYSTICK_2
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_COCKTAIL
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
-
- PORT_START
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE ) /* 0x0020 is another test mode */
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) /* sprite DMA complete */
- PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_INCLUDE( common )
- PORT_START
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0002, "2" )
PORT_DIPSETTING( 0x0003, "3" )
@@ -1788,30 +1526,9 @@ static INPUT_PORTS_START( gallop )
INPUT_PORTS_END
static INPUT_PORTS_START( kengo )
- PORT_START
- JOYSTICK_1
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON4 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 )
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON1 )
- JOYSTICK_2
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_COCKTAIL
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
-
- PORT_START
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE ) /* 0x0020 is another test mode */
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) /* sprite DMA complete */
- PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_INCLUDE( common )
- PORT_START
+ PORT_START_TAG("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 ae401b87e8e..f047d9574fd 100644
--- a/src/mame/drivers/m79amb.c
+++ b/src/mame/drivers/m79amb.c
@@ -111,12 +111,12 @@ static const int ControllerTable[32] = {
static READ8_HANDLER( gray5bit_controller0_r )
{
- return (input_port_read_indexed(machine, 2) & 0xe0) | (~ControllerTable[input_port_read_indexed(machine, 2) & 0x1f] & 0x1f);
+ return (input_port_read(machine, "8004") & 0xe0) | (~ControllerTable[input_port_read(machine, "8004") & 0x1f] & 0x1f);
}
static READ8_HANDLER( gray5bit_controller1_r )
{
- return (input_port_read_indexed(machine, 3) & 0xe0) | (~ControllerTable[input_port_read_indexed(machine, 3) & 0x1f] & 0x1f);
+ return (input_port_read(machine, "8005") & 0xe0) | (~ControllerTable[input_port_read(machine, "8005") & 0x1f] & 0x1f);
}
static WRITE8_HANDLER( sound_w )
@@ -140,7 +140,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( m79amb )
- PORT_START /* 8000 */
+ PORT_START_TAG("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 /* 8002 */
+ PORT_START_TAG("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,18 +160,17 @@ static INPUT_PORTS_START( m79amb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 8004 */
+ PORT_START_TAG("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 /* 8005 */
+ PORT_START_TAG("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 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
INPUT_PORTS_END
diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c
index 8856a20a9f7..38c8311de9c 100644
--- a/src/mame/drivers/macrossp.c
+++ b/src/mame/drivers/macrossp.c
@@ -235,12 +235,12 @@ VIDEO_EOF(macrossp);
static READ32_HANDLER ( macrossp_ports1_r )
{
- return ((input_port_read_indexed(machine, 0) << 16) | (input_port_read_indexed(machine, 1) << 0));
+ return ((input_port_read(machine, "IN0") << 16) | (input_port_read(machine, "KEYS") << 0));
}
static READ32_HANDLER ( macrossp_ports2_r )
{
- return ((input_port_read_indexed(machine, 2) << 16) | (input_port_read_indexed(machine, 3) << 0));
+ return ((input_port_read(machine, "DSW") << 16) | (input_port_read(machine, "UNK") << 0));
}
static WRITE32_HANDLER( paletteram32_macrossp_w )
@@ -369,7 +369,7 @@ ADDRESS_MAP_END
/*** INPUT PORTS *************************************************************/
static INPUT_PORTS_START( macrossp )
- PORT_START
+ 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)
@@ -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
+ PORT_START_TAG("UNK")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED ) /* Unknown use, but not dipswitches */
INPUT_PORTS_END
diff --git a/src/mame/drivers/magicfly.c b/src/mame/drivers/magicfly.c
index 19175aa7c26..2da59636a0a 100644
--- a/src/mame/drivers/magicfly.c
+++ b/src/mame/drivers/magicfly.c
@@ -444,11 +444,11 @@ static READ8_HANDLER( mux_port_r )
{
switch( mux_data & 0x0f ) /* bits 0-3 */
{
- case 0x01: return input_port_read_indexed(machine, 0);
- case 0x02: return input_port_read_indexed(machine, 1);
- case 0x04: return input_port_read_indexed(machine, 2);
- case 0x08: return input_port_read_indexed(machine, 3);
- case 0x00: return input_port_read_indexed(machine, 4);
+ case 0x01: return input_port_read(machine, "IN0-0");
+ case 0x02: return input_port_read(machine, "IN0-1");
+ case 0x04: return input_port_read(machine, "IN0-2");
+ case 0x08: return input_port_read(machine, "IN0-3");
+ case 0x00: return input_port_read(machine, "DSW0");
}
return 0xff;
}
diff --git a/src/mame/drivers/mainsnk.c b/src/mame/drivers/mainsnk.c
index 7903f7cba22..9bed8289cbe 100644
--- a/src/mame/drivers/mainsnk.c
+++ b/src/mame/drivers/mainsnk.c
@@ -114,7 +114,7 @@ static READ8_HANDLER( sound_ack_r )
static READ8_HANDLER( mainsnk_port_0_r )
{
- int result = input_port_read_indexed( machine, 0 );
+ int result = input_port_read( machine, "IN0");
if( !sound_cpu_ready ) result |= 0x20;
return result;
}
@@ -122,11 +122,11 @@ static READ8_HANDLER( mainsnk_port_0_r )
static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READ(mainsnk_port_0_r)
- AM_RANGE(0xc100, 0xc100) AM_READ(input_port_1_r)
- AM_RANGE(0xc200, 0xc200) AM_READ(input_port_2_r)
- AM_RANGE(0xc300, 0xc300) AM_READ(input_port_3_r)
- AM_RANGE(0xc400, 0xc400) AM_READ(input_port_5_r)
- AM_RANGE(0xc500, 0xc500) AM_READ(input_port_4_r)
+ AM_RANGE(0xc100, 0xc100) AM_READ_PORT("IN1")
+ AM_RANGE(0xc200, 0xc200) AM_READ_PORT("IN2")
+ AM_RANGE(0xc300, 0xc300) AM_READ_PORT("IN3")
+ AM_RANGE(0xc400, 0xc400) AM_READ_PORT("IN5")
+ AM_RANGE(0xc500, 0xc500) AM_READ_PORT("IN4")
AM_RANGE(0xc600, 0xc600) AM_WRITE(mainsnk_c600_w)
AM_RANGE(0xc700, 0xc700) AM_WRITE(sound_command_w)
AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE(mainsnk_bgram_w) AM_BASE(&mainsnk_bgram)
@@ -154,7 +154,7 @@ static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( mainsnk )
- PORT_START
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("IN3")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) /* ?? */
- PORT_START
+ PORT_START_TAG("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 ) )
@@ -200,10 +200,12 @@ static INPUT_PORTS_START( mainsnk )
PORT_DIPNAME( 0x80, 0x00, "SW 2-7" )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+
+ PORT_START_TAG("IN5")
INPUT_PORTS_END
static INPUT_PORTS_START( canvas )
- PORT_START
+ PORT_START_TAG("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 )
@@ -212,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
+ PORT_START_TAG("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 )
@@ -226,7 +228,7 @@ static INPUT_PORTS_START( canvas )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* 8bit */
+ PORT_START_TAG("IN2") /* 8bit */
PORT_DIPNAME( 0x01, 0x01, "2" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -252,7 +254,7 @@ static INPUT_PORTS_START( canvas )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* 8bit */
+ PORT_START_TAG("IN3") /* 8bit */
PORT_DIPNAME( 0x01, 0x01, "3" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -278,7 +280,7 @@ static INPUT_PORTS_START( canvas )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* 8bit */
+ PORT_START_TAG("IN4") /* 8bit */
PORT_DIPNAME( 0x01, 0x01, "4" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -304,7 +306,7 @@ static INPUT_PORTS_START( canvas )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* 8bit */
+ PORT_START_TAG("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 3ca20aeb35d..2e701bbab30 100644
--- a/src/mame/drivers/malzak.c
+++ b/src/mame/drivers/malzak.c
@@ -75,7 +75,7 @@ static READ8_HANDLER( s2636_portA_r )
// POT switch position, read from port A of the first S2636
// Not sure of the correct values to return, but these should
// do based on the game code.
- switch(input_port_read_indexed(machine, 1))
+ switch(input_port_read(machine, "POT"))
{
case 0: // Normal play
return 0xf0;
@@ -179,11 +179,11 @@ static ADDRESS_MAP_START( malzak_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ(collision_r) // returns where a collision can occur.
AM_RANGE(0x40, 0x40) AM_WRITE(port40_w) // possibly sound codes for dual SN76477s
AM_RANGE(0x60, 0x60) AM_WRITE(port60_w) // possibly playfield scroll X offset
- AM_RANGE(0x80, 0x80) AM_READ(input_port_0_r) //controls
+ AM_RANGE(0x80, 0x80) AM_READ_PORT("IN0") //controls
AM_RANGE(0xa0, 0xa0) AM_WRITE(SMH_NOP) // echoes I/O port read from port 0x80
AM_RANGE(0xc0, 0xc0) AM_WRITE(portc0_w) // possibly playfield row selection for writing and/or collisions
AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ(s2650_data_r) // read upon death
- AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ(input_port_2_r)
+ AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("SENSE")
ADDRESS_MAP_END
@@ -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 /* I/O port 0x80 */
+ PORT_START_TAG("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
- // No POT switch on Malzak as far as I know
+ PORT_START_TAG("POT")
+ /* No POT switch on Malzak as far as I know */
- PORT_START /* SENSE */
+ PORT_START_TAG("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 /* I/O port 0x80 */
+ PORT_START_TAG("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 // Fake DIP switch to handle the POT switch.
+ PORT_START_TAG("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 /* SENSE */
+ PORT_START_TAG("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 d47ff25c273..07aa646b3f4 100644
--- a/src/mame/drivers/mappy.c
+++ b/src/mame/drivers/mappy.c
@@ -614,7 +614,7 @@ static READ8_HANDLER( dipB_mux ) { return input_port_read(machine, "DSW2") >> (4
static READ8_HANDLER( dipB_muxi ) // dips B
{
// bits are interleaved in Phozon
- return BITSWAP8(input_port_read_indexed(machine, 4),6,4,2,0,7,5,3,1) >> (4*mux);
+ return BITSWAP8(input_port_read(machine, "DSW2"),6,4,2,0,7,5,3,1) >> (4*mux);
}
static WRITE8_HANDLER( out_mux ) { mux = data & 1; }
static WRITE8_HANDLER( out_lamps )
diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c
index f1d69c5c2b0..cb02ede11ef 100644
--- a/src/mame/drivers/marinedt.c
+++ b/src/mame/drivers/marinedt.c
@@ -133,7 +133,7 @@ static READ8_HANDLER( marinedt_port1_r )
//might need to be reversed for cocktail stuff
/* x/y multiplexed */
- return input_port_read_indexed(machine, 3 + ((marinedt_pf&0x08)>>3));
+ return input_port_read(machine, ((marinedt_pf & 0x08)>>3) ? "TRACKY" : "TRACKX");
}
static READ8_HANDLER( marinedt_coll_r )
@@ -188,11 +188,11 @@ static READ8_HANDLER( marinedt_obj1_yq_r )
static ADDRESS_MAP_START( marinedt_readport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READ(input_port_0_r) //dips coinage
- AM_RANGE(0x01, 0x01) AM_READ(marinedt_port1_r) //trackball xy muxed
+ AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW0") //dips coinage
+ AM_RANGE(0x01, 0x01) AM_READ(marinedt_port1_r) //trackball xy muxed
AM_RANGE(0x02, 0x02) AM_READ(marinedt_obj1_x_r)
- AM_RANGE(0x03, 0x03) AM_READ(input_port_1_r) //buttons
- AM_RANGE(0x04, 0x04) AM_READ(input_port_2_r) //dips
+ AM_RANGE(0x03, 0x03) AM_READ_PORT("IN0") //buttons
+ AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW1") //dips
AM_RANGE(0x06, 0x06) AM_READ(marinedt_obj1_yr_r)
AM_RANGE(0x0a, 0x0a) AM_READ(marinedt_obj1_yq_r)
AM_RANGE(0x0e, 0x0e) AM_READ(marinedt_coll_r)
@@ -298,7 +298,7 @@ static ADDRESS_MAP_START( marinedt_writeport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( marinedt )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 /* IN1 */
+ PORT_START_TAG("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 /* IN2 */
+ PORT_START_TAG("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 /* IN3 - FAKE MUXED */
+ PORT_START_TAG("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 /* IN4 - FAKE MUXED */
+ PORT_START_TAG("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/marvins.c b/src/mame/drivers/marvins.c
index a5876cd5ba5..dffb2b69f23 100644
--- a/src/mame/drivers/marvins.c
+++ b/src/mame/drivers/marvins.c
@@ -132,7 +132,7 @@ static READ8_HANDLER( sound_nmi_ack_r )
/* this input port has one of its bits mapped to sound CPU status */
static READ8_HANDLER( marvins_port_0_r )
{
- return(input_port_read_indexed(machine, 0) | sound_cpu_busy);
+ return(input_port_read(machine, "IN0") | sound_cpu_busy);
}
static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/maxaflex.c b/src/mame/drivers/maxaflex.c
index 061c2e690ea..65184aea4f9 100644
--- a/src/mame/drivers/maxaflex.c
+++ b/src/mame/drivers/maxaflex.c
@@ -46,7 +46,7 @@ static emu_timer *mcu_timer;
static READ8_HANDLER( mcu_portA_r )
{
- portA_in = input_port_read_indexed(machine, 5) | (input_port_read_indexed(machine, 4) << 4) | (input_port_read_indexed(machine, 0) << 5);
+ portA_in = input_port_read(machine, "dsw") | (input_port_read(machine, "coin") << 4) | (input_port_read(machine, "console") << 5);
return (portA_in & ~ddrA) | (portA_out & ddrA);
}
@@ -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 /* IN4 coin */
+ PORT_START_TAG("coin") /* IN4 coin */
PORT_BIT(0x1, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED(coin_inserted, 0)
- PORT_START /* IN5 DSW */
+ PORT_START_TAG("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 3706346aefe..bc05f294dac 100644
--- a/src/mame/drivers/mayumi.c
+++ b/src/mame/drivers/mayumi.c
@@ -52,7 +52,12 @@ static WRITE8_HANDLER( input_sel_w )
static READ8_HANDLER( key_matrix_r )
{
int p,i,ret;
-
+ static const char *const keynames[2][5] =
+ {
+ { "KEY5", "KEY6", "KEY7", "KEY8", "KEY9" },
+ { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4" }
+ };
+
ret = 0xff;
p = ~input_sel & 0x1f;
@@ -60,7 +65,7 @@ static READ8_HANDLER( key_matrix_r )
for (i=0; i<5; i++)
{
if (p & (1 << i))
- ret &= input_port_read_indexed(machine, i+7-offset*5);
+ ret &= input_port_read(machine, keynames[offset][i]);
}
return ret;
@@ -83,7 +88,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x30, 0x30) AM_READ(input_port_12_r)
+ AM_RANGE(0x30, 0x30) AM_READ_PORT("IN0")
AM_RANGE(0xc1, 0xc2) AM_READ(key_matrix_r) // 0xc0-c3 8255ppi
AM_RANGE(0xd1, 0xd1) AM_READ(YM2203_read_port_0_r)
ADDRESS_MAP_END
@@ -101,7 +106,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mayumi )
- PORT_START /* dsw1 */
+ PORT_START_TAG("DSW1") /* dsw1 */
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -126,7 +131,7 @@ static INPUT_PORTS_START( mayumi )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* dsw2 */
+ PORT_START_TAG("DSW2") /* dsw2 */
PORT_DIPNAME( 0x80, 0x80, "Unknown 2-1" )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -152,87 +157,87 @@ static INPUT_PORTS_START( mayumi )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* 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 )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_M )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
+ PORT_START_TAG("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 )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_M )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 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 )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_N )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
+ PORT_START_TAG("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 )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_N )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 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 )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
+ PORT_START_TAG("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 )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 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 )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
+ PORT_START_TAG("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 )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* P1 IN4 (6) */
+ PORT_START_TAG("KEY4") /* P1 IN4 (6) */
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 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)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_M ) PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2)
+ PORT_START_TAG("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)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_M ) PORT_PLAYER(2)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 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)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_N ) PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_PLAYER(2)
+ PORT_START_TAG("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)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_N ) PORT_PLAYER(2)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_PLAYER(2)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 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)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2)
+ PORT_START_TAG("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)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) PORT_PLAYER(2)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2)
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 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)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) PORT_PLAYER(2)
+ PORT_START_TAG("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)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* P2 IN4 (11) */
+ PORT_START_TAG("KEY9") /* P2 IN4 (11) */
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START // 12
+ PORT_START_TAG("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 03ba5cf56a3..9f8c9abcd07 100644
--- a/src/mame/drivers/mazerbla.c
+++ b/src/mame/drivers/mazerbla.c
@@ -435,11 +435,12 @@ Vertical movement of gun is Strobe 9, Bits 0-7.
static READ8_HANDLER( zpu_inputs_r )
{
+ static const char *strobenames[] = { "ZPU", "DSW0", "DSW1", "DSW2", "DSW3", "BUTTONS", "STICK0_X", "STICK0_Y", "STICK1_X", "STICK1_Y" };
UINT8 ret = 0;
if (bcd_7445<10)
{
- ret = input_port_read_indexed(machine, bcd_7445 );
+ ret = input_port_read(machine, strobenames[bcd_7445]);
}
return ret;
}
@@ -1151,7 +1152,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mazerbla )
- PORT_START /* Strobe 0: ZPU Switches */
+ PORT_START_TAG("ZPU") /* Strobe 0: ZPU Switches */
PORT_DIPNAME( 0x40, 0x40, "ZPU Switch 1" )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1159,7 +1160,7 @@ static INPUT_PORTS_START( mazerbla )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* Strobe 1: Dip Switches 28-35*/
+ PORT_START_TAG("DSW0") /* Strobe 1: Dip Switches 28-35*/
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "6" )
PORT_DIPSETTING( 0x02, "5" )
@@ -1181,7 +1182,7 @@ static INPUT_PORTS_START( mazerbla )
PORT_DIPSETTING( 0x40, "60000" )
PORT_DIPSETTING( 0x00, "70000" )
- PORT_START /* Strobe 2: Dip Switches 20-27*/
+ PORT_START_TAG("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 ) )
@@ -1218,7 +1219,7 @@ static INPUT_PORTS_START( mazerbla )
PORT_DIPSETTING( 0x80, "1 Coin/10 Credits" )
PORT_DIPSETTING( 0x70, "1 Coin/14 Credits" )
- PORT_START /* Strobe 3: Dip Switches 12-19*/
+ PORT_START_TAG("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 ) )
@@ -1244,7 +1245,7 @@ static INPUT_PORTS_START( mazerbla )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* Strobe 4: Dip Switches 4-11 */
+ PORT_START_TAG("DSW3") /* Strobe 4: Dip Switches 4-11 */
PORT_DIPNAME( 0x03, 0x02, "Number of Freezes" )
PORT_DIPSETTING( 0x03, "4" )
PORT_DIPSETTING( 0x02, "3" )
@@ -1270,7 +1271,7 @@ static INPUT_PORTS_START( mazerbla )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* Strobe 5: coin1&2, start1&2, fire */
+ PORT_START_TAG("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 )
@@ -1280,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 /* Strobe 6: horizontal movement of gun */
+ PORT_START_TAG("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 /* Strobe 7: vertical movement of gun */
+ PORT_START_TAG("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 /* Strobe 8: horizontal movement of gun */
+ /* Mazer Blazer cabinet has only one gun, really */
+ PORT_START_TAG("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 /* Strobe 9: vertical movement of gun */
+ PORT_START_TAG("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 /* Strobe 0: ZPU Switches */
+ PORT_START_TAG("ZPU") /* Strobe 0: ZPU Switches */
PORT_DIPNAME( 0x40, 0x40, "ZPU Switch 1" )
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1301,7 +1302,7 @@ static INPUT_PORTS_START( greatgun )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* Strobe 1: Dip Switches 28-35*/
+ PORT_START_TAG("DSW0") /* Strobe 1: Dip Switches 28-35*/
PORT_DIPNAME( 0x03, 0x00, "Starting Number of Bullets/Credit" )
PORT_DIPSETTING( 0x03, "60" )
PORT_DIPSETTING( 0x02, "70" )
@@ -1328,7 +1329,7 @@ static INPUT_PORTS_START( greatgun )
PORT_DIPSETTING( 0x80, "1" )
PORT_DIPSETTING( 0x00, "2" )
- PORT_START /* Strobe 2: Dip Switches 20-27*/
+ PORT_START_TAG("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 ) )
@@ -1365,7 +1366,7 @@ static INPUT_PORTS_START( greatgun )
PORT_DIPSETTING( 0x80, "1 Coin/10 Credits" )
PORT_DIPSETTING( 0x70, "1 Coin/14 Credits" )
- PORT_START /* Strobe 3: Dip Switches 12-19*/
+ PORT_START_TAG("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 ) )
@@ -1391,7 +1392,7 @@ static INPUT_PORTS_START( greatgun )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* Strobe 4: Dip Switches 4-11 */
+ PORT_START_TAG("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 ) )
@@ -1418,7 +1419,7 @@ static INPUT_PORTS_START( greatgun )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* Strobe 5: coin1&2, start1&2, fire */
+ PORT_START_TAG("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 )
@@ -1428,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 /* Strobe 6: horizontal movement of gun */
+ PORT_START_TAG("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 /* Strobe 7: vertical movement of gun */
+ PORT_START_TAG("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 /* Strobe 8: horizontal movement of gun */
+ PORT_START_TAG("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 /* Strobe 9: vertical movement of gun */
+ PORT_START_TAG("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 af219e90901..835c52020a7 100644
--- a/src/mame/drivers/mcatadv.c
+++ b/src/mame/drivers/mcatadv.c
@@ -155,7 +155,7 @@ UINT16* mcatadv_vidregs;
static READ16_HANDLER( mcatadv_dsw_r )
{
- return input_port_read_indexed(machine, 2+offset) << 8;
+ return input_port_read(machine, offset ? "DSW2" : "DSW1") << 8;
}
static WRITE16_HANDLER( mcat_soundlatch_w )
@@ -202,8 +202,8 @@ static ADDRESS_MAP_START( mcatadv_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x700000, 0x707fff) AM_READ(SMH_RAM) // Sprites
AM_RANGE(0x708000, 0x70ffff) AM_READ(SMH_RAM) // Tests more than is needed?
- AM_RANGE(0x800000, 0x800001) AM_READ(input_port_0_word_r) // Inputs
- AM_RANGE(0x800002, 0x800003) AM_READ(input_port_1_word_r) // Inputs
+ AM_RANGE(0x800000, 0x800001) AM_READ_PORT("IN0") // Inputs
+ AM_RANGE(0x800002, 0x800003) AM_READ_PORT("IN1") // Inputs
AM_RANGE(0xa00000, 0xa00003) AM_READ(mcatadv_dsw_r) // Dip Switches
AM_RANGE(0xb00000, 0xb0000f) AM_READ(SMH_RAM)
diff --git a/src/mame/drivers/mcr68.c b/src/mame/drivers/mcr68.c
index 62c9f95d486..cec0a8ae419 100644
--- a/src/mame/drivers/mcr68.c
+++ b/src/mame/drivers/mcr68.c
@@ -74,8 +74,8 @@ static UINT8 protection_data[5];
READ8_HANDLER( zwackery_port_2_r )
{
- int result = input_port_read_indexed(machine, 2);
- int wheel = input_port_read_indexed(machine, 5);
+ int result = input_port_read(machine, "IN2");
+ int wheel = input_port_read(machine, "IN5");
return result | ((wheel >> 2) & 0x3e);
}
@@ -135,9 +135,11 @@ static WRITE16_HANDLER( blasted_control_w )
static READ16_HANDLER( spyhunt2_port_0_r )
{
+ static const char *portnames[] = { "AN1", "AN2", "AN3", "AN4" };
int result = input_port_read(machine, "IN0");
int which = (control_word >> 3) & 3;
- int analog = input_port_read_indexed(machine, 3 + which);
+ int analog = input_port_read(machine, portnames[which]);
+
return result | ((soundsgood_status_r(machine, 0) & 1) << 5) | (analog << 8);
}
@@ -312,9 +314,9 @@ static ADDRESS_MAP_START( mcr68_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x090000, 0x09007f) AM_WRITE(mcr68_paletteram_w) AM_BASE(&paletteram16)
AM_RANGE(0x0a0000, 0x0a000f) AM_READWRITE(mcr68_6840_upper_r, mcr68_6840_upper_w)
AM_RANGE(0x0b0000, 0x0bffff) AM_WRITE(watchdog_reset16_w)
- AM_RANGE(0x0d0000, 0x0dffff) AM_READ(input_port_0_word_r)
- AM_RANGE(0x0e0000, 0x0effff) AM_READ(input_port_1_word_r)
- AM_RANGE(0x0f0000, 0x0fffff) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x0d0000, 0x0dffff) AM_READ_PORT("IN0")
+ AM_RANGE(0x0e0000, 0x0effff) AM_READ_PORT("IN1")
+ AM_RANGE(0x0f0000, 0x0fffff) AM_READ_PORT("DSW")
ADDRESS_MAP_END
@@ -361,7 +363,7 @@ static ADDRESS_MAP_START( pigskin_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x160000, 0x1607ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size)
AM_RANGE(0x180000, 0x18000f) AM_READWRITE(mcr68_6840_upper_r, mcr68_6840_upper_w)
AM_RANGE(0x1a0000, 0x1affff) AM_WRITE(archrivl_control_w)
- AM_RANGE(0x1e0000, 0x1effff) AM_READ(input_port_0_word_r)
+ AM_RANGE(0x1e0000, 0x1effff) AM_READ_PORT("IN0")
ADDRESS_MAP_END
@@ -377,7 +379,7 @@ static ADDRESS_MAP_START( trisport_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0x1fffff)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x08ffff) AM_READ(trisport_port_1_r)
- AM_RANGE(0x0a0000, 0x0affff) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x0a0000, 0x0affff) AM_READ_PORT("DSW")
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
AM_RANGE(0x120000, 0x12007f) AM_WRITE(mcr68_paletteram_w) AM_BASE(&paletteram16)
AM_RANGE(0x140000, 0x1407ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size)
@@ -385,7 +387,7 @@ static ADDRESS_MAP_START( trisport_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x180000, 0x18000f) AM_READWRITE(mcr68_6840_upper_r, mcr68_6840_upper_w)
AM_RANGE(0x1a0000, 0x1affff) AM_WRITE(archrivl_control_w)
AM_RANGE(0x1c0000, 0x1cffff) AM_WRITE(watchdog_reset16_w)
- AM_RANGE(0x1e0000, 0x1effff) AM_READ(input_port_0_word_r)
+ AM_RANGE(0x1e0000, 0x1effff) AM_READ_PORT("IN0")
ADDRESS_MAP_END
@@ -542,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("IN3") /* dipswitches */
+ PORT_START_TAG("DSW") /* dipswitches */
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x0003, DEF_STR( 1C_1C ) )
@@ -607,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("IN2")
+ PORT_START_TAG("DSW")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x0003, DEF_STR( 1C_1C ) )
diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c
index 556e4e0019b..37e5e50adb6 100644
--- a/src/mame/drivers/mediagx.c
+++ b/src/mame/drivers/mediagx.c
@@ -502,23 +502,24 @@ static WRITE32_HANDLER( io20_w )
static READ32_HANDLER( parallel_port_r )
{
UINT32 r = 0;
+// static const char *portnames[] = { "IN0", "IN1", "IN2", "IN3", "IN4", "IN5", "IN6", "IN7" };
if (ACCESSING_BITS_8_15)
{
- UINT8 nibble = parallel_latched;//(input_port_read_indexed(machine, parallel_pointer / 3) >> (4 * (parallel_pointer % 3))) & 15;
+ UINT8 nibble = parallel_latched;//(input_port_read(machine, portnames[parallel_pointer / 3]) >> (4 * (parallel_pointer % 3))) & 15;
r |= ((~nibble & 0x08) << 12) | ((nibble & 0x07) << 11);
logerror("%08X:parallel_port_r()\n", activecpu_get_pc());
/* if (controls_data == 0x18)
{
- r |= input_port_read_indexed(machine, 0) << 8;
+ r |= input_port_read(machine, "IN0") << 8;
}
else if (controls_data == 0x60)
{
- r |= input_port_read_indexed(machine, 1) << 8;
+ r |= input_port_read(machine, "IN1") << 8;
}
else if (controls_data == 0xff || controls_data == 0x50)
{
- r |= input_port_read_indexed(machine, 2) << 8;
+ r |= input_port_read(machine, "IN2") << 8;
}
//r |= control_read << 8;*/
diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c
index 3a521284cde..9cbaaf17f11 100644
--- a/src/mame/drivers/megadriv.c
+++ b/src/mame/drivers/megadriv.c
@@ -1708,20 +1708,23 @@ INPUT_PORTS_START( aladbl )
PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1) /* needed to avoid credits getting mad */
INPUT_PORTS_END
-#define MODE_BUTTON(player) ( (input_port_read_indexed(Machine, player) & 0x800) >> 11 )
-#define Z_BUTTON(player) ( (input_port_read_indexed(Machine, player) & 0x400) >> 10 )
-#define Y_BUTTON(player) ( (input_port_read_indexed(Machine, player) & 0x200) >> 9 )
-#define X_BUTTON(player) ( (input_port_read_indexed(Machine, player) & 0x100) >> 8 )
-
-#define START_BUTTON(player) ( (input_port_read_indexed(Machine, player) & 0x80) >> 7 )
-#define C_BUTTON(player) ( (input_port_read_indexed(Machine, player) & 0x40) >> 6 )
-#define B_BUTTON(player) ( (input_port_read_indexed(Machine, player) & 0x20) >> 5 )
-#define A_BUTTON(player) ( (input_port_read_indexed(Machine, player) & 0x10) >> 4 )
-#define RIGHT_BUTTON(player) ( (input_port_read_indexed(Machine, player) & 0x08) >> 3 )
-#define LEFT_BUTTON(player) ( (input_port_read_indexed(Machine, player) & 0x04) >> 2 )
-#define DOWN_BUTTON(player) ( (input_port_read_indexed(Machine, player) & 0x02) >> 1 )
-#define UP_BUTTON(player) ( (input_port_read_indexed(Machine, player) & 0x01) >> 0 )
-#define MD_RESET_BUTTON ( (input_port_read_safe(Machine, "RESET", 0x00) & 0x01) >> 0 )
+/* xxx_BUTTONs are used with player = 0, 1, 2, 3 so we need to return 0 for the missing 4th I/O port */
+static const char *padnames[] = { "PAD1", "PAD2", "IN0", "UNK" };
+
+#define MODE_BUTTON(player) ((input_port_read_safe(Machine, padnames[player], 0) & 0x0800) >> 11)
+#define Z_BUTTON(player) ((input_port_read_safe(Machine, padnames[player], 0) & 0x0400) >> 10)
+#define Y_BUTTON(player) ((input_port_read_safe(Machine, padnames[player], 0) & 0x0200) >> 9 )
+#define X_BUTTON(player) ((input_port_read_safe(Machine, padnames[player], 0) & 0x0100) >> 8 )
+
+#define START_BUTTON(player) ((input_port_read_safe(Machine, padnames[player], 0) & 0x0080) >> 7 )
+#define C_BUTTON(player) ((input_port_read_safe(Machine, padnames[player], 0) & 0x0040) >> 6 )
+#define B_BUTTON(player) ((input_port_read_safe(Machine, padnames[player], 0) & 0x0020) >> 5 )
+#define A_BUTTON(player) ((input_port_read_safe(Machine, padnames[player], 0) & 0x0010) >> 4 )
+#define RIGHT_BUTTON(player) ((input_port_read_safe(Machine, padnames[player], 0) & 0x0008) >> 3 )
+#define LEFT_BUTTON(player) ((input_port_read_safe(Machine, padnames[player], 0) & 0x0004) >> 2 )
+#define DOWN_BUTTON(player) ((input_port_read_safe(Machine, padnames[player], 0) & 0x0002) >> 1 )
+#define UP_BUTTON(player) ((input_port_read_safe(Machine, padnames[player], 0) & 0x0001) >> 0 )
+#define MD_RESET_BUTTON ((input_port_read_safe(Machine, "RESET", 0x00) & 0x01) >> 0 )
static UINT8 megadrive_io_data_regs[3];
static UINT8 megadrive_io_ctrl_regs[3];
@@ -1751,7 +1754,6 @@ static UINT8 megadrive_io_read_data_port_6button(int portnum)
{
UINT8 retdata;
-
if (megadrive_io_data_regs[portnum]&0x40)
{
if (io_stage[portnum]==2)
diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c
index 1594b710b45..e696e5e59d1 100644
--- a/src/mame/drivers/megasys1.c
+++ b/src/mame/drivers/megasys1.c
@@ -157,14 +157,14 @@ static MACHINE_RESET( megasys1_hachoo )
[ Main CPU - System A / Z ]
***************************************************************************/
-static READ16_HANDLER( coins_r ) {return input_port_read_indexed(machine, 0);} // < 00 | Coins >
-static READ16_HANDLER( player1_r ) {return input_port_read_indexed(machine, 1);} // < 00 | Player 1 >
-static READ16_HANDLER( player2_r ) {return input_port_read_indexed(machine, 2) * 256 +
- input_port_read_indexed(machine, 3);} // < Reserve | Player 2 >
-static READ16_HANDLER( dsw1_r ) {return input_port_read_indexed(machine, 4);} // DSW 1
-static READ16_HANDLER( dsw2_r ) {return input_port_read_indexed(machine, 5);} // DSW 2
-static READ16_HANDLER( dsw_r ) {return input_port_read_indexed(machine, 4) * 256 +
- input_port_read_indexed(machine, 5);} // < DSW 1 | DSW 2 >
+static READ16_HANDLER( coins_r ) {return input_port_read(machine, "IN0");} // < 00 | Coins >
+static READ16_HANDLER( player1_r ) {return input_port_read(machine, "IN1");} // < 00 | Player 1 >
+static READ16_HANDLER( player2_r ) {return input_port_read(machine, "IN2") * 256 +
+ input_port_read(machine, "IN3");} // < Reserve | Player 2 >
+static READ16_HANDLER( dsw1_r ) {return input_port_read(machine, "DSW1");} // DSW 1
+static READ16_HANDLER( dsw2_r ) {return input_port_read(machine, "DSW2");} // DSW 2
+static READ16_HANDLER( dsw_r ) {return input_port_read(machine, "DSW1") * 256 +
+ input_port_read(machine, "DSW2");} // < DSW 1 | DSW 2 >
#define INTERRUPT_NUM_A 3
@@ -1114,7 +1114,7 @@ static INPUT_PORTS_START( astyanax )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN5") /* 0x80007.b */
+ PORT_START_TAG("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 ) )
diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c
index a60abb395ae..055ac3b6d3c 100644
--- a/src/mame/drivers/metlclsh.c
+++ b/src/mame/drivers/metlclsh.c
@@ -76,10 +76,10 @@ static ADDRESS_MAP_START( metlclsh_readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM )
AM_RANGE(0x8000, 0x9fff) AM_READ(sharedram_r )
AM_RANGE(0xa000, 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(0xc000, 0xc000) AM_READ_PORT("IN0")
+ AM_RANGE(0xc001, 0xc001) AM_READ_PORT("IN1")
+ AM_RANGE(0xc002, 0xc002) AM_READ_PORT("IN2")
+ AM_RANGE(0xc003, 0xc003) AM_READ_PORT("DSW")
// AM_RANGE(0xc800, 0xc82f) AM_READ(SMH_RAM ) // not actually read
// AM_RANGE(0xcc00, 0xcc2f) AM_READ(SMH_RAM ) // ""
AM_RANGE(0xd000, 0xd000) AM_READ(YM2203_status_port_0_r )
@@ -136,10 +136,10 @@ static WRITE8_HANDLER( metlclsh_flipscreen_w )
static ADDRESS_MAP_START( metlclsh_readmem2, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM )
AM_RANGE(0x8000, 0x9fff) AM_READ(sharedram_r )
- 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(0xc000, 0xc000) AM_READ_PORT("IN0")
+ AM_RANGE(0xc001, 0xc001) AM_READ_PORT("IN1")
+ AM_RANGE(0xc002, 0xc002) AM_READ_PORT("IN2")
+ AM_RANGE(0xc003, 0xc003) AM_READ_PORT("DSW")
AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_BANK1 )
AM_RANGE(0xfff0, 0xffff) AM_READ(SMH_ROM ) // Reset/IRQ vectors
ADDRESS_MAP_END
@@ -168,7 +168,7 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( metlclsh )
- PORT_START_TAG("IN0") /* c000 */
+ PORT_START_TAG("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_TAG("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_TAG("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("IN3") /* c003 */
+ PORT_START_TAG("DSW") /* c003 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "3" )
@@ -302,7 +302,7 @@ static INTERRUPT_GEN( metlclsh_interrupt2 )
if (cpu_getiloops() == 0)
return;
/* generate NMI on coin insertion */
- if ((~input_port_read_indexed(machine, 2) & 0xc0) || (~input_port_read_indexed(machine, 3) & 0x40))
+ if ((~input_port_read(machine, "IN2") & 0xc0) || (~input_port_read(machine, "DSW") & 0x40))
cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, ASSERT_LINE);
}
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index 4a4b575d4b6..dc6f423ef35 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -372,7 +372,7 @@ static READ16_HANDLER( metro_soundstatus_r )
static READ16_HANDLER( daitorid_soundstatus_r )
{
- return input_port_read_indexed(machine, 0) | (busy_sndcpu ? 0x80 : 0x00);
+ return input_port_read(machine, "IN0") | (busy_sndcpu ? 0x80 : 0x00);
}
static WRITE16_HANDLER( metro_soundstatus_w )
@@ -906,9 +906,9 @@ ADDRESS_MAP_END
/* Really weird way of mapping 3 DSWs */
static READ16_HANDLER( balcube_dsw_r )
{
- UINT16 dsw1 = input_port_read_indexed(machine, 2) >> 0;
- UINT16 dsw2 = input_port_read_indexed(machine, 2) >> 8;
- UINT16 dsw3 = input_port_read_indexed(machine, 3);
+ UINT16 dsw1 = input_port_read(machine, "DSW0") >> 0;
+ UINT16 dsw2 = input_port_read(machine, "DSW0") >> 8;
+ UINT16 dsw3 = input_port_read(machine, "IN2");
switch (offset*2)
{
@@ -948,8 +948,8 @@ static ADDRESS_MAP_START( balcube_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x674000, 0x674fff) AM_READ(SMH_RAM ) // Sprites
AM_RANGE(0x678000, 0x6787ff) AM_READ(SMH_RAM ) // Tiles Set
AM_RANGE(0x6788a2, 0x6788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause
- AM_RANGE(0x500000, 0x500001) AM_READ(input_port_0_word_r ) // Inputs
- AM_RANGE(0x500002, 0x500003) AM_READ(input_port_1_word_r ) //
+ AM_RANGE(0x500000, 0x500001) AM_READ_PORT("IN0") // Inputs
+ AM_RANGE(0x500002, 0x500003) AM_READ_PORT("IN1") //
AM_RANGE(0x500006, 0x500007) AM_READ(SMH_NOP ) //
ADDRESS_MAP_END
@@ -987,8 +987,8 @@ static ADDRESS_MAP_START( bangball_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xf10000, 0xf10fff) AM_READ(SMH_RAM ) // RAM (bug in the ram test routine)
AM_RANGE(0xb00000, 0xb00001) AM_READ(ymf278b_r ) // Sound
AM_RANGE(0xc00000, 0xc1ffff) AM_READ(balcube_dsw_r ) // DSW x 3
- AM_RANGE(0xd00000, 0xd00001) AM_READ(input_port_0_word_r ) // Inputs
- AM_RANGE(0xd00002, 0xd00003) AM_READ(input_port_1_word_r ) //
+ AM_RANGE(0xd00000, 0xd00001) AM_READ_PORT("IN0") // Inputs
+ AM_RANGE(0xd00002, 0xd00003) AM_READ_PORT("IN1") //
AM_RANGE(0xd00006, 0xd00007) AM_READ(SMH_NOP ) //
AM_RANGE(0xe00000, 0xe1ffff) AM_READ(SMH_RAM ) // Layer 0
AM_RANGE(0xe20000, 0xe3ffff) AM_READ(SMH_RAM ) // Layer 1
@@ -1038,10 +1038,10 @@ static ADDRESS_MAP_START( batlbubl_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x174000, 0x174fff) AM_READ(SMH_RAM ) // Sprites
AM_RANGE(0x178000, 0x1787ff) AM_READ(SMH_RAM ) // Tiles Set
AM_RANGE(0x1788a2, 0x1788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause
- AM_RANGE(0x200000, 0x200001) AM_READ(input_port_0_word_r )
- AM_RANGE(0x200002, 0x200003) AM_READ(input_port_1_word_r )
- AM_RANGE(0x200004, 0x200005) AM_READ(input_port_2_word_r )
- AM_RANGE(0x200006, 0x200007) AM_READ(input_port_3_word_r )
+ AM_RANGE(0x200000, 0x200001) AM_READ_PORT("IN1")
+ AM_RANGE(0x200002, 0x200003) AM_READ_PORT("DSW0")
+ AM_RANGE(0x200004, 0x200005) AM_READ_PORT("IN0")
+ AM_RANGE(0x200006, 0x200007) AM_READ_PORT("IN2")
AM_RANGE(0x300000, 0x31ffff) AM_READ(balcube_dsw_r ) // read but ignored?
AM_RANGE(0x400000, 0x400001) AM_READ(ymf278b_r ) // Sound
AM_RANGE(0xf00000, 0xf0ffff) AM_READ(SMH_RAM ) // RAM
@@ -1089,9 +1089,9 @@ static ADDRESS_MAP_START( daitorid_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x478000, 0x4787ff) AM_READ(SMH_RAM ) // Tiles Set
AM_RANGE(0x4788a2, 0x4788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause
AM_RANGE(0xc00000, 0xc00001) AM_READ(daitorid_soundstatus_r) // Inputs
- AM_RANGE(0xc00002, 0xc00003) AM_READ(input_port_1_word_r ) //
- AM_RANGE(0xc00004, 0xc00005) AM_READ(input_port_2_word_r ) //
- AM_RANGE(0xc00006, 0xc00007) AM_READ(input_port_3_word_r ) //
+ AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("IN1") //
+ AM_RANGE(0xc00004, 0xc00005) AM_READ_PORT("DSW0") //
+ AM_RANGE(0xc00006, 0xc00007) AM_READ_PORT("IN2") //
ADDRESS_MAP_END
static ADDRESS_MAP_START( daitorid_writemem, ADDRESS_SPACE_PROGRAM, 16 )
@@ -1135,9 +1135,9 @@ static ADDRESS_MAP_START( dharma_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x878000, 0x8787ff) AM_READ(SMH_RAM ) // Tiles Set
AM_RANGE(0x8788a2, 0x8788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause
AM_RANGE(0xc00000, 0xc00001) AM_READ(daitorid_soundstatus_r) // Inputs
- AM_RANGE(0xc00002, 0xc00003) AM_READ(input_port_1_word_r ) //
- AM_RANGE(0xc00004, 0xc00005) AM_READ(input_port_2_word_r ) //
- AM_RANGE(0xc00006, 0xc00007) AM_READ(input_port_3_word_r ) //
+ AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("IN1") //
+ AM_RANGE(0xc00004, 0xc00005) AM_READ_PORT("DSW0") //
+ AM_RANGE(0xc00006, 0xc00007) AM_READ_PORT("IN2") //
ADDRESS_MAP_END
static ADDRESS_MAP_START( dharma_writemem, ADDRESS_SPACE_PROGRAM, 16 )
@@ -1193,11 +1193,11 @@ static ADDRESS_MAP_START( karatour_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM
AM_RANGE(0xffc000, 0xffffff) AM_READ(SMH_RAM ) // RAM
AM_RANGE(0x400000, 0x400001) AM_READ(metro_soundstatus_r ) // From Sound CPU
- AM_RANGE(0x400002, 0x400003) AM_READ(input_port_0_word_r ) // Inputs
- AM_RANGE(0x400004, 0x400005) AM_READ(input_port_1_word_r ) //
- AM_RANGE(0x400006, 0x400007) AM_READ(input_port_2_word_r ) //
- AM_RANGE(0x40000a, 0x40000b) AM_READ(input_port_3_word_r ) //
- AM_RANGE(0x40000c, 0x40000d) AM_READ(input_port_4_word_r ) //
+ AM_RANGE(0x400002, 0x400003) AM_READ_PORT("IN0") // Inputs
+ AM_RANGE(0x400004, 0x400005) AM_READ_PORT("IN1") //
+ AM_RANGE(0x400006, 0x400007) AM_READ_PORT("DSW0") //
+ AM_RANGE(0x40000a, 0x40000b) AM_READ_PORT("DSW1") //
+ AM_RANGE(0x40000c, 0x40000d) AM_READ_PORT("IN2") //
AM_RANGE(0x860000, 0x86ffff) AM_READ(metro_bankedrom_r ) // Banked ROM
AM_RANGE(0x870000, 0x873fff) AM_READ(SMH_RAM ) // Palette
AM_RANGE(0x874000, 0x874fff) AM_READ(SMH_RAM ) // Sprites
@@ -1251,8 +1251,8 @@ static ADDRESS_MAP_START( kokushi_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x878000, 0x8787ff) AM_READ(SMH_RAM ) // Tiles Set
AM_RANGE(0x8788a2, 0x8788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause
AM_RANGE(0xc00000, 0xc00001) AM_READ(daitorid_soundstatus_r) // From Sound CPU
- AM_RANGE(0xc00002, 0xc00003) AM_READ(input_port_1_word_r ) // Inputs
- AM_RANGE(0xc00004, 0xc00005) AM_READ(input_port_2_word_r ) //
+ AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("IN1") // Inputs
+ AM_RANGE(0xc00004, 0xc00005) AM_READ_PORT("DSW0") //
ADDRESS_MAP_END
static ADDRESS_MAP_START( kokushi_writemem, ADDRESS_SPACE_PROGRAM, 16 )
@@ -1298,12 +1298,12 @@ static ADDRESS_MAP_START( lastfort_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x8788a2, 0x8788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause
AM_RANGE(0xc00000, 0xc00001) AM_READ(metro_soundstatus_r ) // From Sound CPU
AM_RANGE(0xc00002, 0xc00003) AM_READ(SMH_NOP ) //
- AM_RANGE(0xc00004, 0xc00005) AM_READ(input_port_0_word_r ) // Inputs
- AM_RANGE(0xc00006, 0xc00007) AM_READ(input_port_1_word_r ) //
- AM_RANGE(0xc00008, 0xc00009) AM_READ(input_port_2_word_r ) //
- AM_RANGE(0xc0000a, 0xc0000b) AM_READ(input_port_3_word_r ) //
- AM_RANGE(0xc0000c, 0xc0000d) AM_READ(input_port_4_word_r ) //
- AM_RANGE(0xc0000e, 0xc0000f) AM_READ(input_port_5_word_r ) //
+ AM_RANGE(0xc00004, 0xc00005) AM_READ_PORT("IN0") // Inputs
+ AM_RANGE(0xc00006, 0xc00007) AM_READ_PORT("IN1") //
+ AM_RANGE(0xc00008, 0xc00009) AM_READ_PORT("IN2") //
+ AM_RANGE(0xc0000a, 0xc0000b) AM_READ_PORT("DSW0") //
+ AM_RANGE(0xc0000c, 0xc0000d) AM_READ_PORT("DSW1") //
+ AM_RANGE(0xc0000e, 0xc0000f) AM_READ_PORT("IN3") //
ADDRESS_MAP_END
static ADDRESS_MAP_START( lastfort_writemem, ADDRESS_SPACE_PROGRAM, 16 )
@@ -1336,11 +1336,11 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( lastforg_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM ) // ROM
AM_RANGE(0x400000, 0x400001) AM_READ(metro_soundstatus_r ) // From Sound CPU
- AM_RANGE(0x400002, 0x400003) AM_READ(input_port_0_word_r ) // Inputs
- AM_RANGE(0x400004, 0x400005) AM_READ(input_port_1_word_r ) //
- AM_RANGE(0x400006, 0x400007) AM_READ(input_port_2_word_r ) //
- AM_RANGE(0x40000a, 0x40000b) AM_READ(input_port_3_word_r ) //
- AM_RANGE(0x40000c, 0x40000d) AM_READ(input_port_4_word_r ) //
+ AM_RANGE(0x400002, 0x400003) AM_READ_PORT("IN0") // Inputs
+ AM_RANGE(0x400004, 0x400005) AM_READ_PORT("IN1") //
+ AM_RANGE(0x400006, 0x400007) AM_READ_PORT("DSW0") //
+ AM_RANGE(0x40000a, 0x40000b) AM_READ_PORT("DSW1") //
+ AM_RANGE(0x40000c, 0x40000d) AM_READ_PORT("IN2") //
AM_RANGE(0x880000, 0x89ffff) AM_READ(SMH_RAM ) // Layer 0
AM_RANGE(0x8a0000, 0x8bffff) AM_READ(SMH_RAM ) // Layer 1
AM_RANGE(0x8c0000, 0x8dffff) AM_READ(SMH_RAM ) // Layer 2
@@ -1413,11 +1413,11 @@ static READ16_HANDLER( gakusai_input_r )
{
UINT16 input_sel = (*gakusai_input_sel) ^ 0x3e;
// Bit 0 ??
- if (input_sel & 0x0002) return input_port_read_indexed(machine, 0);
- if (input_sel & 0x0004) return input_port_read_indexed(machine, 1);
- if (input_sel & 0x0008) return input_port_read_indexed(machine, 2);
- if (input_sel & 0x0010) return input_port_read_indexed(machine, 3);
- if (input_sel & 0x0020) return input_port_read_indexed(machine, 4);
+ if (input_sel & 0x0002) return input_port_read(machine, "KEY0");
+ if (input_sel & 0x0004) return input_port_read(machine, "KEY1");
+ if (input_sel & 0x0008) return input_port_read(machine, "KEY2");
+ if (input_sel & 0x0010) return input_port_read(machine, "KEY3");
+ if (input_sel & 0x0020) return input_port_read(machine, "KEY4");
return 0xffff;
}
@@ -1453,7 +1453,7 @@ static ADDRESS_MAP_START( gakusai_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x278000, 0x2787ff) AM_READ(SMH_RAM ) // Tiles Set
AM_RANGE(0x278832, 0x278833) AM_READ(metro_irq_cause_r ) // IRQ Cause
AM_RANGE(0x278880, 0x278881) AM_READ(gakusai_input_r ) // Inputs
- AM_RANGE(0x278882, 0x278883) AM_READ(input_port_5_word_r ) //
+ AM_RANGE(0x278882, 0x278883) AM_READ_PORT("IN0") //
AM_RANGE(0x27880e, 0x27880f) AM_READ(SMH_RAM ) // Screen Control
AM_RANGE(0x700000, 0x700001) AM_READ(OKIM6295_status_0_lsb_r ) // Sound
AM_RANGE(0xc00000, 0xc00001) AM_READ(gakusai_eeprom_r ) // EEPROM
@@ -1507,7 +1507,7 @@ static ADDRESS_MAP_START( gakusai2_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x678000, 0x6787ff) AM_READ(SMH_RAM ) // Tiles Set
AM_RANGE(0x678832, 0x678833) AM_READ(metro_irq_cause_r ) // IRQ Cause
AM_RANGE(0x678880, 0x678881) AM_READ(gakusai_input_r ) // Inputs
- AM_RANGE(0x678882, 0x678883) AM_READ(input_port_5_word_r ) //
+ AM_RANGE(0x678882, 0x678883) AM_READ_PORT("IN0") //
AM_RANGE(0x67880e, 0x67880f) AM_READ(SMH_RAM ) // Screen Control
AM_RANGE(0xb00000, 0xb00001) AM_READ(OKIM6295_status_0_lsb_r ) // Sound
AM_RANGE(0xe00000, 0xe00001) AM_READ(gakusai_eeprom_r ) // EEPROM
@@ -1592,7 +1592,7 @@ static ADDRESS_MAP_START( dokyusp_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x278000, 0x2787ff) AM_READ(SMH_RAM ) // Tiles Set
AM_RANGE(0x278832, 0x278833) AM_READ(metro_irq_cause_r ) // IRQ Cause
AM_RANGE(0x278880, 0x278881) AM_READ(gakusai_input_r ) // Inputs
- AM_RANGE(0x278882, 0x278883) AM_READ(input_port_5_word_r ) //
+ AM_RANGE(0x278882, 0x278883) AM_READ_PORT("IN0") //
AM_RANGE(0x27880e, 0x27880f) AM_READ(SMH_RAM ) // Screen Control
AM_RANGE(0x700000, 0x700001) AM_READ(OKIM6295_status_0_lsb_r ) // Sound
AM_RANGE(0xd00000, 0xd00001) AM_READ(dokyusp_eeprom_r ) // EEPROM
@@ -1645,9 +1645,9 @@ static ADDRESS_MAP_START( dokyusei_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x478000, 0x4787ff) AM_READ(SMH_RAM ) // Tiles Set
// AM_RANGE(0x478832, 0x478833) AM_READ(metro_irq_cause_r ) // IRQ Cause
AM_RANGE(0x478880, 0x478881) AM_READ(gakusai_input_r ) // Inputs
- AM_RANGE(0x478882, 0x478883) AM_READ(input_port_5_word_r ) //
- AM_RANGE(0x478884, 0x478885) AM_READ(input_port_6_word_r ) // 2 x DSW
- AM_RANGE(0x478886, 0x478887) AM_READ(input_port_7_word_r ) //
+ AM_RANGE(0x478882, 0x478883) AM_READ_PORT("IN0") //
+ AM_RANGE(0x478884, 0x478885) AM_READ_PORT("DSW0") // 2 x DSW
+ AM_RANGE(0x478886, 0x478887) AM_READ_PORT("DSW1") //
AM_RANGE(0xd00000, 0xd00001) AM_READ(OKIM6295_status_0_lsb_r ) // Sound
ADDRESS_MAP_END
@@ -1699,12 +1699,12 @@ static ADDRESS_MAP_START( pangpoms_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x4788a2, 0x4788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause
AM_RANGE(0x800000, 0x800001) AM_READ(metro_soundstatus_r ) // From Sound CPU
AM_RANGE(0x800002, 0x800003) AM_READ(SMH_NOP ) //
- AM_RANGE(0x800004, 0x800005) AM_READ(input_port_0_word_r ) // Inputs
- AM_RANGE(0x800006, 0x800007) AM_READ(input_port_1_word_r ) //
- AM_RANGE(0x800008, 0x800009) AM_READ(input_port_2_word_r ) //
- AM_RANGE(0x80000a, 0x80000b) AM_READ(input_port_3_word_r ) //
- AM_RANGE(0x80000c, 0x80000d) AM_READ(input_port_4_word_r ) //
- AM_RANGE(0x80000e, 0x80000f) AM_READ(input_port_5_word_r ) //
+ AM_RANGE(0x800004, 0x800005) AM_READ_PORT("IN0") // Inputs
+ AM_RANGE(0x800006, 0x800007) AM_READ_PORT("IN1") //
+ AM_RANGE(0x800008, 0x800009) AM_READ_PORT("IN2") //
+ AM_RANGE(0x80000a, 0x80000b) AM_READ_PORT("DSW0") //
+ AM_RANGE(0x80000c, 0x80000d) AM_READ_PORT("DSW1") //
+ AM_RANGE(0x80000e, 0x80000f) AM_READ_PORT("IN3") //
ADDRESS_MAP_END
static ADDRESS_MAP_START( pangpoms_writemem, ADDRESS_SPACE_PROGRAM, 16 )
@@ -1748,9 +1748,9 @@ static ADDRESS_MAP_START( poitto_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xc78000, 0xc787ff) AM_READ(SMH_RAM ) // Tiles Set
AM_RANGE(0xc788a2, 0xc788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause
AM_RANGE(0x800000, 0x800001) AM_READ(daitorid_soundstatus_r) // Inputs
- AM_RANGE(0x800002, 0x800003) AM_READ(input_port_1_word_r ) //
- AM_RANGE(0x800004, 0x800005) AM_READ(input_port_2_word_r ) //
- AM_RANGE(0x800006, 0x800007) AM_READ(input_port_3_word_r ) //
+ AM_RANGE(0x800002, 0x800003) AM_READ_PORT("IN1") //
+ AM_RANGE(0x800004, 0x800005) AM_READ_PORT("DSW0") //
+ AM_RANGE(0x800006, 0x800007) AM_READ_PORT("IN2") //
ADDRESS_MAP_END
static ADDRESS_MAP_START( poitto_writemem, ADDRESS_SPACE_PROGRAM, 16 )
@@ -1795,12 +1795,12 @@ static ADDRESS_MAP_START( skyalert_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x8788a2, 0x8788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause
AM_RANGE(0x400000, 0x400001) AM_READ(metro_soundstatus_r ) // From Sound CPU
AM_RANGE(0x400002, 0x400003) AM_READ(SMH_NOP ) //
- AM_RANGE(0x400004, 0x400005) AM_READ(input_port_0_word_r ) // Inputs
- AM_RANGE(0x400006, 0x400007) AM_READ(input_port_1_word_r ) //
- AM_RANGE(0x400008, 0x400009) AM_READ(input_port_2_word_r ) //
- AM_RANGE(0x40000a, 0x40000b) AM_READ(input_port_3_word_r ) //
- AM_RANGE(0x40000c, 0x40000d) AM_READ(input_port_4_word_r ) //
- AM_RANGE(0x40000e, 0x40000f) AM_READ(input_port_5_word_r ) //
+ AM_RANGE(0x400004, 0x400005) AM_READ_PORT("IN0") // Inputs
+ AM_RANGE(0x400006, 0x400007) AM_READ_PORT("IN1") //
+ AM_RANGE(0x400008, 0x400009) AM_READ_PORT("IN2") //
+ AM_RANGE(0x40000a, 0x40000b) AM_READ_PORT("DSW0") //
+ AM_RANGE(0x40000c, 0x40000d) AM_READ_PORT("DSW1") //
+ AM_RANGE(0x40000e, 0x40000f) AM_READ_PORT("IN3") //
ADDRESS_MAP_END
static ADDRESS_MAP_START( skyalert_writemem, ADDRESS_SPACE_PROGRAM, 16 )
@@ -1844,9 +1844,9 @@ static ADDRESS_MAP_START( pururun_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xc78000, 0xc787ff) AM_READ(SMH_RAM ) // Tiles Set
AM_RANGE(0xc788a2, 0xc788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause
AM_RANGE(0x400000, 0x400001) AM_READ(daitorid_soundstatus_r) // Inputs
- AM_RANGE(0x400002, 0x400003) AM_READ(input_port_1_word_r ) //
- AM_RANGE(0x400004, 0x400005) AM_READ(input_port_2_word_r ) //
- AM_RANGE(0x400006, 0x400007) AM_READ(input_port_3_word_r ) //
+ AM_RANGE(0x400002, 0x400003) AM_READ_PORT("IN1") //
+ AM_RANGE(0x400004, 0x400005) AM_READ_PORT("DSW0") //
+ AM_RANGE(0x400006, 0x400007) AM_READ_PORT("IN2") //
ADDRESS_MAP_END
static ADDRESS_MAP_START( pururun_writemem, ADDRESS_SPACE_PROGRAM, 16 )
@@ -1890,9 +1890,9 @@ static ADDRESS_MAP_START( toride2g_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xc78000, 0xc787ff) AM_READ(SMH_RAM ) // Tiles Set
AM_RANGE(0xc788a2, 0xc788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause
AM_RANGE(0x800000, 0x800001) AM_READ(daitorid_soundstatus_r) // Inputs
- AM_RANGE(0x800002, 0x800003) AM_READ(input_port_1_word_r ) //
- AM_RANGE(0x800004, 0x800005) AM_READ(input_port_2_word_r ) //
- AM_RANGE(0x800006, 0x800007) AM_READ(input_port_3_word_r ) //
+ AM_RANGE(0x800002, 0x800003) AM_READ_PORT("IN1") //
+ AM_RANGE(0x800004, 0x800005) AM_READ_PORT("DSW0") //
+ AM_RANGE(0x800006, 0x800007) AM_READ_PORT("IN2") //
ADDRESS_MAP_END
static ADDRESS_MAP_START( toride2g_writemem, ADDRESS_SPACE_PROGRAM, 16 )
@@ -1992,11 +1992,11 @@ static ADDRESS_MAP_START( blzntrnd_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x274000, 0x274fff) AM_READ(SMH_RAM ) // Sprites
AM_RANGE(0x278000, 0x2787ff) AM_READ(SMH_RAM ) // Tiles Set
AM_RANGE(0x2788a2, 0x2788a3) AM_READ(metro_irq_cause_r ) // IRQ Cause
- AM_RANGE(0xe00000, 0xe00001) AM_READ(input_port_0_word_r ) // Inputs
- AM_RANGE(0xe00002, 0xe00003) AM_READ(input_port_1_word_r ) //
- AM_RANGE(0xe00004, 0xe00005) AM_READ(input_port_2_word_r ) //
- AM_RANGE(0xe00006, 0xe00007) AM_READ(input_port_3_word_r ) //
- AM_RANGE(0xe00008, 0xe00009) AM_READ(input_port_4_word_r ) //
+ AM_RANGE(0xe00000, 0xe00001) AM_READ_PORT("DSW0") // Inputs
+ AM_RANGE(0xe00002, 0xe00003) AM_READ_PORT("DSW1") //
+ AM_RANGE(0xe00004, 0xe00005) AM_READ_PORT("IN0") //
+ AM_RANGE(0xe00006, 0xe00007) AM_READ_PORT("IN1") //
+ AM_RANGE(0xe00008, 0xe00009) AM_READ_PORT("IN2") //
AM_RANGE(0x400000, 0x43ffff) AM_READ(SMH_RAM ) // 053936
ADDRESS_MAP_END
@@ -2046,10 +2046,10 @@ static ADDRESS_MAP_START( mouja_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x474000, 0x474fff) AM_READ(SMH_RAM ) // Sprites
AM_RANGE(0x478000, 0x4787ff) AM_READ(SMH_RAM ) // Tiles Set
AM_RANGE(0x478832, 0x478833) AM_READ(metro_irq_cause_r ) // IRQ Cause
- AM_RANGE(0x478880, 0x478881) AM_READ(input_port_0_word_r ) // Inputs
- AM_RANGE(0x478882, 0x478883) AM_READ(input_port_1_word_r ) //
- AM_RANGE(0x478884, 0x478885) AM_READ(input_port_2_word_r ) //
- AM_RANGE(0x478886, 0x478887) AM_READ(input_port_3_word_r ) //
+ AM_RANGE(0x478880, 0x478881) AM_READ_PORT("IN0") // Inputs
+ AM_RANGE(0x478882, 0x478883) AM_READ_PORT("IN1") //
+ AM_RANGE(0x478884, 0x478885) AM_READ_PORT("DSW0") //
+ AM_RANGE(0x478886, 0x478887) AM_READ_PORT("IN2") //
AM_RANGE(0xd00000, 0xd00001) AM_READ(OKIM6295_status_0_lsb_r)
#if 0
AM_RANGE(0x460000, 0x46ffff) AM_READ(metro_bankedrom_r ) // Banked ROM
@@ -2095,7 +2095,7 @@ ADDRESS_MAP_END
static READ16_HANDLER( puzzlet_dsw_r )
{
- return input_port_read_indexed(machine, 3);
+ return input_port_read(machine, "DSW0");
}
static WRITE16_HANDLER( puzzlet_irq_enable_w )
@@ -2140,7 +2140,7 @@ static ADDRESS_MAP_START( puzzlet_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE( 0x7f2000, 0x7f3fff ) AM_RAM
- AM_RANGE( 0x7f8880, 0x7f8881 ) AM_READ( input_port_1_word_r )
+ AM_RANGE( 0x7f8880, 0x7f8881 ) AM_READ_PORT("IN1")
AM_RANGE( 0x7f8884, 0x7f8885 ) AM_READ( puzzlet_dsw_r )
AM_RANGE( 0x7f8886, 0x7f8887 ) AM_READ( puzzlet_dsw_r )
@@ -2149,12 +2149,12 @@ ADDRESS_MAP_END
static READ8_HANDLER( puzzlet_port7_r )
{
- return input_port_read_indexed(machine,2);
+ return input_port_read(machine, "IN2");
}
static READ8_HANDLER( puzzlet_serB_r )
{
- return input_port_read_indexed(machine,0); // coin
+ return input_port_read(machine, "IN0"); // coin
}
static WRITE8_HANDLER( puzzlet_portb_w )
@@ -2165,7 +2165,7 @@ static WRITE8_HANDLER( puzzlet_portb_w )
static ADDRESS_MAP_START( puzzlet_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE( H8_PORT7, H8_PORT7 ) AM_READ( puzzlet_port7_r )
AM_RANGE( H8_SERIAL_B, H8_SERIAL_B ) AM_READ( puzzlet_serB_r )
- AM_RANGE( H8_PORTB, H8_PORTB ) AM_READWRITE( input_port_3_r, puzzlet_portb_w )
+ AM_RANGE( H8_PORTB, H8_PORTB ) AM_READ_PORT("DSW0") AM_WRITE( puzzlet_portb_w )
ADDRESS_MAP_END
@@ -2249,7 +2249,7 @@ static INPUT_PORTS_START( balcube )
JOY_LSB(1, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN)
JOY_MSB(2, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN)
- PORT_START_TAG("IN2") // Strangely mapped in the 0x400000-0x41ffff range
+ PORT_START_TAG("DSW0") // Strangely mapped in the 0x400000-0x41ffff range
COINAGE_DSW
PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0200, DEF_STR( Easy ) )
@@ -2275,7 +2275,7 @@ static INPUT_PORTS_START( balcube )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x8000, DEF_STR( On ) )
- PORT_START_TAG("IN3") // Strangely mapped in the 0x400000-0x41ffff range
+ PORT_START_TAG("IN2") // Strangely mapped in the 0x400000-0x41ffff range
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused
INPUT_PORTS_END
@@ -2292,7 +2292,7 @@ static INPUT_PORTS_START( bangball )
JOY_LSB(1, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN)
JOY_MSB(2, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN)
- PORT_START_TAG("IN2") // Strangely mapped in the 0xc00000-0xc1ffff range
+ PORT_START_TAG("DSW0") // Strangely mapped in the 0xc00000-0xc1ffff range
COINAGE_DSW
PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0200, DEF_STR( Easy ) )
@@ -2317,7 +2317,7 @@ static INPUT_PORTS_START( bangball )
PORT_DIPSETTING( 0x8000, DEF_STR( Japanese ) )
PORT_DIPSETTING( 0x0000, DEF_STR( English ) )
- PORT_START_TAG("IN3") // Strangely mapped in the 0xc00000-0xc1ffff range
+ PORT_START_TAG("IN2") // Strangely mapped in the 0xc00000-0xc1ffff range
PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN ) // used for debug
INPUT_PORTS_END
@@ -2330,7 +2330,7 @@ static INPUT_PORTS_START( batlbubl )
JOY_LSB(1, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN)
JOY_MSB(2, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN)
- PORT_START_TAG("IN2") // Strangely mapped in the 0xc00000-0xc1ffff range
+ PORT_START_TAG("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 ) )
@@ -2379,7 +2379,7 @@ static INPUT_PORTS_START( batlbubl )
PORT_START_TAG("IN0") // $d00000
COINS
- PORT_START_TAG("IN3") // Strangely mapped in the 0xc00000-0xc1ffff range
+ PORT_START_TAG("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 ) )
@@ -2435,7 +2435,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( blzntrnd )
- PORT_START_TAG("IN0")
+ PORT_START_TAG("DSW0")
PORT_DIPNAME( 0x0007, 0x0004, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0007, "Beginner" )
PORT_DIPSETTING( 0x0006, DEF_STR( Easiest ) )
@@ -2483,7 +2483,7 @@ static INPUT_PORTS_START( blzntrnd )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0004, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0005, DEF_STR( 3C_1C ) )
@@ -2527,15 +2527,15 @@ static INPUT_PORTS_START( blzntrnd )
PORT_DIPSETTING( 0x4000, "4:00" )
PORT_DIPSETTING( 0x0000, "5:00" )
- PORT_START_TAG("IN2")
+ PORT_START_TAG("IN0")
JOY_LSB(1, BUTTON1, BUTTON2, BUTTON3, BUTTON4)
JOY_MSB(2, BUTTON1, BUTTON2, BUTTON3, BUTTON4)
- PORT_START_TAG("IN3")
+ PORT_START_TAG("IN1")
JOY_LSB(3, BUTTON1, BUTTON2, BUTTON3, BUTTON4)
JOY_MSB(4, BUTTON1, BUTTON2, BUTTON3, BUTTON4)
- PORT_START_TAG("IN4")
+ PORT_START_TAG("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)
@@ -2552,7 +2552,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( gstrik2 )
- PORT_START_TAG("IN0")
+ PORT_START_TAG("DSW0")
PORT_DIPNAME( 0x0003, 0x0003, "Player Vs Com" )
PORT_DIPSETTING( 0x0003, "1:00" )
PORT_DIPSETTING( 0x0002, "1:30" )
@@ -2597,7 +2597,7 @@ static INPUT_PORTS_START( gstrik2 )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_SERVICE_NO_TOGGLE(0x8000, IP_ACTIVE_LOW)
- PORT_START_TAG("IN1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x001f, 0x001f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x001c, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x001d, DEF_STR( 3C_1C ) )
@@ -2663,14 +2663,14 @@ static INPUT_PORTS_START( gstrik2 )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN2")
+ PORT_START_TAG("IN0")
JOY_LSB(1, BUTTON1, BUTTON2, BUTTON3, UNUSED)
JOY_MSB(2, BUTTON1, BUTTON2, BUTTON3, UNUSED)
- PORT_START_TAG("IN3")
+ PORT_START_TAG("IN1")
/* Not Used */
- PORT_START_TAG("IN4")
+ PORT_START_TAG("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)
@@ -2704,7 +2704,7 @@ static INPUT_PORTS_START( daitorid )
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("IN2") // $c00004
+ PORT_START_TAG("DSW0") // $c00004
COINAGE_DSW
PORT_DIPNAME( 0x0300, 0x0300, "Timer Speed" )
@@ -2731,7 +2731,7 @@ static INPUT_PORTS_START( daitorid )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN3") // $c00006
+ PORT_START_TAG("IN2") // $c00006
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -2755,7 +2755,7 @@ static INPUT_PORTS_START( dharma )
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("IN2") //$c00004
+ PORT_START_TAG("DSW0") //$c00004
COINAGE_DSW
PORT_DIPNAME( 0x0300, 0x0300, "Time" ) // Check code at 0x00da0a and see notes
@@ -2781,7 +2781,7 @@ static INPUT_PORTS_START( dharma )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN3") // $c00006
+ PORT_START_TAG("IN2") // $c00006
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -2797,7 +2797,7 @@ static INPUT_PORTS_START( gunmast )
JOY_LSB(1, BUTTON1, BUTTON2, BUTTON3, UNKNOWN)
JOY_MSB(2, BUTTON1, BUTTON2, BUTTON3, UNKNOWN)
- PORT_START_TAG("IN2") //$400004
+ PORT_START_TAG("DSW0") //$400004
COINAGE_DSW
PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Difficulty ) )
@@ -2824,7 +2824,7 @@ static INPUT_PORTS_START( gunmast )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START // IN3 - $400006
+ PORT_START_TAG("IN2") // IN3 - $400006
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -2841,7 +2841,7 @@ static INPUT_PORTS_START( karatour )
PORT_START_TAG("IN1") //$400004
COINS
- PORT_START_TAG("IN2") // $400006
+ PORT_START_TAG("DSW0") // $400006
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0001, "1" )
PORT_DIPSETTING( 0x0000, "2" )
@@ -2865,7 +2865,7 @@ static INPUT_PORTS_START( karatour )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN3") // $40000a
+ PORT_START_TAG("DSW1") // $40000a
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) )
@@ -2889,7 +2889,7 @@ static INPUT_PORTS_START( karatour )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_SERVICE( 0x0080, IP_ACTIVE_LOW )
- PORT_START_TAG("IN4") // $40000c
+ PORT_START_TAG("IN2") // $40000c
JOY_LSB(1, BUTTON1, BUTTON2, UNKNOWN, UNKNOWN)
INPUT_PORTS_END
@@ -2898,44 +2898,14 @@ INPUT_PORTS_END
Lady Killer
***************************************************************************/
-#define LKILL_COMMON1\
- PORT_START_TAG("IN0") /*$400002*/\
- JOY_LSB(2, BUTTON1, BUTTON2, UNKNOWN, UNKNOWN)\
- PORT_START_TAG("IN1") /*$400004*/\
- COINS
+static INPUT_PORTS_START( ladykill )
+ PORT_START_TAG("IN0") /*$400002*/
+ JOY_LSB(2, BUTTON1, BUTTON2, UNKNOWN, UNKNOWN)
-#define LKILL_COMMON2\
- PORT_START_TAG("IN3") /*$40000a*/\
- 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_START_TAG("IN4") /*$40000c*/\
- JOY_LSB(1, BUTTON1, BUTTON2, UNKNOWN, UNKNOWN)
+ PORT_START_TAG("IN1") /*$400004*/
+ COINS
-static INPUT_PORTS_START( ladykill )
- LKILL_COMMON1
- PORT_START_TAG("IN2") // $400006
+ PORT_START_TAG("DSW0") // $400006
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0001, "1" )
PORT_DIPSETTING( 0x0000, "2" )
@@ -2956,38 +2926,46 @@ static INPUT_PORTS_START( ladykill )
PORT_DIPNAME( 0x0080, 0x0000, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- LKILL_COMMON2
+ PORT_START_TAG("DSW1") /*$40000a*/
+ 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_START_TAG("IN2") /*$40000c*/
+ JOY_LSB(1, BUTTON1, BUTTON2, UNKNOWN, UNKNOWN)
INPUT_PORTS_END
/* Same as 'ladykill' but NO "Nudity" Dip Switch */
static INPUT_PORTS_START( moegonta )
- LKILL_COMMON1
+ PORT_INCLUDE( ladykill )
- PORT_START_TAG("IN2") // $400006
- PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
- PORT_DIPSETTING( 0x0001, "1" )
- PORT_DIPSETTING( 0x0000, "2" )
- PORT_DIPSETTING( 0x0003, "3" )
- PORT_DIPSETTING( 0x0002, "4" )
- PORT_DIPNAME( 0x000c, 0x000c, DEF_STR( Difficulty ) )
- PORT_DIPSETTING( 0x0008, DEF_STR( Easy ) )
- PORT_DIPSETTING( 0x000c, DEF_STR( Normal ) )
- PORT_DIPSETTING( 0x0004, DEF_STR( Hard ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( Very_Hard ) )
+ PORT_MODIFY("DSW0") // $400006
PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x0010, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_SERVICE( 0x0020, IP_ACTIVE_LOW )
- PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Allow_Continue ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( No ) )
- PORT_DIPSETTING( 0x0040, DEF_STR( Yes ) )
- PORT_DIPNAME( 0x0080, 0x0000, DEF_STR( Demo_Sounds ) )
- PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
-
- LKILL_COMMON2
- INPUT_PORTS_END
+INPUT_PORTS_END
/***************************************************************************
@@ -2998,25 +2976,25 @@ static INPUT_PORTS_START( moegonta )
So WHY can't the game display cards instead of mahjong tiles ?
Is it due to different GFX ROMS or to an emulation bug ?
*/
-#define LFORT_COMMON\
- PORT_START_TAG("IN0")/*$c00004*/\
- COINS\
- PORT_START_TAG("IN1")/*$c00006*/\
- JOY_LSB(1, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN) /* BUTTON2 and BUTTON3 in "test mode" only*/\
- PORT_START_TAG("IN2")/*$c00008*/\
- JOY_LSB(2, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN) /*BUTTON2 and BUTTON3 in "test mode" only*/\
- PORT_START_TAG("IN3")/*$c0000a*/\
- COINAGE_DSW\
-
static INPUT_PORTS_START( lastfort )
- LFORT_COMMON
+ PORT_START_TAG("IN0") /*$c00004*/
+ COINS
+
+ PORT_START_TAG("IN1") /*$c00006*/
+ JOY_LSB(1, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN) /* BUTTON2 and BUTTON3 in "test mode" only*/
+
+ PORT_START_TAG("IN2") /*$c00008*/
+ JOY_LSB(2, BUTTON1, UNKNOWN, UNKNOWN, UNKNOWN) /*BUTTON2 and BUTTON3 in "test mode" only*/
+
+ PORT_START_TAG("DSW0") /*$c0000a*/
+ COINAGE_DSW
- PORT_START_TAG("IN4")// $c0000c
- PORT_DIPNAME( 0x0300, 0x0300, "Timer Speed" )
- PORT_DIPSETTING( 0x0200, "Slower" )
- PORT_DIPSETTING( 0x0300, DEF_STR( Normal ) )
- PORT_DIPSETTING( 0x0100, "Fast" )
+ PORT_START_TAG("DSW1") // $c0000c
+ PORT_DIPNAME( 0x0003, 0x0003, "Timer Speed" )
+ PORT_DIPSETTING( 0x0002, "Slower" )
+ PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
+ PORT_DIPSETTING( 0x0001, "Fast" )
PORT_DIPSETTING( 0x0000, "Fastest" )
PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x0004, DEF_STR( Off ) )
@@ -3037,7 +3015,7 @@ static INPUT_PORTS_START( lastfort )
PORT_DIPSETTING( 0x0080, "Mahjong" )
// PORT_DIPSETTING( 0x0000, "Cards" ) // Not working - See notes
- PORT_START_TAG("IN5")// $c0000e
+ PORT_START_TAG("IN3") // $c0000e
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -3048,35 +3026,17 @@ INPUT_PORTS_END
/* Same as 'lastfort' but WORKING "Tiles" Dip Switch */
static INPUT_PORTS_START( lastfero )
- LFORT_COMMON
-
- PORT_START // IN4 - $c0000c
+ PORT_INCLUDE( lastfort )
+
+ PORT_MODIFY("DSW1")
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) // Timer speed
PORT_DIPSETTING( 0x0000, DEF_STR( Easiest ) ) // Slowest
PORT_DIPSETTING( 0x0001, DEF_STR( Easy ) ) // Slow
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) ) // Normal
PORT_DIPSETTING( 0x0002, DEF_STR( Hard ) ) // Fast
- PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x0004, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0008, 0x0008, "Retry Level On Continue" )
- PORT_DIPSETTING( 0x0008, "Ask Player" )
- PORT_DIPSETTING( 0x0000, DEF_STR( Yes ) )
- PORT_DIPNAME( 0x0010, 0x0010, "2 Players Game" )
- PORT_DIPSETTING( 0x0010, "2 Credits" )
- PORT_DIPSETTING( 0x0000, "1 Credit" )
- PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Allow_Continue ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( No ) )
- PORT_DIPSETTING( 0x0020, DEF_STR( Yes ) )
- PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Demo_Sounds ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0040, DEF_STR( On ) )
PORT_DIPNAME( 0x0080, 0x0080, "Tiles" )
PORT_DIPSETTING( 0x0080, "Mahjong" )
PORT_DIPSETTING( 0x0000, "Cards" )
-
- PORT_START // IN5 - $c0000e
- PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -3084,66 +3044,70 @@ INPUT_PORTS_END
Mahjong Doukyuusei
***************************************************************************/
-#define MAHJONG_PANEL\
- PORT_START_TAG("IN0")\
- 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 )\
- PORT_BIT(0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_I )\
- PORT_BIT(0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_M )\
- PORT_BIT(0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )\
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_START1 )\
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )\
- PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )\
- PORT_START_TAG("IN1")\
- 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 )\
- PORT_BIT(0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_J )\
- PORT_BIT(0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_N )\
- PORT_BIT(0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )\
- 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_TAG("IN2")\
- 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 )\
- PORT_BIT(0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_K )\
- PORT_BIT(0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )\
- PORT_BIT(0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_RON )\
- 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_TAG("IN3")\
- 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 )\
- PORT_BIT(0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_L )\
- PORT_BIT(0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_PON )\
- 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( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )\
- PORT_START_TAG("IN4")\
- PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )\
- PORT_START_TAG("IN5")\
- 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 )\
- PORT_SERVICE_NO_TOGGLE(0x0008, IP_ACTIVE_LOW )\
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN )\
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN )\
- PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )\
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )\
+static INPUT_PORTS_START( mj_panel )
+ PORT_START_TAG("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 )
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_I )
+ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_M )
+ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
+ PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START_TAG("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 )
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_J )
+ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_N )
+ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
+ 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_TAG("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 )
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_K )
+ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
+ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
+ 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_TAG("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 )
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_L )
+ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
+ 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( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_START_TAG("KEY4")
+ PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_START_TAG("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 )
+ PORT_SERVICE_NO_TOGGLE(0x0008, IP_ACTIVE_LOW )
+ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ 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( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
+INPUT_PORTS_END
static INPUT_PORTS_START( dokyusei )
- MAHJONG_PANEL
+ PORT_INCLUDE( mj_panel )
- PORT_START_TAG("IN6") // $478884.w
+ PORT_START_TAG("DSW0") // $478884.w
PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0300, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0200, DEF_STR( Normal ) )
@@ -3168,7 +3132,7 @@ static INPUT_PORTS_START( dokyusei )
PORT_DIPSETTING( 0x8000, DEF_STR( No ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Yes ) )
- PORT_START_TAG("IN7") // $478886.w
+ PORT_START_TAG("DSW1") // $478886.w
PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0100, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -3202,7 +3166,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( gakusai )
-MAHJONG_PANEL
+ PORT_INCLUDE( mj_panel )
INPUT_PORTS_END
@@ -3240,7 +3204,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("IN2") //$478884
+ PORT_START_TAG("DSW0") //$478884
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Free_Play ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -3287,7 +3251,7 @@ static INPUT_PORTS_START( mouja )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN3") //$478886
+ PORT_START_TAG("IN2") //$478886
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -3306,10 +3270,10 @@ static INPUT_PORTS_START( pangpoms )
PORT_START_TAG("IN2") //$800008
JOY_LSB(2, BUTTON1, BUTTON2, UNKNOWN, UNKNOWN)
- PORT_START_TAG("IN3") //$80000a
+ PORT_START_TAG("DSW0") //$80000a
COINAGE_DSW
- PORT_START_TAG("IN4") //$80000c
+ PORT_START_TAG("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
@@ -3332,7 +3296,7 @@ static INPUT_PORTS_START( pangpoms )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0080, DEF_STR( On ) )
- PORT_START_TAG("IN5") //$80000e
+ PORT_START_TAG("IN3") //$80000e
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -3349,7 +3313,7 @@ static INPUT_PORTS_START( poitto )
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("IN2") //$800004
+ PORT_START_TAG("DSW0") //$800004
COINAGE_DSW
PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Difficulty ) )
@@ -3376,7 +3340,7 @@ static INPUT_PORTS_START( poitto )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN3") //$800006
+ PORT_START_TAG("IN2") //$800006
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -3386,7 +3350,7 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( puzzlet )
- PORT_START // IN0 - ser B
+ PORT_START_TAG("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 )
@@ -3396,7 +3360,7 @@ static INPUT_PORTS_START( puzzlet )
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START // IN1 - 7f8880.w
+ PORT_START_TAG("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 )
@@ -3415,7 +3379,7 @@ static INPUT_PORTS_START( puzzlet )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START // IN2 - port 7
+ PORT_START_TAG("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)
@@ -3425,7 +3389,7 @@ static INPUT_PORTS_START( puzzlet )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START // IN3 - dsw?
+ PORT_START_TAG("DSW0") // IN3 - dsw?
PORT_DIPUNKNOWN( 0x0001, 0x0001 )
PORT_DIPUNKNOWN( 0x0002, 0x0002 )
PORT_DIPUNKNOWN( 0x0004, 0x0004 )
@@ -3458,7 +3422,7 @@ static INPUT_PORTS_START( puzzli )
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("IN2") //$c00004
+ PORT_START_TAG("DSW0") //$c00004
COINAGE_DSW
PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Difficulty ) )
@@ -3485,7 +3449,7 @@ static INPUT_PORTS_START( puzzli )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN3") //$c00006
+ PORT_START_TAG("IN2") //$c00006
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -3502,7 +3466,7 @@ static INPUT_PORTS_START( 3kokushi )
JOY_LSB(1, BUTTON1, BUTTON2, UNKNOWN, UNKNOWN)
JOY_MSB(2, BUTTON1, BUTTON2, UNKNOWN, UNKNOWN)
- PORT_START_TAG("IN2") //$c00004
+ PORT_START_TAG("DSW0") //$c00004
PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x0000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 2C_1C ) )
@@ -3564,7 +3528,7 @@ static INPUT_PORTS_START( pururun )
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("IN2") //$400004
+ PORT_START_TAG("DSW0") //$400004
COINAGE_DSW
PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Difficulty ) ) // Distance to goal
@@ -3591,7 +3555,7 @@ static INPUT_PORTS_START( pururun )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START // IN3 - $400006
+ PORT_START_TAG("IN2") // IN3 - $400006
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -3625,10 +3589,10 @@ static INPUT_PORTS_START( skyalert )
PORT_START_TAG("IN2") //$400008
JOY_LSB(2, BUTTON1, BUTTON2, UNKNOWN, UNKNOWN) // BUTTON3 in "test mode" only
- PORT_START_TAG("IN3") //$40000a
+ PORT_START_TAG("DSW0") //$40000a
COINAGE_DSW
- PORT_START_TAG("IN4") //$40000c
+ PORT_START_TAG("DSW1") //$40000c
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) )
@@ -3651,7 +3615,7 @@ static INPUT_PORTS_START( skyalert )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0080, DEF_STR( On ) )
- PORT_START_TAG("IN5") //$40000e
+ PORT_START_TAG("IN3") //$40000e
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
@@ -3672,7 +3636,7 @@ static INPUT_PORTS_START( toride2g )
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("IN2") //$800004
+ PORT_START_TAG("DSW0") //$800004
COINAGE_DSW
PORT_DIPNAME( 0x0300, 0x0300, "Timer Speed" )
@@ -3699,7 +3663,7 @@ static INPUT_PORTS_START( toride2g )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START_TAG("IN3") //$800006
+ PORT_START_TAG("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 6381e432a9b..917e68f9be2 100644
--- a/src/mame/drivers/mexico86.c
+++ b/src/mame/drivers/mexico86.c
@@ -78,7 +78,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xe7ff) AM_READ(shared_r) /* shared with sound cpu */
AM_RANGE(0xe800, 0xe8ff) AM_READ(SMH_RAM) /* protection ram */
AM_RANGE(0xe900, 0xefff) AM_READ(SMH_RAM)
- AM_RANGE(0xf010, 0xf010) AM_READ(input_port_5_r)
+ AM_RANGE(0xf010, 0xf010) AM_READ_PORT("IN3")
AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM) /* communication ram - to connect 4 players's subboard */
ADDRESS_MAP_END
@@ -115,7 +115,7 @@ static ADDRESS_MAP_START( m68705_readmem, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x0000, 0x0000) AM_READ(mexico86_68705_portA_r)
AM_RANGE(0x0001, 0x0001) AM_READ(mexico86_68705_portB_r)
- AM_RANGE(0x0002, 0x0002) AM_READ(input_port_0_r) /* COIN */
+ AM_RANGE(0x0002, 0x0002) AM_READ_PORT("IN0") /* COIN */
AM_RANGE(0x0010, 0x007f) AM_READ(SMH_RAM)
AM_RANGE(0x0080, 0x07ff) AM_READ(SMH_ROM)
ADDRESS_MAP_END
@@ -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 /* IN0 */
+ PORT_START_TAG("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 /* IN1 */
+ PORT_START_TAG("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 /* IN2 */
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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 /* IN0 */
+ PORT_START_TAG("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 /* IN1 */
+ PORT_START_TAG("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 /* IN2 */
+ PORT_START_TAG("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 /* DSW0 */
+ PORT_START_TAG("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 /* DSW1 */
+ PORT_START_TAG("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
+ PORT_START_TAG("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 8ee2b5c8ee1..776777f1192 100644
--- a/src/mame/drivers/mgolf.c
+++ b/src/mame/drivers/mgolf.c
@@ -72,7 +72,7 @@ static VIDEO_UPDATE( mgolf )
static void update_plunger(running_machine *machine)
{
- UINT8 val = input_port_read_indexed(machine, 5);
+ UINT8 val = input_port_read(machine, "BUTTON");
if (prev != val)
{
@@ -137,13 +137,13 @@ static READ8_HANDLER( mgolf_wram_r )
static READ8_HANDLER( mgolf_dial_r )
{
- UINT8 val = input_port_read_indexed(machine, 1);
+ UINT8 val = input_port_read(machine, "41");
- if ((input_port_read_indexed(machine, 4) + 0x00) & 0x20)
+ if ((input_port_read(machine, "DIAL") + 0x00) & 0x20)
{
val |= 0x01;
}
- if ((input_port_read_indexed(machine, 4) + 0x10) & 0x20)
+ if ((input_port_read(machine, "DIAL") + 0x10) & 0x20)
{
val |= 0x02;
}
@@ -156,7 +156,7 @@ static READ8_HANDLER( mgolf_misc_r )
{
double plunger = calc_plunger_pos(); /* see Video Pinball */
- UINT8 val = input_port_read_indexed(machine, 3);
+ UINT8 val = input_port_read(machine, "61");
if (plunger >= 0.000 && plunger <= 0.001)
{
@@ -181,9 +181,9 @@ static WRITE8_HANDLER( mgolf_wram_w )
static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
- AM_RANGE(0x0040, 0x0040) AM_READ(input_port_0_r)
+ AM_RANGE(0x0040, 0x0040) AM_READ_PORT("40")
AM_RANGE(0x0041, 0x0041) AM_READ(mgolf_dial_r)
- AM_RANGE(0x0060, 0x0060) AM_READ(input_port_2_r)
+ AM_RANGE(0x0060, 0x0060) AM_READ_PORT("60")
AM_RANGE(0x0061, 0x0061) AM_READ(mgolf_misc_r)
AM_RANGE(0x0080, 0x00ff) AM_READ(mgolf_wram_r)
AM_RANGE(0x0180, 0x01ff) AM_READ(mgolf_wram_r)
@@ -210,40 +210,40 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mgolf )
- PORT_START /* 40 */
+ PORT_START_TAG("40") /* 40 */
PORT_DIPNAME( 0x30, 0x00, DEF_STR( Language ) )
- PORT_DIPSETTING( 0x00, DEF_STR( English ) )
- PORT_DIPSETTING( 0x10, DEF_STR( French ) )
- PORT_DIPSETTING( 0x20, DEF_STR( Spanish ) )
- PORT_DIPSETTING( 0x30, DEF_STR( German ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( English ) )
+ PORT_DIPSETTING( 0x10, DEF_STR( French ) )
+ PORT_DIPSETTING( 0x20, DEF_STR( Spanish ) )
+ PORT_DIPSETTING( 0x30, DEF_STR( German ) )
PORT_DIPNAME( 0xc0, 0x40, "Shots per Coin" )
- PORT_DIPSETTING( 0x00, "25" )
- PORT_DIPSETTING( 0x40, "30" )
- PORT_DIPSETTING( 0x80, "35" )
- PORT_DIPSETTING( 0xc0, "40" )
+ PORT_DIPSETTING( 0x00, "25" )
+ PORT_DIPSETTING( 0x40, "30" )
+ PORT_DIPSETTING( 0x80, "35" )
+ PORT_DIPSETTING( 0xc0, "40" )
- PORT_START /* 41 */
+ PORT_START_TAG("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 /* 60 */
+ PORT_START_TAG("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 /* 61 */
+ PORT_START_TAG("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
+ PORT_START_TAG("DIAL")
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(25)
- PORT_START
+ PORT_START_TAG("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 cb5717859e1..8f6f138edf4 100644
--- a/src/mame/drivers/mhavoc.c
+++ b/src/mame/drivers/mhavoc.c
@@ -280,17 +280,17 @@ ADDRESS_MAP_END
*************************************/
static ADDRESS_MAP_START( gamma_map, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x07ff) AM_RAM /* Program RAM (2K) */
+ AM_RANGE(0x0000, 0x07ff) AM_RAM /* Program RAM (2K) */
AM_RANGE(0x0800, 0x0fff) AM_RAM AM_MIRROR (0x1800)
- AM_RANGE(0x2000, 0x203f) AM_READWRITE(quad_pokey_r, quad_pokey_w) /* Quad Pokey read */
- AM_RANGE(0x2800, 0x2800) AM_READ(mhavoc_port_1_r) /* Gamma Input Port */
- AM_RANGE(0x3000, 0x3000) AM_READ(mhavoc_alpha_r) /* Alpha Comm. Read Port*/
- AM_RANGE(0x3800, 0x3803) AM_READ(input_port_2_r) /* Roller Controller Input*/
- AM_RANGE(0x4000, 0x4000) AM_READWRITE(input_port_4_r, mhavoc_gamma_irq_ack_w) /* DSW at 8S, IRQ Acknowledge*/
- AM_RANGE(0x4800, 0x4800) AM_WRITE(mhavoc_out_1_w) /* Coin Counters */
- AM_RANGE(0x5000, 0x5000) AM_WRITE(mhavoc_alpha_w) /* Alpha Comm. Write Port */
- AM_RANGE(0x6000, 0x61ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* EEROM */
- AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) /* Program ROM (16K) */
+ AM_RANGE(0x2000, 0x203f) AM_READWRITE(quad_pokey_r, quad_pokey_w) /* Quad Pokey read */
+ AM_RANGE(0x2800, 0x2800) AM_READ(mhavoc_port_1_r) /* Gamma Input Port */
+ AM_RANGE(0x3000, 0x3000) AM_READ(mhavoc_alpha_r) /* Alpha Comm. Read Port*/
+ AM_RANGE(0x3800, 0x3803) AM_READ_PORT("DIAL") /* Roller Controller Input*/
+ AM_RANGE(0x4000, 0x4000) AM_READ_PORT("DSW2") AM_WRITE(mhavoc_gamma_irq_ack_w) /* DSW at 8S, IRQ Acknowledge*/
+ AM_RANGE(0x4800, 0x4800) AM_WRITE(mhavoc_out_1_w) /* Coin Counters */
+ AM_RANGE(0x5000, 0x5000) AM_WRITE(mhavoc_alpha_w) /* Alpha Comm. Write Port */
+ AM_RANGE(0x6000, 0x61ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* EEROM */
+ AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) /* Program ROM (16K) */
ADDRESS_MAP_END
@@ -309,21 +309,21 @@ static ADDRESS_MAP_START( alphaone_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0a00, 0x0fff) AM_RAMBANK(1) AM_BASE(&mhavoc_zram1)
AM_RANGE(0x1020, 0x103f) AM_READWRITE(dual_pokey_r, dual_pokey_w)
AM_RANGE(0x1040, 0x1040) AM_READWRITE(alphaone_port_0_r, SMH_NOP) /* Alpha Input Port 0 */
- AM_RANGE(0x1060, 0x1060) AM_READ(input_port_1_r) /* Gamma Input Port */
- AM_RANGE(0x1080, 0x1080) AM_READ(input_port_2_r) /* Roller Controller Input*/
- AM_RANGE(0x10a0, 0x10a0) AM_WRITE(alphaone_out_0_w) /* Control Signals */
- AM_RANGE(0x10a4, 0x10a4) AM_WRITE(avgdvg_go_w) /* Vector Generator GO */
- AM_RANGE(0x10a8, 0x10a8) AM_WRITE(watchdog_reset_w) /* Watchdog Clear */
- AM_RANGE(0x10ac, 0x10ac) AM_WRITE(avgdvg_reset_w) /* Vector Generator Reset */
- AM_RANGE(0x10b0, 0x10b0) AM_WRITE(mhavoc_alpha_irq_ack_w) /* IRQ ack */
+ AM_RANGE(0x1060, 0x1060) AM_READ_PORT("IN1") /* Gamma Input Port */
+ AM_RANGE(0x1080, 0x1080) AM_READ_PORT("DIAL") /* Roller Controller Input*/
+ AM_RANGE(0x10a0, 0x10a0) AM_WRITE(alphaone_out_0_w) /* Control Signals */
+ AM_RANGE(0x10a4, 0x10a4) AM_WRITE(avgdvg_go_w) /* Vector Generator GO */
+ AM_RANGE(0x10a8, 0x10a8) AM_WRITE(watchdog_reset_w) /* Watchdog Clear */
+ AM_RANGE(0x10ac, 0x10ac) AM_WRITE(avgdvg_reset_w) /* Vector Generator Reset */
+ AM_RANGE(0x10b0, 0x10b0) AM_WRITE(mhavoc_alpha_irq_ack_w) /* IRQ ack */
AM_RANGE(0x10b4, 0x10b4) AM_WRITE(mhavoc_rom_banksel_w)
AM_RANGE(0x10b8, 0x10b8) AM_WRITE(mhavoc_ram_banksel_w)
- AM_RANGE(0x10e0, 0x10ff) AM_WRITE(SMH_RAM) AM_BASE(&mhavoc_colorram) /* ColorRAM */
- AM_RANGE(0x1800, 0x18ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* EEROM */
- AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(2) /* Paged Program ROM (32K) */
+ AM_RANGE(0x10e0, 0x10ff) AM_WRITE(SMH_RAM) AM_BASE(&mhavoc_colorram) /* ColorRAM */
+ AM_RANGE(0x1800, 0x18ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* EEROM */
+ AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(2) /* Paged Program ROM (32K) */
AM_RANGE(0x4000, 0x4fff) AM_RAM AM_BASE(&vectorram) AM_SIZE(&vectorram_size) AM_REGION(REGION_CPU1, 0x4000) /* Vector Generator RAM */
- AM_RANGE(0x5000, 0x7fff) AM_ROM /* Vector ROM */
- AM_RANGE(0x8000, 0xffff) AM_ROM /* Program ROM (32K) */
+ AM_RANGE(0x5000, 0x7fff) AM_ROM /* Vector ROM */
+ AM_RANGE(0x8000, 0xffff) AM_ROM /* Program ROM (32K) */
ADDRESS_MAP_END
@@ -335,7 +335,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( mhavoc )
- PORT_START /* IN0 - alpha (player_1 = 0) */
+ PORT_START_TAG("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 /* IN1 - gamma */
+ PORT_START_TAG("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 /* IN2 - gamma */
+ PORT_START_TAG("DIAL") /* IN2 - gamma */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(40) PORT_REVERSE
- PORT_START /* DIP Switch at position 13/14S */
+ PORT_START_TAG("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 /* DIP Switch at position 8S */
+ PORT_START_TAG("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 /* IN5 - dummy for player_1 = 1 on alpha */
+ PORT_START_TAG("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 /* IN0 - alpha (player_1 = 0) */
+ PORT_START_TAG("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 /* IN1 - gamma */
+ PORT_START_TAG("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 /* IN2 - gamma */
+ PORT_START_TAG("DIAL") /* IN2 - gamma */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(40) PORT_REVERSE
- PORT_START /* DIP Switch at position 13/14S */
+ PORT_START_TAG("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 /* DIP Switch at position 8S */
+ PORT_START_TAG("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 /* IN5 - dummy for player_1 = 1 on alpha */
+ PORT_START_TAG("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 /* IN0 - alpha (player_1 = 0) */
+ PORT_START_TAG("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 /* IN1 - gamma */
+ PORT_START_TAG("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 /* IN2 - gamma */
+ PORT_START_TAG("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 83f919ca468..76851dae317 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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("SOUND")
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Sound PCB Test") PORT_CODE(KEYCODE_F1)
INPUT_PORTS_END
@@ -739,37 +739,37 @@ static WRITE16_HANDLER( reset_slave )
/* Reset peripherals flip-flop MIGHT be 900000 */
static ADDRESS_MAP_START( hostmem, ADDRESS_SPACE_PROGRAM, 16 )
- AM_RANGE(0x000000, 0x13ffff) AM_ROM /* 68000 Code ROM and Dr. Math object data */
- AM_RANGE(0x200000, 0x20ffff) AM_RAM /* Battery-backed SRAM (64kB) & DS1215 */
- AM_RANGE(0x800000, 0x83ffff) AM_RAM /* 68000/AM29000 shared RAM (256kB) */
- AM_RANGE(0x900000, 0x900001) AM_NOP //WRITE(mystery_w) /* ??????? 16-bit write here. rset? */
- AM_RANGE(0x920000, 0x920001) AM_READ(input_port_1_word_r) /* User inputs C and D */
- AM_RANGE(0x940000, 0x940001) AM_READ(input_port_0_word_r) /* User inputs A and B */
- AM_RANGE(0x960000, 0x960001) AM_NOP /* Lamps */
- AM_RANGE(0x980000, 0x980001) AM_RAM /* ADC0844 */
- AM_RANGE(0x9a0000, 0x9a0007) AM_READWRITE(tms_host_r, tms_host_w) /* TMS34010 Interface */
- AM_RANGE(0x9c0000, 0x9c0001) AM_RAM /* ????? Write: 80, A0 and 00 (8-bit high byte) */
- AM_RANGE(0x9e0000, 0x9e00cf) AM_RAM_WRITE(m68901_w) AM_BASE(&m68901_base) /* 68901 Multifunction Peripheral */
- AM_RANGE(0xa00000, 0xa000cf) AM_READWRITE(m68681_r, m68681_w) AM_BASE(&m68681_base) /* 68681 UART */
- AM_RANGE(0xa20000, 0xa20001) AM_RAM /* XY joystick input - sign? */
- AM_RANGE(0xa40002, 0xa40003) AM_RAM /* XY joystick input - actual values */
+ AM_RANGE(0x000000, 0x13ffff) AM_ROM /* 68000 Code ROM and Dr. Math object data */
+ AM_RANGE(0x200000, 0x20ffff) AM_RAM /* Battery-backed SRAM (64kB) & DS1215 */
+ AM_RANGE(0x800000, 0x83ffff) AM_RAM /* 68000/AM29000 shared RAM (256kB) */
+ AM_RANGE(0x900000, 0x900001) AM_NOP //WRITE(mystery_w) /* ??????? 16-bit write here. rset? */
+ AM_RANGE(0x920000, 0x920001) AM_READ_PORT("IN1") /* User inputs C and D */
+ AM_RANGE(0x940000, 0x940001) AM_READ_PORT("IN0") /* User inputs A and B */
+ AM_RANGE(0x960000, 0x960001) AM_NOP /* Lamps */
+ AM_RANGE(0x980000, 0x980001) AM_RAM /* ADC0844 */
+ AM_RANGE(0x9a0000, 0x9a0007) AM_READWRITE(tms_host_r, tms_host_w) /* TMS34010 Interface */
+ AM_RANGE(0x9c0000, 0x9c0001) AM_RAM /* ????? Write: 80, A0 and 00 (8-bit high byte) */
+ AM_RANGE(0x9e0000, 0x9e00cf) AM_RAM_WRITE(m68901_w) AM_BASE(&m68901_base) /* 68901 Multifunction Peripheral */
+ AM_RANGE(0xa00000, 0xa000cf) AM_READWRITE(m68681_r, m68681_w) AM_BASE(&m68681_base) /* 68681 UART */
+ AM_RANGE(0xa20000, 0xa20001) AM_RAM /* XY joystick input - sign? */
+ AM_RANGE(0xa40002, 0xa40003) AM_RAM /* XY joystick input - actual values */
ADDRESS_MAP_END
// 2600000: Write 1E and 9E?
static ADDRESS_MAP_START( vgbmem, ADDRESS_SPACE_PROGRAM, 16 )
- AM_RANGE(0x00000000, 0x007fffff) AM_RAM AM_BASE(&micro3d_sprite_vram) // 2 Banks
- AM_RANGE(0x00800000, 0x00bfffff) AM_RAM /* 512kB Main DRAM */
- AM_RANGE(0x00c00000, 0x00c0000f) AM_READ(input_port_2_word_r) /* TI Monitor Mode switch */
- AM_RANGE(0x00e00000, 0x00e0000f) AM_RAM //WRITE(mystery2_w) /* CREGCLK ??? byte write here. */
- AM_RANGE(0x02000000, 0x0200ffff) AM_RAM_WRITE(paletteram16_BBBBBRRRRRGGGGGG_word_w) AM_BASE(&paletteram16) // AM_RANGE(0x02010000, 0x027fffff) AM_RAM // ??????????? Mirror of VRAM???
- AM_RANGE(0x02600000, 0x0260000f) AM_RAM // XFER3dk???? 16-bit write
- AM_RANGE(0x02c00000, 0x02c0003f) AM_READ(ti_uart_r) /* SCN UART */
+ AM_RANGE(0x00000000, 0x007fffff) AM_RAM AM_BASE(&micro3d_sprite_vram) /* 2 Banks */
+ AM_RANGE(0x00800000, 0x00bfffff) AM_RAM /* 512kB Main DRAM */
+ AM_RANGE(0x00c00000, 0x00c0000f) AM_READ_PORT("VGB") /* TI Monitor Mode switch */
+ AM_RANGE(0x00e00000, 0x00e0000f) AM_RAM //WRITE(mystery2_w) /* CREGCLK ??? byte write here. */
+ AM_RANGE(0x02000000, 0x0200ffff) AM_RAM_WRITE(paletteram16_BBBBBRRRRRGGGGGG_word_w) AM_BASE(&paletteram16) // AM_RANGE(0x02010000, 0x027fffff) AM_RAM /* ??????????? Mirror of VRAM??? */
+ AM_RANGE(0x02600000, 0x0260000f) AM_RAM /* XFER3dk???? 16-bit write */
+ AM_RANGE(0x02c00000, 0x02c0003f) AM_READ(ti_uart_r) /* SCN UART */
AM_RANGE(0x02e00000, 0x02e0003f) AM_WRITE(ti_uart_w)
- AM_RANGE(0x03800000, 0x03dfffff) AM_ROM AM_REGION(REGION_GFX1, 0) /* 2D Graphics ROMs */
- AM_RANGE(0x03e00000, 0x03ffffff) AM_ROM AM_REGION(REGION_USER1, 0) /* 128kB Program ROM */
+ AM_RANGE(0x03800000, 0x03dfffff) AM_ROM AM_REGION(REGION_GFX1, 0) /* 2D Graphics ROMs */
+ AM_RANGE(0x03e00000, 0x03ffffff) AM_ROM AM_REGION(REGION_USER1, 0) /* 128kB Program ROM */
AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE(tms34010_io_register_r, tms34010_io_register_w)
- AM_RANGE(0xffe00000, 0xffffffff) AM_ROM AM_REGION(REGION_USER1, 0) /* 128kB Program ROM (Mirror - for interrupt vectors) */
+ AM_RANGE(0xffe00000, 0xffffffff) AM_ROM AM_REGION(REGION_USER1, 0) /* 128kB Program ROM (Mirror - for interrupt vectors) */
ADDRESS_MAP_END
@@ -811,7 +811,7 @@ static READ8_HANDLER(sound_io_r)
switch(offset)
{
- case 0x01: return input_port_read_indexed(machine, 3); /* Test push switch */
+ case 0x01: return input_port_read_safe(machine, "SOUND", 0); /* Test push switch */
case 0x03: return (int)(upd7759_0_busy_r(machine,0))<<3;
default: return 0;
}
diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c
index 2fdfbf47acb..d13cd769020 100644
--- a/src/mame/drivers/midas.c
+++ b/src/mame/drivers/midas.c
@@ -180,7 +180,7 @@ static VIDEO_UPDATE( livequiz )
static READ16_HANDLER( livequiz_eeprom_r )
{
- return input_port_read_indexed(machine, 2) | (eeprom_read_bit() << 3);
+ return input_port_read(machine, "IN2") | (eeprom_read_bit() << 3);
}
static WRITE16_HANDLER( livequiz_eeprom_w )
@@ -225,10 +225,10 @@ static WRITE16_HANDLER( livequiz_gfxregs_w )
static ADDRESS_MAP_START( mem_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
- AM_RANGE(0x900000, 0x900001) AM_READ( input_port_5_word_r )
+ AM_RANGE(0x900000, 0x900001) AM_READ_PORT("IN5")
AM_RANGE(0x920000, 0x920001) AM_READ( livequiz_eeprom_r )
- AM_RANGE(0x940000, 0x940001) AM_READ( input_port_0_word_r )
- AM_RANGE(0x980000, 0x980001) AM_READ( input_port_1_word_r )
+ AM_RANGE(0x940000, 0x940001) AM_READ_PORT("IN0")
+ AM_RANGE(0x980000, 0x980001) AM_READ_PORT("IN1")
AM_RANGE(0x9a0000, 0x9a0001) AM_WRITE( livequiz_eeprom_w )
@@ -245,8 +245,8 @@ static ADDRESS_MAP_START( mem_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xb80008, 0xb80009) AM_WRITE( YMZ280B_register_0_lsb_w )
AM_RANGE(0xb8000a, 0xb8000b) AM_READWRITE( YMZ280B_status_0_lsb_r, YMZ280B_data_0_lsb_w )
- AM_RANGE(0xba0000, 0xba0001) AM_READ( input_port_4_word_r )
- AM_RANGE(0xbc0000, 0xbc0001) AM_READ( input_port_3_word_r )
+ AM_RANGE(0xba0000, 0xba0001) AM_READ_PORT("IN4")
+ AM_RANGE(0xbc0000, 0xbc0001) AM_READ_PORT("IN3")
AM_RANGE(0xd00000, 0xd1ffff) AM_RAM
@@ -293,7 +293,7 @@ GFXDECODE_END
static INPUT_PORTS_START( livequiz )
- PORT_START // IN0
+ PORT_START_TAG("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 // IN1
+ PORT_START_TAG("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 // IN2
+ PORT_START_TAG("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 // IN3
+ PORT_START_TAG("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 // IN4
+ PORT_START_TAG("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 // IN5 - 900000
+ PORT_START_TAG("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 518875393e5..e2a1bc1a902 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
+ 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)
@@ -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
+ PORT_START_TAG("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
+ PORT_START_TAG("IN2")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START_TAG("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
+ 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)
@@ -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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ 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)
@@ -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
+ PORT_START_TAG("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
+ 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)
@@ -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 /* DS1 */
+ PORT_START_TAG("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
+ 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)
@@ -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
+ PORT_START_TAG("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
+ 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)
@@ -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 /* DS1 */
+ PORT_START_TAG("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
+ 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)
@@ -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
+ PORT_START_TAG("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
+ 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)
@@ -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 /* DS1 */
+ PORT_START_TAG("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 ccee383c6f5..c3989416ae1 100644
--- a/src/mame/drivers/midvunit.c
+++ b/src/mame/drivers/midvunit.c
@@ -103,7 +103,7 @@ static MACHINE_RESET( midvplus )
static READ32_HANDLER( port0_r )
{
- UINT16 val = input_port_read_indexed(machine, 0);
+ UINT16 val = input_port_read(machine, "IN0");
UINT16 diff = val ^ last_port0;
/* make sure the shift controls are mutually exclusive */
@@ -125,13 +125,13 @@ static READ32_HANDLER( port0_r )
static READ32_HANDLER( port1_r )
{
- return (input_port_read_indexed(machine, 1) << 16) | input_port_read_indexed(machine, 1);
+ return (input_port_read(machine, "IN1") << 16) | input_port_read(machine, "IN1");
}
static READ32_HANDLER( port2_r )
{
- return (input_port_read_indexed(machine, 2) << 16) | input_port_read_indexed(machine, 2);
+ return (input_port_read(machine, "DSW") << 16) | input_port_read(machine, "DSW");
}
@@ -163,12 +163,14 @@ static TIMER_CALLBACK( adc_ready )
static WRITE32_HANDLER( midvunit_adc_w )
{
+ static const char *adcnames[] = { "WHEEL", "ACCEL", "BRAKE" };
+
if (!(control_data & 0x20))
{
int which = (data >> adc_shift) - 4;
if (which < 0 || which > 2)
logerror("adc_w: unexpected which = %02X\n", which + 4);
- adc_data = input_port_read_indexed(machine, 3 + which);
+ adc_data = input_port_read_safe(machine, adcnames[which], 0);
timer_set(ATTOTIME_IN_MSEC(1), NULL, 0, adc_ready);
}
else
@@ -552,7 +554,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( crusnusa )
- PORT_START
+ PORT_START_TAG("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 )
@@ -570,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
+ PORT_START_TAG("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 )
@@ -581,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
+ PORT_START_TAG("DSW")
PORT_DIPNAME( 0x0001, 0x0000, "Link Status" )
PORT_DIPSETTING( 0x0000, "Master" )
PORT_DIPSETTING( 0x0001, "Slave" )
@@ -664,19 +666,19 @@ static INPUT_PORTS_START( crusnusa )
PORT_DIPSETTING( 0x1800, "Spain-4" )
PORT_DIPSETTING( 0x0e00, "Netherland-1" )
- PORT_START /* wheel */
+ PORT_START_TAG("WHEEL") /* wheel */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START /* gas pedal */
+ PORT_START_TAG("ACCEL") /* gas pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START /* brake pedal */
+ PORT_START_TAG("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
+ PORT_START_TAG("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 )
@@ -694,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
+ PORT_START_TAG("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 )
@@ -705,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
+ PORT_START_TAG("DSW")
PORT_DIPNAME( 0x0003, 0x0000, "Link Number" )
PORT_DIPSETTING( 0x0000, "1" )
PORT_DIPSETTING( 0x0001, "2" )
@@ -785,19 +787,19 @@ static INPUT_PORTS_START( crusnwld )
PORT_DIPSETTING( 0x1800, "Spain-4" )
PORT_DIPSETTING( 0x0e00, "Netherland-1" )
- PORT_START /* wheel */
+ PORT_START_TAG("WHEEL") /* wheel */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START /* gas pedal */
+ PORT_START_TAG("ACCEL") /* gas pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START /* brake pedal */
+ PORT_START_TAG("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
+ PORT_START_TAG("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 )
@@ -815,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
+ PORT_START_TAG("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 )
@@ -826,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
+ PORT_START_TAG("DSW")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ))
PORT_DIPSETTING( 0x0001, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
@@ -880,19 +882,19 @@ static INPUT_PORTS_START( offroadc )
PORT_DIPSETTING( 0x7000, "Denmark 1" )
PORT_DIPSETTING( 0x6800, "Hungary 1" )
- PORT_START /* wheel */
+ PORT_START_TAG("WHEEL") /* wheel */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START /* gas pedal */
+ PORT_START_TAG("ACCEL") /* gas pedal */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
- PORT_START /* brake pedal */
+ PORT_START_TAG("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 /* DS1 */
+ PORT_START_TAG("DIPS") /* DS1 */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ))
PORT_DIPSETTING( 0x0001, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
@@ -949,7 +951,7 @@ static INPUT_PORTS_START( wargods )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
- PORT_START
+ PORT_START_TAG("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 )
@@ -966,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
+ PORT_START_TAG("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)
@@ -984,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
+ PORT_START_TAG("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 6167e94f663..73fbdd22848 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
+ 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)
@@ -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
+ 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)
@@ -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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ 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)
@@ -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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ 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)
@@ -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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ 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)
@@ -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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ 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)
@@ -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
+ 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( 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
+ PORT_START_TAG("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
+ PORT_START_TAG("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 e2134345af6..bfd177fb9d8 100644
--- a/src/mame/drivers/midxunit.c
+++ b/src/mame/drivers/midxunit.c
@@ -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("IN3")
+ PORT_START_TAG("DSW")
PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Flip_Screen ))
PORT_DIPSETTING( 0x0000, DEF_STR( Off ))
PORT_DIPSETTING( 0x0001, DEF_STR( On ))
diff --git a/src/mame/drivers/midyunit.c b/src/mame/drivers/midyunit.c
index 3a5275c783e..3021e32fc0c 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
+ 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)
@@ -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
+ PORT_START_TAG("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,21 +269,23 @@ static INPUT_PORTS_START( narc )
PORT_DIPSETTING( 0x4000, DEF_STR( German ) )
*/
- PORT_START
+ PORT_START_TAG("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
+ PORT_START_TAG("DSW")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+
+ PORT_START_TAG("UNK0")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+
+ PORT_START_TAG("UNK1")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( trog )
- PORT_START
+ 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)
@@ -297,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
+ PORT_START_TAG("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 )
@@ -315,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
+ PORT_START_TAG("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)
@@ -324,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
+ PORT_START_TAG("DSW")
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unused ))
PORT_DIPSETTING( 0x0001, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
@@ -370,15 +372,16 @@ static INPUT_PORTS_START( trog )
PORT_DIPSETTING( 0x4000, DEF_STR( German ) )
// PORT_DIPSETTING( 0x0000, DEF_STR( Unused ))
- PORT_START
+ PORT_START_TAG("UNK0")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+
+ PORT_START_TAG("UNK1")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( smashtv )
- PORT_START
+ PORT_START_TAG("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)
@@ -396,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
+ PORT_START_TAG("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 )
@@ -410,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
+ PORT_START_TAG("IN2")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START_TAG("DSW")
PORT_DIPNAME( 0x0001, 0x0001, "1-8" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
@@ -465,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
+ PORT_START_TAG("UNK0")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START_TAG("UNK1")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( strkforc )
- PORT_START
+ 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)
@@ -492,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
+ PORT_START_TAG("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 )
@@ -505,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
+ PORT_START_TAG("IN2")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START_TAG("DSW")
PORT_DIPNAME( 0x0001, 0x0001, "Coin Meter" )
PORT_DIPSETTING( 0x0001, "Shared" )
PORT_DIPSETTING( 0x0000, "Independent" )
@@ -562,15 +565,16 @@ static INPUT_PORTS_START( strkforc )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
- PORT_START
+ PORT_START_TAG("UNK0")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+
+ PORT_START_TAG("UNK1")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( mkla2 )
- PORT_START
+ 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)
@@ -588,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
+ PORT_START_TAG("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 )
@@ -607,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
+ PORT_START_TAG("IN2")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START_TAG("DSW")
PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0010, 0x0010, "Attract Sound" )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ))
@@ -654,15 +658,16 @@ static INPUT_PORTS_START( mkla2 )
PORT_DIPSETTING( 0x8000, "Dipswitch" )
PORT_DIPSETTING( 0x0000, "CMOS" )
- PORT_START
+ PORT_START_TAG("UNK0")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+
+ PORT_START_TAG("UNK1")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( mkla4 )
- PORT_START
+ 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)
@@ -680,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
+ PORT_START_TAG("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 )
@@ -699,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
+ PORT_START_TAG("IN2")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START_TAG("DSW")
PORT_BIT( 0x0007, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0008, 0x0008, "Comic Book Offer" )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ))
@@ -749,15 +754,16 @@ static INPUT_PORTS_START( mkla4 )
PORT_DIPSETTING( 0x8000, "Dipswitch" )
PORT_DIPSETTING( 0x0000, "CMOS" )
- PORT_START
+ PORT_START_TAG("UNK0")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+
+ PORT_START_TAG("UNK1")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( term2 )
- PORT_START
+ PORT_START_TAG("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)
@@ -767,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
+ PORT_START_TAG("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 )
@@ -784,11 +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
- 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
+ PORT_START_TAG("DSW")
PORT_DIPNAME( 0x0007, 0x0003, "Credits" )
PORT_DIPSETTING( 0x0007, "2 Start/1 Continue" )
PORT_DIPSETTING( 0x0006, "4 Start/1 Continue" )
@@ -835,27 +837,32 @@ static INPUT_PORTS_START( term2 )
PORT_DIPSETTING( 0x4000, DEF_STR( German ) )
// PORT_DIPSETTING( 0x0000, DEF_STR( Unused ))
- PORT_START
+ PORT_START_TAG("UNK0")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+
+ PORT_START_TAG("UNK1")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START_TAG("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_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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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)
@@ -873,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
+ PORT_START_TAG("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 )
@@ -888,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
+ PORT_START_TAG("IN2")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START_TAG("DSW")
PORT_DIPNAME( 0x001f, 0x001f, DEF_STR( Coinage ))
PORT_DIPSETTING( 0x001f, "USA 1" )
PORT_DIPSETTING( 0x001e, "USA 2" )
@@ -959,10 +966,10 @@ static INPUT_PORTS_START( totcarn )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ))
PORT_DIPSETTING( 0x0000, DEF_STR( On ))
- PORT_START
+ PORT_START_TAG("UNK0")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START_TAG("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 042144199de..d7d1eef9215 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 /* DS1 */
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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 /* DS1 */
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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,7 +848,7 @@ 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
+ PORT_START_TAG("IN2")
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START_TAG("GUNX1") /* fake analog X */
@@ -866,7 +866,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( crusnexo )
- PORT_START /* DS1 */
+ PORT_START_TAG("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
+ PORT_START_TAG("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 /* Listed "names" are via the manual's "JAMMA" pinout sheet" */
+ PORT_START_TAG("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,7 +955,7 @@ 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
+ PORT_START_TAG("IN2")
PORT_BIT( 0x0007, IP_ACTIVE_HIGH, IPT_SPECIAL) PORT_CUSTOM( keypad_r, "KEYPAD" )
PORT_BIT( 0xfff8, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -988,7 +988,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( thegrid )
- PORT_START /* DS1 */
+ PORT_START_TAG("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
+ PORT_START_TAG("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 /* Listed "names" are via the manual's "JAMMA" pinout sheet" */
+ PORT_START_TAG("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,7 +1091,7 @@ 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
+ PORT_START_TAG("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 )
diff --git a/src/mame/drivers/missile.c b/src/mame/drivers/missile.c
index ee812cf3983..4565670ffa3 100644
--- a/src/mame/drivers/missile.c
+++ b/src/mame/drivers/missile.c
@@ -656,21 +656,21 @@ static READ8_HANDLER( missile_r )
if (ctrld) /* trackball */
{
if (!flipscreen)
- result = ((input_port_read_indexed(machine, 5) << 4) & 0xf0) | (input_port_read_indexed(machine, 4) & 0x0f);
+ result = ((input_port_read(machine, "TRACK0_Y") << 4) & 0xf0) | (input_port_read(machine, "TRACK0_X") & 0x0f);
else
- result = ((input_port_read_indexed(machine, 7) << 4) & 0xf0) | (input_port_read_indexed(machine, 6) & 0x0f);
+ result = ((input_port_read(machine, "TRACK1_Y") << 4) & 0xf0) | (input_port_read(machine, "TRACK1_X") & 0x0f);
}
else /* buttons */
- result = input_port_read_indexed(machine, 0);
+ result = input_port_read(machine, "IN0");
}
/* IN1 */
else if (offset < 0x4a00)
- result = input_port_read_indexed(machine, 1);
+ result = input_port_read(machine, "IN1");
/* IN2 */
else if (offset < 0x4b00)
- result = input_port_read_indexed(machine, 2);
+ result = input_port_read(machine, "R10");
/* anything else */
else
@@ -700,7 +700,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( missile )
- PORT_START /* IN0 */
+ PORT_START_TAG("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
@@ -710,7 +710,7 @@ static INPUT_PORTS_START( missile )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN3 )
- PORT_START /* IN1 */
+ PORT_START_TAG("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 )
@@ -719,7 +719,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 /* IN2 */
+ PORT_START_TAG("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 ) )
@@ -742,7 +742,7 @@ static INPUT_PORTS_START( missile )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* IN3 */
+ PORT_START_TAG("R8") /* IN3 */
PORT_DIPNAME( 0x03, 0x00, "Cities" ) PORT_DIPLOCATION("R8:1,2")
PORT_DIPSETTING( 0x02, "4" )
PORT_DIPSETTING( 0x01, "5" )
@@ -767,22 +767,22 @@ static INPUT_PORTS_START( missile )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START /* FAKE */
+ PORT_START_TAG("TRACK0_X") /* FAKE */
PORT_BIT( 0x0f, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10)
- PORT_START /* FAKE */
+ PORT_START_TAG("TRACK0_Y") /* FAKE */
PORT_BIT( 0x0f, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_REVERSE
- PORT_START /* FAKE */
+ PORT_START_TAG("TRACK1_X") /* FAKE */
PORT_BIT( 0x0f, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_REVERSE PORT_COCKTAIL
- PORT_START /* FAKE */
+ PORT_START_TAG("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 /* IN0 */
+ PORT_START_TAG("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
@@ -792,7 +792,7 @@ static INPUT_PORTS_START( suprmatk )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN3 )
- PORT_START /* IN1 */
+ PORT_START_TAG("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 )
@@ -801,7 +801,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 /* IN2 */
+ PORT_START_TAG("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 ) )
@@ -824,7 +824,7 @@ static INPUT_PORTS_START( suprmatk )
PORT_DIPSETTING( 0x80, "Reg. Super Missile Attack" )
PORT_DIPSETTING( 0xc0, "Hard Super Missile Attack" )
- PORT_START /* IN3 */
+ PORT_START_TAG("R8") /* IN3 */
PORT_DIPNAME( 0x03, 0x00, "Cities" ) PORT_DIPLOCATION("R8:1,2")
PORT_DIPSETTING( 0x02, "4" )
PORT_DIPSETTING( 0x01, "5" )
@@ -849,16 +849,16 @@ static INPUT_PORTS_START( suprmatk )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START /* FAKE */
+ PORT_START_TAG("TRACK0_X") /* FAKE */
PORT_BIT( 0x0f, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10)
- PORT_START /* FAKE */
+ PORT_START_TAG("TRACK0_Y") /* FAKE */
PORT_BIT( 0x0f, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_REVERSE
- PORT_START /* FAKE */
+ PORT_START_TAG("TRACK1_X") /* FAKE */
PORT_BIT( 0x0f, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_REVERSE PORT_COCKTAIL
- PORT_START /* FAKE */
+ PORT_START_TAG("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 f12de75a9ea..c2a356e6147 100644
--- a/src/mame/drivers/mitchell.c
+++ b/src/mame/drivers/mitchell.c
@@ -181,7 +181,7 @@ static READ8_HANDLER( pang_port5_r )
if (pang_port5_kludge) /* hack... music doesn't work otherwise */
bit ^= 0x08;
- return (input_port_read_indexed(machine, 0) & 0x76) | bit;
+ return (input_port_read(machine, "DSW0") & 0x76) | bit;
}
static WRITE8_HANDLER( eeprom_cs_w )
@@ -212,12 +212,14 @@ static int dial[2],dial_selected;
static READ8_HANDLER( block_input_r )
{
static int dir[2];
-
+ static const char *dialnames[] = { "DIAL1", "DIAL2" };
+ static const char *portnames[] = { "IN1", "IN2" };
+
if (dial_selected)
{
int delta;
- delta = (input_port_read_indexed(machine, 4 + offset) - dial[offset]) & 0xff;
+ delta = (input_port_read(machine, dialnames[offset]) - dial[offset]) & 0xff;
if (delta & 0x80)
{
delta = (-delta) & 0xff;
@@ -244,7 +246,7 @@ static READ8_HANDLER( block_input_r )
{
int res;
- res = input_port_read_indexed(machine, 2 + offset) & 0xf7;
+ res = input_port_read(machine, portnames[offset]) & 0xf7;
if (dir[offset]) res |= 0x08;
return res;
@@ -256,8 +258,8 @@ static WRITE8_HANDLER( block_dial_control_w )
if (data == 0x08)
{
/* reset the dial counters */
- dial[0] = input_port_read_indexed(machine, 4);
- dial[1] = input_port_read_indexed(machine, 5);
+ dial[0] = input_port_read(machine, "DIAL1");
+ dial[1] = input_port_read(machine, "DIAL2");
}
else if (data == 0x80)
dial_selected = 0;
@@ -271,9 +273,14 @@ static int keymatrix;
static READ8_HANDLER( mahjong_input_r )
{
int i;
+ static const char *const keynames[2][5] =
+ {
+ { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4" },
+ { "KEY5", "KEY6", "KEY7", "KEY8", "KEY9" }
+ };
- for (i = 0;i < 5;i++)
- if (keymatrix & (0x80 >> i)) return input_port_read_indexed(machine, 2 + 5 * offset + i);
+ for (i = 0; i < 5; i++)
+ if (keymatrix & (0x80 >> i)) return input_port_read(machine, keynames[offset][i]);
return 0xff;
}
@@ -288,26 +295,28 @@ static int input_type;
static READ8_HANDLER( input_r )
{
+ static const char *portnames[] = { "IN0", "IN1", "IN2" };
+
switch (input_type)
{
case 0:
default:
- return input_port_read_indexed(machine, 1 + offset);
+ return input_port_read(machine, portnames[offset]);
break;
- case 1: /* Mahjong games */
- if (offset) return mahjong_input_r(machine,offset-1);
- else return input_port_read_indexed(machine, 1);
+ case 1: /* Mahjong games */
+ if (offset) return mahjong_input_r(machine, offset-1);
+ else return input_port_read(machine, "IN0");
break;
- case 2: /* Block Block - dial control */
- if (offset) return block_input_r(machine,offset-1);
- else return input_port_read_indexed(machine, 1);
+ case 2: /* Block Block - dial control */
+ if (offset) return block_input_r(machine, offset-1);
+ else return input_port_read(machine, "IN0");
break;
- case 3: /* Super Pang - simulate START 1 press to initialize EEPROM */
- if (offset || init_eeprom_count == 0) return input_port_read_indexed(machine, 1 + offset);
+ case 3: /* Super Pang - simulate START 1 press to initialize EEPROM */
+ if (offset || init_eeprom_count == 0) return input_port_read(machine, portnames[offset]);
else
{
init_eeprom_count--;
- return input_port_read_indexed(machine, 1) & ~0x08;
+ return input_port_read(machine, "IN0") & ~0x08;
}
break;
}
@@ -480,13 +489,13 @@ extern WRITE8_HANDLER( mstworld_video_bank_w );
static ADDRESS_MAP_START( mstworld_readport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READ(input_port_1_r) /* coins */
- AM_RANGE(0x01, 0x01) AM_READ(input_port_2_r) /* p1 */
- AM_RANGE(0x02, 0x02) AM_READ(input_port_3_r) /* p2 */
- AM_RANGE(0x03, 0x03) AM_READ(input_port_4_r) /* dips? */
- AM_RANGE(0x04, 0x04) AM_READ(input_port_5_r) /* dips? */
- AM_RANGE(0x05, 0x05) AM_READ(input_port_0_r) /* special? */
- AM_RANGE(0x06, 0x06) AM_READ(input_port_6_r) /* dips? */
+ AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") /* coins */
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") /* p1 */
+ AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") /* p2 */
+ AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW1") /* dips? */
+ AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW2") /* dips? */
+ AM_RANGE(0x05, 0x05) AM_READ_PORT("DSW0") /* special? */
+ AM_RANGE(0x06, 0x06) AM_READ_PORT("DSW3") /* dips? */
ADDRESS_MAP_END
static ADDRESS_MAP_START( mstworld_writeport, ADDRESS_SPACE_IO, 8 )
@@ -501,8 +510,8 @@ ADDRESS_MAP_END
/**** End Monsters World ****/
-static INPUT_PORTS_START( mgakuen )
- PORT_START /* DSW */
+static INPUT_PORTS_START( mj_common )
+ PORT_START_TAG("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? */
@@ -510,7 +519,7 @@ static INPUT_PORTS_START( mgakuen )
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* data from EEPROM */
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -520,47 +529,47 @@ static INPUT_PORTS_START( mgakuen )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START /* IN1 */
+ PORT_START_TAG("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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_M )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_I )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_MAHJONG_E )
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_MAHJONG_A )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_M )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_I )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_E )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_A )
- PORT_START /* IN1 */
+ PORT_START_TAG("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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_N )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_J )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_MAHJONG_F )
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_MAHJONG_B )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_N )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_J )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_F )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_B )
- PORT_START /* IN1 */
+ PORT_START_TAG("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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_K )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_MAHJONG_G )
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_MAHJONG_C )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_K )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_G )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_C )
- PORT_START /* IN1 */
+ PORT_START_TAG("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 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_L )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_MAHJONG_H )
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_MAHJONG_D )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_L )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_H )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_D )
- PORT_START /* IN1 */
+ PORT_START_TAG("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 )
@@ -570,47 +579,47 @@ static INPUT_PORTS_START( mgakuen )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN2 */
+ PORT_START_TAG("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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_M ) PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_PLAYER(2)
- 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_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2)
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_M ) PORT_PLAYER(2)
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_PLAYER(2)
+ 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 /* IN2 */
+ PORT_START_TAG("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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_N ) PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_PLAYER(2)
- 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_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_PLAYER(2)
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_N ) PORT_PLAYER(2)
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_PLAYER(2)
+ 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 /* IN2 */
+ PORT_START_TAG("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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_K ) PORT_PLAYER(2)
- 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_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2)
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) PORT_PLAYER(2)
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_K ) PORT_PLAYER(2)
+ 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 /* IN2 */
+ PORT_START_TAG("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 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_PLAYER(2)
- 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_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) PORT_PLAYER(2)
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_PLAYER(2)
+ 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 /* IN2 */
+ PORT_START_TAG("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 )
@@ -619,8 +628,12 @@ static INPUT_PORTS_START( mgakuen )
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
- PORT_START /* DSW1 */
+static INPUT_PORTS_START( mgakuen )
+ PORT_INCLUDE( mj_common )
+
+ PORT_START_TAG("DSW1") /* DSW1 */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
@@ -644,7 +657,7 @@ static INPUT_PORTS_START( mgakuen )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START /* DSW2 */
+ PORT_START_TAG("DSW2") /* DSW2 */
PORT_DIPNAME( 0x03, 0x03, "Player 1 Skill" )
PORT_DIPSETTING( 0x03, "Weak" )
PORT_DIPSETTING( 0x02, DEF_STR( Normal ) )
@@ -670,147 +683,20 @@ static INPUT_PORTS_START( mgakuen )
INPUT_PORTS_END
static INPUT_PORTS_START( marukin )
- PORT_START /* 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? */
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* USED - handled in port5_r */
- PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* data from EEPROM */
-
- PORT_START /* 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 )
- 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 /* 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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_M )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_I )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_MAHJONG_E )
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_MAHJONG_A )
-
- 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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_N )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_J )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_MAHJONG_F )
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_MAHJONG_B )
-
- 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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_K )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_MAHJONG_G )
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_MAHJONG_C )
-
- 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 )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_L )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_MAHJONG_H )
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_MAHJONG_D )
-
- 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 )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- 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 /* 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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_M ) PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_PLAYER(2)
- 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 /* 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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_N ) PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_PLAYER(2)
- 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 /* 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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_K ) PORT_PLAYER(2)
- 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_INCLUDE( mj_common )
- 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 )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_PLAYER(2)
- 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 /* 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 )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP ) PORT_PLAYER(2)
- 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_MODIFY("DSW0")
+ PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
INPUT_PORTS_END
static INPUT_PORTS_START( pkladies )
- PORT_START /* 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? */
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* USED - handled in port5_r */
- PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* data from EEPROM */
+ /* same unknown ports as the mahjong games, so we include the following */
+ PORT_INCLUDE( marukin )
- PORT_START /* IN0 */
+ PORT_MODIFY("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 )
- 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 /* IN1 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_MODIFY("KEY0") /* IN1 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -818,49 +704,30 @@ static INPUT_PORTS_START( pkladies )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 E") PORT_CODE(KEYCODE_E)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 A") PORT_CODE(KEYCODE_A)
- 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 )
+ PORT_MODIFY("KEY1") /* IN1 */
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Cancel") PORT_CODE(KEYCODE_LALT)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 B") PORT_CODE(KEYCODE_B)
- 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 )
+ PORT_MODIFY("KEY2") /* IN1 */
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Flip") PORT_CODE(KEYCODE_SPACE)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 C") PORT_CODE(KEYCODE_C)
- 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 )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_MODIFY("KEY3") /* IN1 */
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_OTHER ) PORT_NAME("P1 D") PORT_CODE(KEYCODE_D)
- 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 )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_MODIFY("KEY4") /* IN1 */
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 /* IN2 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_MODIFY("KEY5") /* IN2 */
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -868,49 +735,32 @@ static INPUT_PORTS_START( pkladies )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 E") PORT_CODE(KEYCODE_E)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 A") PORT_CODE(KEYCODE_A)
- 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 )
+ PORT_MODIFY("KEY6") /* IN2 */
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Cancel") PORT_CODE(KEYCODE_LALT)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 B") PORT_CODE(KEYCODE_B)
- 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 )
+ PORT_MODIFY("KEY7") /* IN2 */
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Flip") PORT_CODE(KEYCODE_SPACE)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 C") PORT_CODE(KEYCODE_C)
- 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 )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_MODIFY("KEY8") /* IN2 */
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_OTHER ) PORT_NAME("P2 D") PORT_CODE(KEYCODE_D)
- 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 )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_MODIFY("KEY9") /* IN2 */
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( pang )
- PORT_START /* DSW */
+ PORT_START_TAG("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? */
@@ -918,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 /* IN0 */
+ PORT_START_TAG("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 */
@@ -928,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 /* IN1 */
+ PORT_START_TAG("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 )
@@ -938,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 /* IN2 */
+ PORT_START_TAG("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)
@@ -950,48 +800,15 @@ static INPUT_PORTS_START( pang )
INPUT_PORTS_END
static INPUT_PORTS_START( spangbl )
- PORT_START /* 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? */
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* USED - handled in port5_r */
- PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* data from EEPROM */
-
- PORT_START /* 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 */
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
+ PORT_INCLUDE( pang )
- PORT_START /* IN1 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_MODIFY("IN1")
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // must be high for game to boot..
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
- 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_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_BUTTON1 ) PORT_PLAYER(2)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
- 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)
INPUT_PORTS_END
static INPUT_PORTS_START( mstworld )
/* this port may not have the same role */
- PORT_START /* DSW */
+ PORT_START_TAG("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? */
@@ -999,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 /* IN0 */
+ PORT_START_TAG("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 */
@@ -1009,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 /* IN1 */
+ PORT_START_TAG("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 )
@@ -1019,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 /* IN2 */
+ PORT_START_TAG("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)
@@ -1029,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 /* IN3 */ // coinage seems to be in here..
+ PORT_START_TAG("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" )
@@ -1053,7 +870,7 @@ static INPUT_PORTS_START( mstworld )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* IN3 */
+ PORT_START_TAG("DSW2")
PORT_DIPNAME( 0x01, 0x00, "ds2" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1079,7 +896,7 @@ static INPUT_PORTS_START( mstworld )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* IN3 */
+ PORT_START_TAG("DSW3")
PORT_DIPNAME( 0x01, 0x00, "ds3" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1107,7 +924,7 @@ static INPUT_PORTS_START( mstworld )
INPUT_PORTS_END
static INPUT_PORTS_START( qtono1 )
- PORT_START /* DSW */
+ PORT_START_TAG("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? */
@@ -1115,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 /* IN0 */
+ PORT_START_TAG("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 )
@@ -1125,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 /* IN1 */
+ PORT_START_TAG("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 )
@@ -1135,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 /* IN2 */
+ PORT_START_TAG("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 )
@@ -1147,7 +964,7 @@ static INPUT_PORTS_START( qtono1 )
INPUT_PORTS_END
static INPUT_PORTS_START( block )
- PORT_START /* DSW */
+ PORT_START_TAG("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? */
@@ -1155,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 /* IN0 */
+ PORT_START_TAG("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 */
@@ -1165,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 /* IN1 */
+ PORT_START_TAG("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 )
@@ -1173,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 /* IN2 */
+ PORT_START_TAG("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 )
@@ -1181,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 /* DIAL1 */
+ PORT_START_TAG("DIAL1") /* DIAL1 */
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(20)
- PORT_START /* DIAL2 */
+ PORT_START_TAG("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 /* DSW */
+ PORT_START_TAG("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? */
@@ -1197,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 /* IN0 */
+ PORT_START_TAG("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 */
@@ -1207,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 /* IN1 */
+ PORT_START_TAG("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 )
@@ -1217,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 /* IN2 */
+ PORT_START_TAG("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 32e04bf9920..21d3f170a8e 100644
--- a/src/mame/drivers/mjkjidai.c
+++ b/src/mame/drivers/mjkjidai.c
@@ -104,19 +104,20 @@ static int keyb,nvram_init_count;
static READ8_HANDLER( keyboard_r )
{
int res = 0x3f,i;
+ static const char *keynames[] = { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4", "KEY5", "KEY6", "KEY7", "KEY8", "KEY9", "KEY10", "KEY11" };
-// logerror("%04x: keyboard_r\n",activecpu_get_pc());
+// logerror("%04x: keyboard_r\n", activecpu_get_pc());
- for (i = 0;i < 12;i++)
+ for (i = 0; i < 12; i++)
{
if (~keyb & (1 << i))
{
- res = input_port_read_indexed(machine, 4+i) & 0x3f;
+ res = input_port_read(machine, keynames[i]) & 0x3f;
break;
}
}
- res |= (input_port_read_indexed(machine, 3) & 0xc0);
+ res |= (input_port_read(machine, "IN3") & 0xc0);
if (nvram_init_count)
{
@@ -176,9 +177,9 @@ static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(keyboard_r)
AM_RANGE(0x01, 0x01) AM_READ(SMH_NOP) // ???
- AM_RANGE(0x02, 0x02) AM_READ(input_port_2_r)
- AM_RANGE(0x11, 0x11) AM_READ(input_port_0_r)
- AM_RANGE(0x12, 0x12) AM_READ(input_port_1_r)
+ AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2")
+ AM_RANGE(0x11, 0x11) AM_READ_PORT("IN0")
+ AM_RANGE(0x12, 0x12) AM_READ_PORT("IN1")
ADDRESS_MAP_END
static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 )
@@ -193,7 +194,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mjkjidai )
- PORT_START
+ PORT_START_TAG("IN0")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -217,7 +218,7 @@ static INPUT_PORTS_START( mjkjidai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START_TAG("IN1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -243,7 +244,7 @@ static INPUT_PORTS_START( mjkjidai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START_TAG("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)
@@ -255,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
+ PORT_START_TAG("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
+ PORT_START_TAG("KEY0")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START_TAG("KEY1")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START_TAG("KEY2")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START_TAG("KEY3")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START_TAG("KEY4")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START_TAG("KEY5")
PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START_TAG("KEY6")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x3e, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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 b15c725ea72..92cab7415b8 100644
--- a/src/mame/drivers/mjsister.c
+++ b/src/mame/drivers/mjsister.c
@@ -134,6 +134,7 @@ static WRITE8_HANDLER( mjsister_input_sel2_w )
static READ8_HANDLER( mjsister_keys_r )
{
int p,i,ret = 0;
+ static const char *keynames[] = { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4", "KEY5" };
p = mjsister_input_sel1 & 0x3f;
// p |= ((mjsister_input_sel2 & 8) << 4) | ((mjsister_input_sel2 & 0x20) << 1);
@@ -141,7 +142,7 @@ static READ8_HANDLER( mjsister_keys_r )
for (i=0; i<6; i++)
{
if (p & (1 << i))
- ret |= input_port_read_indexed(machine, i+3);
+ ret |= input_port_read(machine, keynames[i]);
}
return ret;
@@ -165,7 +166,7 @@ static ADDRESS_MAP_START( mjsister_readport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x11, 0x11) AM_READ(AY8910_read_port_0_r)
AM_RANGE(0x20, 0x20) AM_READ(mjsister_keys_r)
- AM_RANGE(0x21, 0x21) AM_READ(input_port_2_r)
+ AM_RANGE(0x21, 0x21) AM_READ_PORT("IN0")
ADDRESS_MAP_END
static ADDRESS_MAP_START( mjsister_writeport, ADDRESS_SPACE_IO, 8 )
@@ -185,57 +186,57 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mjsister )
- PORT_START /* DSW1 (0) */
+ PORT_START_TAG("DSW1") /* DSW1 (0) */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) )
- PORT_DIPSETTING( 0x03, DEF_STR( 5C_1C ) )
- PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
- PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
- PORT_DIPSETTING( 0x02, 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( 5C_1C ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
+ PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) )
+ PORT_DIPSETTING( 0x02, 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_DIPNAME( 0x08, 0x08, "Unknown 1-4" )
- PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x10, 0x10, "Unknown 1-5" )
- PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x20, 0x20, "Unknown 1-6" )
- PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* service mode */
+ PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* service mode */
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Flip_Screen ) )
- PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW2 (1) */
+ PORT_START_TAG("DSW2") /* DSW2 (1) */
PORT_DIPNAME( 0x01, 0x01, "Unknown 2-1" )
- PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x02, 0x02, "Unknown 2-2" )
- PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x04, 0x04, "Unknown 2-3" )
- PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x08, 0x08, "Unknown 2-4" )
- PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x10, 0x10, "Unknown 2-5" )
- PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x20, 0x20, "Unknown 2-6" )
- PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x40, 0x40, "Unknown 2-7" )
- PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x80, 0x80, "Unknown 2-8" )
- PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) */
+ PORT_START_TAG("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 */
@@ -245,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 /* (3) PORT 1-0 */
+ PORT_START_TAG("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 )
@@ -253,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 /* (4) PORT 1-1 */
+ PORT_START_TAG("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 )
@@ -261,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 /* (5) PORT 1-2 */
+ PORT_START_TAG("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 )
@@ -269,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 /* (6) PORT 1-3 */
+ PORT_START_TAG("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 )
@@ -277,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 /* (7) PORT 1-4 */
+ PORT_START_TAG("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 )
@@ -285,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 /* (8) PORT 1-5 */
+ PORT_START_TAG("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/model1.c b/src/mame/drivers/model1.c
index f9fb3804a64..196c8e7ded1 100644
--- a/src/mame/drivers/model1.c
+++ b/src/mame/drivers/model1.c
@@ -642,12 +642,17 @@ static int to_68k[FIFO_SIZE], fifo_wptr, fifo_rptr;
static READ16_HANDLER( io_r )
{
+ static const char *analognames[] = { "AN0", "AN1", "AN2", "AN3", "AN4", "AN5", "AN6", "AN7" };
+ static const char *inputnames[] = { "IN0", "IN1", "IN2" };
+
if(offset < 0x8)
- return input_port_read_indexed(machine, offset);
- if(offset < 0x10) {
+ return input_port_read(machine, analognames[offset]);
+
+ if(offset < 0x10)
+ {
offset -= 0x8;
if(offset < 3)
- return input_port_read_indexed(machine, offset+8) | 0xff00;
+ return input_port_read(machine, inputnames[offset]) | 0xff00;
return 0xff;
}
diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c
index d8d8ce491e7..bc0beecd6e0 100644
--- a/src/mame/drivers/model2.c
+++ b/src/mame/drivers/model2.c
@@ -433,7 +433,7 @@ static WRITE32_HANDLER(ctrl0_w)
static READ32_HANDLER(ctrl0_r)
{
- UINT32 ret = input_port_read_indexed(machine, 0);
+ UINT32 ret = input_port_read(machine, "IN0");
ret <<= 16;
if(model2_ctrlmode==0)
{
@@ -447,25 +447,25 @@ static READ32_HANDLER(ctrl0_r)
}
static READ32_HANDLER(ctrl1_r)
{
- return input_port_read_indexed(machine, 1) | input_port_read_indexed(machine, 2)<<16;
+ return input_port_read(machine, "IN1") | input_port_read(machine, "IN2")<<16;
}
static READ32_HANDLER(ctrl10_r)
{
- return input_port_read_indexed(machine, 0) | input_port_read_indexed(machine, 1)<<16;
+ return input_port_read(machine, "IN0") | input_port_read(machine, "IN1")<<16;
}
static READ32_HANDLER(ctrl14_r)
{
- return input_port_read_indexed(machine, 2);
+ return input_port_read(machine, "IN2");
}
static READ32_HANDLER(analog_r)
{
if (offset)
- return input_port_read_indexed(machine, 5);
+ return input_port_read_safe(machine, "BRAKE", 0);
- return input_port_read_indexed(machine, 3) | input_port_read_indexed(machine, 4)<<16;
+ return input_port_read_safe(machine, "STEER", 0) | input_port_read_safe(machine, "ACCEL", 0)<<16;
}
static READ32_HANDLER(fifoctl_r)
@@ -1422,7 +1422,7 @@ ADDRESS_MAP_END
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(_n_)
static INPUT_PORTS_START( model2 )
- PORT_START
+ PORT_START_TAG("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 )
@@ -1432,15 +1432,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
+ PORT_START_TAG("IN1")
MODEL2_PLAYER_INPUTS(1, BUTTON1, BUTTON2, BUTTON3, BUTTON4)
- PORT_START
+ PORT_START_TAG("IN2")
MODEL2_PLAYER_INPUTS(2, BUTTON1, BUTTON2, BUTTON3, BUTTON4)
INPUT_PORTS_END
static INPUT_PORTS_START( desert )
- PORT_START
+ PORT_START_TAG("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 )
@@ -1450,28 +1450,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
+ PORT_START_TAG("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
+ PORT_START_TAG("IN2")
MODEL2_PLAYER_INPUTS(2, BUTTON1, BUTTON2, BUTTON3, BUTTON4)
- PORT_START // steer
+ PORT_START_TAG("STEER") // steer
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START // accel
+ PORT_START_TAG("ACCEL") // accel
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START // brake
+ PORT_START_TAG("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
+ PORT_START_TAG("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 )
@@ -1481,7 +1481,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
+ PORT_START_TAG("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
@@ -1489,21 +1489,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
+ PORT_START_TAG("IN2")
MODEL2_PLAYER_INPUTS(2, BUTTON1, BUTTON2, BUTTON3, BUTTON4)
- PORT_START // steer
+ PORT_START_TAG("STEER") // steer
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START // accel
+ PORT_START_TAG("ACCEL") // accel
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START // brake
+ PORT_START_TAG("BREAK") // 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
+ PORT_START_TAG("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 )
@@ -1513,10 +1513,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
+ PORT_START_TAG("IN1")
MODEL2_PLAYER_INPUTS(1, BUTTON1, BUTTON2, BUTTON3, BUTTON4)
- PORT_START
+ PORT_START_TAG("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 6f53ea15901..cb43ec106ab 100644
--- a/src/mame/drivers/model3.c
+++ b/src/mame/drivers/model3.c
@@ -1067,10 +1067,10 @@ static READ64_HANDLER( model3_ctrl_r )
{
if(model3_controls_bank & 0x1) {
eeprom_bit = eeprom_read_bit() << 5;
- return ((input_port_read_indexed(machine, 1) & ~0x20) | eeprom_bit) << 24;
+ return ((input_port_read(machine, "IN1") & ~0x20) | eeprom_bit) << 24;
}
else {
- return (input_port_read_indexed(machine, 0)) << 24;
+ return (input_port_read(machine, "IN0")) << 24;
}
}
break;
@@ -1078,11 +1078,11 @@ static READ64_HANDLER( model3_ctrl_r )
case 1:
if (ACCESSING_BITS_56_63)
{
- return (UINT64)input_port_read_indexed(machine, 2) << 56;
+ return (UINT64)input_port_read(machine, "IN2") << 56;
}
else if (ACCESSING_BITS_24_31)
{
- return input_port_read_indexed(machine, 3) << 24;
+ return input_port_read(machine, "IN3") << 24;
}
break;
@@ -1116,7 +1116,8 @@ static READ64_HANDLER( model3_ctrl_r )
case 7:
if (ACCESSING_BITS_24_31) /* ADC Data read */
{
- UINT8 adc_data = input_port_read_indexed(machine, 5 + adc_channel);
+ static const char *adcnames[] = { "AN0", "AN1", "AN2", "AN3", "AN4", "AN5", "AN6", "AN7" };
+ UINT8 adc_data = input_port_read_safe(machine, adcnames[adc_channel], 0);
adc_channel++;
adc_channel &= 0x7;
return (UINT64)adc_data << 24;
@@ -1168,32 +1169,32 @@ static WRITE64_HANDLER( model3_ctrl_w )
switch(lightgun_reg_sel) /* read lightrun register */
{
case 0: /* player 1 gun X-position, lower 8-bits */
- model3_serial_fifo2 = input_port_read_indexed(machine, 6) & 0xff;
+ model3_serial_fifo2 = input_port_read(machine, "LIGHT0_Y") & 0xff;
break;
case 1: /* player 1 gun X-position, upper 2-bits */
- model3_serial_fifo2 = (input_port_read_indexed(machine, 6) >> 8) & 0x3;
+ model3_serial_fifo2 = (input_port_read(machine, "LIGHT0_Y") >> 8) & 0x3;
break;
case 2: /* player 1 gun Y-position, lower 8-bits */
- model3_serial_fifo2 = input_port_read_indexed(machine, 5) & 0xff;
+ model3_serial_fifo2 = input_port_read(machine, "LIGHT0_X") & 0xff;
break;
case 3: /* player 1 gun Y-position, upper 2-bits */
- model3_serial_fifo2 = (input_port_read_indexed(machine, 5) >> 8) & 0x3;
+ model3_serial_fifo2 = (input_port_read(machine, "LIGHT0_X") >> 8) & 0x3;
break;
case 4: /* player 2 gun X-position, lower 8-bits */
- model3_serial_fifo2 = input_port_read_indexed(machine, 8) & 0xff;
+ model3_serial_fifo2 = input_port_read(machine, "LIGHT1_Y") & 0xff;
break;
case 5: /* player 2 gun X-position, upper 2-bits */
- model3_serial_fifo2 = (input_port_read_indexed(machine, 8) >> 8) & 0x3;
+ model3_serial_fifo2 = (input_port_read(machine, "LIGHT1_Y") >> 8) & 0x3;
break;
case 6: /* player 2 gun Y-position, lower 8-bits */
- model3_serial_fifo2 = input_port_read_indexed(machine, 7) & 0xff;
+ model3_serial_fifo2 = input_port_read(machine, "LIGHT1_X") & 0xff;
break;
case 7: /* player 2 gun Y-position, upper 2-bits */
- model3_serial_fifo2 = (input_port_read_indexed(machine, 7) >> 8) & 0x3;
+ model3_serial_fifo2 = (input_port_read(machine, "LIGHT1_X") >> 8) & 0x3;
break;
case 8: /* gun offscreen (bit set = gun offscreen, bit clear = gun on screen) */
model3_serial_fifo2 = 0; /* bit 0 = player 1, bit 1 = player 2 */
- if(input_port_read_indexed(machine, 9) & 0x1) {
+ if(input_port_read(machine, "OFFSCREEN") & 0x1) {
model3_serial_fifo2 |= 0x01;
}
break;
@@ -1551,7 +1552,7 @@ static INPUT_PORTS_START( model3 )
MODEL3_SYSTEM_CONTROLS_1
MODEL3_SYSTEM_CONTROLS_2
- PORT_START
+ PORT_START_TAG("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)
@@ -1561,10 +1562,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
+ PORT_START_TAG("IN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START_TAG("DSW")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) /* Dip switches */
INPUT_PORTS_END
@@ -1572,29 +1573,29 @@ static INPUT_PORTS_START( lostwsga )
MODEL3_SYSTEM_CONTROLS_1
MODEL3_SYSTEM_CONTROLS_2
- PORT_START
+ PORT_START_TAG("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START_TAG("IN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START_TAG("DSW")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) /* Dip switches */
- PORT_START // lightgun X-axis
+ PORT_START_TAG("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 // lightgun Y-axis
+ PORT_START_TAG("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 // lightgun X-axis
+ PORT_START_TAG("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 // lightgun Y-axis
+ PORT_START_TAG("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 // fake button to shoot offscreen
+ PORT_START_TAG("OFFSCREEN") // fake button to shoot offscreen
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1)
INPUT_PORTS_END
@@ -1602,7 +1603,7 @@ static INPUT_PORTS_START( scud )
MODEL3_SYSTEM_CONTROLS_1
MODEL3_SYSTEM_CONTROLS_2
- PORT_START
+ PORT_START_TAG("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 */
@@ -1612,19 +1613,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
+ PORT_START_TAG("IN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START_TAG("DSW")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) /* Dip switches */
- PORT_START // steering
+ PORT_START_TAG("AN0") // steering
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START // accelerator
+ PORT_START_TAG("AN1") // accelerator
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START // brake
+ PORT_START_TAG("AN2") // brake
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
INPUT_PORTS_END
@@ -1632,33 +1633,33 @@ static INPUT_PORTS_START( bass )
MODEL3_SYSTEM_CONTROLS_1
MODEL3_SYSTEM_CONTROLS_2
- PORT_START
+ PORT_START_TAG("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
+ PORT_START_TAG("IN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START_TAG("DSW")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) /* Dip switches */
- PORT_START /* Rod Y */
+ PORT_START_TAG("AN0") /* Rod Y */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START /* Rod X */
+ PORT_START_TAG("AN1") /* Rod X */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START
+ PORT_START_TAG("AN2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* Reel */
+ PORT_START_TAG("AN3") /* Reel */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START /* Stick Y */
+ PORT_START_TAG("AN4") /* Stick Y */
PORT_BIT( 0xff, 0x80, IPT_PADDLE_V ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START /* Stick X */
+ PORT_START_TAG("AN5") /* Stick X */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
INPUT_PORTS_END
@@ -1666,29 +1667,29 @@ static INPUT_PORTS_START( harley )
MODEL3_SYSTEM_CONTROLS_1
MODEL3_SYSTEM_CONTROLS_2
- PORT_START
+ PORT_START_TAG("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
+ PORT_START_TAG("IN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START_TAG("DSW")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) /* Dip switches */
- PORT_START // steering
+ PORT_START_TAG("AN0") // steering
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START // accelerator
+ PORT_START_TAG("AN1") // accelerator
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START // front brake
+ PORT_START_TAG("AN2") // front brake
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START // back brake
+ PORT_START_TAG("AN3") // back brake
PORT_BIT( 0xff, 0x00, IPT_PEDAL3 ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
INPUT_PORTS_END
@@ -1696,7 +1697,7 @@ static INPUT_PORTS_START( daytona2 )
MODEL3_SYSTEM_CONTROLS_1
MODEL3_SYSTEM_CONTROLS_2
- PORT_START
+ PORT_START_TAG("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 */
@@ -1706,10 +1707,10 @@ 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
+ PORT_START_TAG("IN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START_TAG("DSW")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) /* Dip switches */
PORT_START // steering
@@ -1726,21 +1727,21 @@ static INPUT_PORTS_START( swtrilgy )
MODEL3_SYSTEM_CONTROLS_1
MODEL3_SYSTEM_CONTROLS_2
- PORT_START
+ PORT_START_TAG("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
+ PORT_START_TAG("IN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START_TAG("DSW")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) /* Dip switches */
- PORT_START /* Analog Stick Y */
+ PORT_START_TAG("AN0") /* Analog Stick Y */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_PLAYER(1)
- PORT_START /* Analog Stick X */
+ PORT_START_TAG("AN1") /* Analog Stick X */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_PLAYER(1)
INPUT_PORTS_END
@@ -1749,30 +1750,30 @@ static INPUT_PORTS_START( eca )
MODEL3_SYSTEM_CONTROLS_1
MODEL3_SYSTEM_CONTROLS_2
- PORT_START
+ PORT_START_TAG("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
+ PORT_START_TAG("IN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START_TAG("DSW")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) /* Dip switches */
- PORT_START // steering
+ PORT_START_TAG("AN0") // steering
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START // accelerator
+ PORT_START_TAG("AN1") // accelerator
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START // brake
+ PORT_START_TAG("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_TAG("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 */
@@ -1782,25 +1783,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_TAG("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
+ PORT_START_TAG("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) /* Pole Right */
PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START
+ PORT_START_TAG("IN3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Foot sensor */
- PORT_START
+ PORT_START_TAG("DSW")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) /* Dip switches */
- PORT_START // inclining
+ PORT_START_TAG("AN0") // inclining
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(30) PORT_KEYDELTA(10) PORT_PLAYER(1)
- PORT_START // swing
+ PORT_START_TAG("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/momoko.c b/src/mame/drivers/momoko.c
index bf4cd4370ab..ffee74f701f 100644
--- a/src/mame/drivers/momoko.c
+++ b/src/mame/drivers/momoko.c
@@ -50,10 +50,10 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xd064, 0xd0ff) AM_READ(SMH_RAM) /* sprite ram */
- AM_RANGE(0xd400, 0xd400) AM_READ(input_port_0_r)
- AM_RANGE(0xd402, 0xd402) AM_READ(input_port_1_r)
- AM_RANGE(0xd406, 0xd406) AM_READ(input_port_2_r)
- AM_RANGE(0xd407, 0xd407) AM_READ(input_port_3_r)
+ AM_RANGE(0xd400, 0xd400) AM_READ_PORT("IN0")
+ AM_RANGE(0xd402, 0xd402) AM_READ_PORT("IN1")
+ AM_RANGE(0xd406, 0xd406) AM_READ_PORT("DSW0")
+ AM_RANGE(0xd407, 0xd407) AM_READ_PORT("DSW1")
AM_RANGE(0xd800, 0xdbff) AM_READ(SMH_RAM)
AM_RANGE(0xe000, 0xe3ff) AM_READ(SMH_RAM) /* text */
diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c
index 2d9ea1857f5..a215e16e23b 100644
--- a/src/mame/drivers/moo.c
+++ b/src/mame/drivers/moo.c
@@ -97,7 +97,7 @@ static READ16_HANDLER( control1_r )
/* bit 1 is EEPROM ready */
/* bit 3 is service button */
/* bits 4-7 are DIP switches */
- res = eeprom_read_bit() | input_port_read_indexed(machine, 1);
+ res = eeprom_read_bit() | input_port_read(machine, "IN1");
if (init_eeprom_count)
{
@@ -260,12 +260,12 @@ static WRITE16_HANDLER( K053247_scattered_word_w )
static READ16_HANDLER( player1_r ) // players 1 and 3
{
- return input_port_read_indexed(machine, 2) | (input_port_read_indexed(machine, 4)<<8);
+ return input_port_read(machine, "P1") | (input_port_read(machine, "P3")<<8);
}
static READ16_HANDLER( player2_r ) // players 2 and 4
{
- return input_port_read_indexed(machine, 3) | (input_port_read_indexed(machine, 5)<<8);
+ return input_port_read(machine, "P2") | (input_port_read(machine, "P4")<<8);
}
static WRITE16_HANDLER( moo_prot_w )
@@ -312,7 +312,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0d6000, 0x0d601f) AM_READ(SMH_RAM) /* sound regs fall through */
AM_RANGE(0x0da000, 0x0da001) AM_READ(player1_r)
AM_RANGE(0x0da002, 0x0da003) AM_READ(player2_r)
- AM_RANGE(0x0dc000, 0x0dc001) AM_READ(input_port_0_word_r)
+ AM_RANGE(0x0dc000, 0x0dc001) AM_READ_PORT("IN0")
AM_RANGE(0x0dc002, 0x0dc003) AM_READ(control1_r)
AM_RANGE(0x0de000, 0x0de001) AM_READ(control2_r)
AM_RANGE(0x100000, 0x17ffff) AM_READ(SMH_ROM)
@@ -361,7 +361,7 @@ static ADDRESS_MAP_START( readmembl, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0d6ffe, 0x0d6fff) AM_READ(OKIM6295_status_0_lsb_r)
AM_RANGE(0x0da000, 0x0da001) AM_READ(player1_r)
AM_RANGE(0x0da002, 0x0da003) AM_READ(player2_r)
- AM_RANGE(0x0dc000, 0x0dc001) AM_READ(input_port_0_word_r)
+ AM_RANGE(0x0dc000, 0x0dc001) AM_READ_PORT("IN0")
AM_RANGE(0x0dc002, 0x0dc003) AM_READ(control1_r)
AM_RANGE(0x0de000, 0x0de001) AM_READ(control2_r)
AM_RANGE(0x100000, 0x17ffff) AM_READ(SMH_ROM)
@@ -403,7 +403,7 @@ static ADDRESS_MAP_START( buckyreadmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0d6000, 0x0d601f) AM_READ(SMH_RAM) /* sound regs fall through */
AM_RANGE(0x0da000, 0x0da001) AM_READ(player1_r)
AM_RANGE(0x0da002, 0x0da003) AM_READ(player2_r)
- AM_RANGE(0x0dc000, 0x0dc001) AM_READ(input_port_0_word_r)
+ AM_RANGE(0x0dc000, 0x0dc001) AM_READ_PORT("IN0")
AM_RANGE(0x0dc002, 0x0dc003) AM_READ(control1_r)
AM_RANGE(0x0de000, 0x0de001) AM_READ(control2_r)
AM_RANGE(0x180000, 0x181fff) AM_READ(K056832_ram_word_r) /* Graphic planes */
@@ -495,7 +495,7 @@ static INPUT_PORTS_START( moo )
PORT_DIPSETTING( 0x40, "3")
PORT_DIPSETTING( 0x80, "4")
- PORT_START_TAG("IN2")
+ PORT_START_TAG("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("IN3")
+ PORT_START_TAG("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("IN4")
+ PORT_START_TAG("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("IN5")
+ PORT_START_TAG("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)
@@ -538,71 +538,19 @@ INPUT_PORTS_END
/* Same as 'moo', but additional "Button 3" for all players */
static INPUT_PORTS_START( bucky )
- PORT_START_TAG("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 )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN4 )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE2 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE3 )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE4 )
+ PORT_INCLUDE( moo )
- PORT_START_TAG("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 )
- PORT_SERVICE_NO_TOGGLE(0x08, IP_ACTIVE_LOW)
- PORT_DIPNAME( 0x10, 0x00, "Sound Output")
- PORT_DIPSETTING( 0x10, DEF_STR( Mono ))
- PORT_DIPSETTING( 0x00, DEF_STR( Stereo ))
- PORT_DIPNAME( 0x20, 0x20, "Coin Mechanism")
- PORT_DIPSETTING( 0x20, "Common")
- PORT_DIPSETTING( 0x00, "Independent")
- PORT_DIPNAME( 0xc0, 0x80, "Number of Players")
- PORT_DIPSETTING( 0xc0, "2")
- PORT_DIPSETTING( 0x40, "3")
- PORT_DIPSETTING( 0x80, "4")
-
- PORT_START_TAG("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)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
+ PORT_MODIFY("P1")
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START_TAG("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)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) 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_MODIFY("P2")
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START_TAG("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)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
+ PORT_MODIFY("P3")
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START_TAG("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)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(4)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
+ PORT_MODIFY("P4")
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4 )
INPUT_PORTS_END
diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c
index 1da26e8e63b..20296a83752 100644
--- a/src/mame/drivers/mpu4.c
+++ b/src/mame/drivers/mpu4.c
@@ -949,15 +949,14 @@ static const pia6821_interface pia_ic7_intf =
/* IC8, Inputs, TRIACS, alpha clock */
static READ8_HANDLER( pia_ic8_porta_r )
{
- static const UINT8 ports[8] = { 0, 1, 2, 3, 0, 1, 4, 5 };
- int input_read = ports[input_strobe];
+ static const char *portnames[] = { "ORANGE1", "ORANGE2", "BLACK1", "BLACK2", "ORANGE1", "ORANGE2", "DIL1", "DIL2" };
- LOG_IC8(("%04x IC8 PIA Read of Port A (MUX input data)\n",activecpu_get_previouspc()));
+ LOG_IC8(("%04x IC8 PIA Read of Port A (MUX input data)\n", activecpu_get_previouspc()));
/* The orange inputs are polled twice as often as the black ones, for reasons of efficiency.
This is achieved via connecting every input line to an AND gate, thus allowing two strobes
to represent each orange input bank (strobes are active low). */
pia_set_input_cb1(2, (input_port_read(machine, "AUX2") & 0x80));
- return input_port_read_indexed(machine, input_read);
+ return input_port_read(machine, portnames[input_strobe]);
}
diff --git a/src/mame/drivers/mrflea.c b/src/mame/drivers/mrflea.c
index 1278b73bab5..a42c993fe8b 100644
--- a/src/mame/drivers/mrflea.c
+++ b/src/mame/drivers/mrflea.c
@@ -204,23 +204,27 @@ static WRITE8_HANDLER( mrflea_select3_w ){
/*******************************************************/
-static READ8_HANDLER( mrflea_input0_r ){
- if( mrflea_select0 == 0x0f ) return input_port_read_indexed(machine, 0);
- if( mrflea_select0 == 0x0e ) return input_port_read_indexed(machine, 1);
+static READ8_HANDLER( mrflea_input0_r )
+{
+ if( mrflea_select0 == 0x0f ) return input_port_read(machine, "IN0");
+ if( mrflea_select0 == 0x0e ) return input_port_read(machine, "IN1");
return 0x00;
}
-static READ8_HANDLER( mrflea_input1_r ){
+static READ8_HANDLER( mrflea_input1_r )
+{
return 0x00;
}
-static READ8_HANDLER( mrflea_input2_r ){
- if( mrflea_select2 == 0x0f ) return input_port_read_indexed(machine, 2);
- if( mrflea_select2 == 0x0e ) return input_port_read_indexed(machine, 3);
+static READ8_HANDLER( mrflea_input2_r )
+{
+ if( mrflea_select2 == 0x0f ) return input_port_read(machine, "DSW1");
+ if( mrflea_select2 == 0x0e ) return input_port_read(machine, "DSW2");
return 0x00;
}
-static READ8_HANDLER( mrflea_input3_r ){
+static READ8_HANDLER( mrflea_input3_r )
+{
return 0x00;
}
@@ -350,7 +354,7 @@ ROM_START( mrflea )
ROM_END
static INPUT_PORTS_START( mrflea )
- PORT_START
+ PORT_START_TAG("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
@@ -360,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
+ PORT_START_TAG("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 /* DSW1 */
+ PORT_START_TAG("DSW1") /* DSW1 */
/*
------xx
-----x--
@@ -395,7 +399,7 @@ static INPUT_PORTS_START( mrflea )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW2 */
+ PORT_START_TAG("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/ms32.c b/src/mame/drivers/ms32.c
index 731c29d4eac..6d1ab3343cb 100644
--- a/src/mame/drivers/ms32.c
+++ b/src/mame/drivers/ms32.c
@@ -183,10 +183,10 @@ static UINT32 to_main;
static READ32_HANDLER ( ms32_read_inputs1 )
{
int a,b,c,d;
- a = input_port_read_indexed(machine, 0); // unknown
- b = input_port_read_indexed(machine, 1); // System inputs
- c = input_port_read_indexed(machine, 2); // Player 1 inputs
- d = input_port_read_indexed(machine, 3); // Player 2 inputs
+ a = input_port_read(machine, "IN0"); // unknown
+ b = input_port_read(machine, "IN1"); // System inputs
+ c = input_port_read(machine, "IN2"); // Player 1 inputs
+ d = input_port_read(machine, "IN3"); // Player 2 inputs
return a << 24 | b << 16 | c << 0 | d << 8;
}
@@ -194,31 +194,31 @@ static READ32_HANDLER ( ms32_read_inputs1 )
static READ32_HANDLER ( ms32_mahjong_read_inputs1 )
{
int a,b,c,d;
- a = input_port_read_indexed(machine, 0); // unknown
- b = input_port_read_indexed(machine, 1); // System inputs
+ a = input_port_read(machine, "IN0"); // unknown
+ b = input_port_read(machine, "IN1"); // System inputs
switch (ms32_mahjong_input_select[0])
{
case 0x01:
- c = input_port_read_indexed(machine, 8); // Player 1 inputs
+ c = input_port_read(machine, "MJ0"); // Player 1 inputs
break;
case 0x02:
- c = input_port_read_indexed(machine, 9); // Player 1 inputs
+ c = input_port_read(machine, "MJ1"); // Player 1 inputs
break;
case 0x04:
- c = input_port_read_indexed(machine, 10); // Player 1 inputs
+ c = input_port_read(machine, "MJ2"); // Player 1 inputs
break;
case 0x08:
- c = input_port_read_indexed(machine, 11); // Player 1 inputs
+ c = input_port_read(machine, "MJ3"); // Player 1 inputs
break;
case 0x10:
- c = input_port_read_indexed(machine, 12); // Player 1 inputs
+ c = input_port_read(machine, "MJ4"); // Player 1 inputs
break;
default:
c = 0;
}
- d = input_port_read_indexed(machine, 3); // Player 2 inputs
+ d = input_port_read(machine, "IN3"); // Player 2 inputs
return a << 24 | b << 16 | c << 0 | d << 8;
}
@@ -226,20 +226,20 @@ static READ32_HANDLER ( ms32_mahjong_read_inputs1 )
static READ32_HANDLER ( ms32_read_inputs2 )
{
int a,b,c,d;
- a = input_port_read_indexed(machine, 4); // Dip 1
- b = input_port_read_indexed(machine, 5); // Dip 2
- c = input_port_read_indexed(machine, 6); // Dip 3
- d = input_port_read_indexed(machine, 7); // unused ?
+ a = input_port_read(machine, "DSW1"); // Dip 1
+ b = input_port_read(machine, "DSW2"); // Dip 2
+ c = input_port_read(machine, "DSW3"); // Dip 3
+ d = input_port_read(machine, "UNUSED"); // unused ?
return a << 8 | b << 0 | c << 16 | d << 24;
}
static READ32_HANDLER ( ms32_read_inputs3 )
{
int a,b,c,d;
- a = input_port_read_indexed(machine, 10); // unused?
- b = input_port_read_indexed(machine, 10); // unused?
- c = input_port_read_indexed(machine, 9);
- d = (input_port_read_indexed(machine, 8) - 0xb0) & 0xff;
+ a = input_port_read(machine, "AN2?"); // unused?
+ b = input_port_read(machine, "AN2?"); // unused?
+ c = input_port_read(machine, "AN1");
+ d = (input_port_read(machine, "AN0") - 0xb0) & 0xff;
return a << 24 | b << 16 | c << 8 | d << 0;
}
diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c
index ac9f49c9754..78da26d446f 100644
--- a/src/mame/drivers/msisaac.c
+++ b/src/mame/drivers/msisaac.c
@@ -144,7 +144,7 @@ MCU simulation TODO:
//6-down
//7-leftdwn
- UINT8 val= (input_port_read_indexed(machine, 4)>>2) & 0x0f;
+ UINT8 val= (input_port_read(machine, "IN1")>>2) & 0x0f;
/* bit0 = left
bit1 = right
bit2 = down
@@ -209,12 +209,12 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf0e0, 0xf0e0) AM_READ(msisaac_mcu_r)
AM_RANGE(0xf0e1, 0xf0e1) AM_READ(msisaac_mcu_status_r)
- AM_RANGE(0xf080, 0xf080) AM_READ(input_port_0_r)
- AM_RANGE(0xf081, 0xf081) AM_READ(input_port_1_r)
- AM_RANGE(0xf082, 0xf082) AM_READ(input_port_2_r)
- AM_RANGE(0xf083, 0xf083) AM_READ(input_port_3_r)
- AM_RANGE(0xf084, 0xf084) AM_READ(input_port_4_r)
-//AM_RANGE(0xf086, 0xf086) AM_READ(input_port_5_r)
+ AM_RANGE(0xf080, 0xf080) AM_READ_PORT("DSW1")
+ AM_RANGE(0xf081, 0xf081) AM_READ_PORT("DSW2")
+ AM_RANGE(0xf082, 0xf082) AM_READ_PORT("DSW3")
+ AM_RANGE(0xf083, 0xf083) AM_READ_PORT("IN0")
+ AM_RANGE(0xf084, 0xf084) AM_READ_PORT("IN1")
+//AM_RANGE(0xf086, 0xf086) AM_READ_PORT("IN2")
ADDRESS_MAP_END
static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c
index 31d35b804b8..18da4383915 100644
--- a/src/mame/drivers/mugsmash.c
+++ b/src/mame/drivers/mugsmash.c
@@ -160,16 +160,16 @@ static READ16_HANDLER ( mugsmash_input_ports_r )
switch (offset)
{
case 0 :
- data = (input_port_read_indexed(machine, 0) & 0xff) | ((input_port_read_indexed(machine, 3) & 0xc0) << 6) | ((input_port_read_indexed(machine, 2) & 0x03) << 8);
+ data = (input_port_read(machine, "P1") & 0xff) | ((input_port_read(machine, "DSW1") & 0xc0) << 6) | ((input_port_read(machine, "IN0") & 0x03) << 8);
break;
case 1 :
- data = (input_port_read_indexed(machine, 1) & 0xff) | ((input_port_read_indexed(machine, 3) & 0x3f) << 8);
+ data = (input_port_read(machine, "P2") & 0xff) | ((input_port_read(machine, "DSW1") & 0x3f) << 8);
break;
case 2 :
- data = ((input_port_read_indexed(machine, 4) & 0x3f) << 8);
+ data = ((input_port_read(machine, "DSW2") & 0x3f) << 8);
break;
case 3 :
- data = ((input_port_read_indexed(machine, 4) & 0xc0) << 2);
+ data = ((input_port_read(machine, "DSW2") & 0xc0) << 2);
break;
}
@@ -190,10 +190,10 @@ static ADDRESS_MAP_START( mugsmash_readmem, ADDRESS_SPACE_PROGRAM, 16 )
#if USE_FAKE_INPUT_PORTS
AM_RANGE(0x180000, 0x180007) AM_READ(mugsmash_input_ports_r)
#else
- 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")
#endif
ADDRESS_MAP_END
@@ -239,19 +239,19 @@ ADDRESS_MAP_END
#if USE_FAKE_INPUT_PORTS
static INPUT_PORTS_START( mugsmash )
- PORT_START /* Fake IN0 (player 1 inputs) */
+ PORT_START_TAG("P1") /* Fake IN0 (player 1 inputs) */
MUGSMASH_PLAYER_INPUT( 1, IPT_START1 )
- PORT_START /* Fake IN1 (player 2 inputs) */
+ PORT_START_TAG("P2") /* Fake IN1 (player 2 inputs) */
MUGSMASH_PLAYER_INPUT( 2, IPT_START2 )
- PORT_START /* Fake IN2 (system inputs) */
+ PORT_START_TAG("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 /* Fake IN3 (SW1) */
- PORT_SERVICE( 0x01, IP_ACTIVE_LOW ) // SW1-1
+ PORT_START_TAG("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 ) )
PORT_DIPSETTING( 0x0a, DEF_STR( 3C_1C ) )
@@ -261,7 +261,7 @@ static INPUT_PORTS_START( mugsmash )
PORT_DIPSETTING( 0x04, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x06, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0x0e, DEF_STR( Free_Play ) )
- PORT_DIPNAME( 0x10, 0x00, DEF_STR( Allow_Continue ) ) // SW1-5
+ PORT_DIPNAME( 0x10, 0x00, DEF_STR( Allow_Continue ) ) // SW1-5
PORT_DIPSETTING( 0x10, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
PORT_DIPNAME( 0x20, 0x20, "Sound Test" ) // SW1-6 (in "test mode" only)
@@ -270,11 +270,11 @@ static INPUT_PORTS_START( mugsmash )
PORT_DIPNAME( 0x40, 0x40, "Color Test" ) // SW1-7 (in "test mode" only)
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, "Draw SF." ) // SW1-8 (in "test mode" only)
+ PORT_DIPNAME( 0x80, 0x80, "Draw SF." ) // SW1-8 (in "test mode" only)
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* Fake IN4 (SW2) */
+ PORT_START_TAG("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 ) )
@@ -283,7 +283,7 @@ static INPUT_PORTS_START( mugsmash )
PORT_DIPSETTING( 0x02, "2" )
PORT_DIPSETTING( 0x04, "3" )
PORT_DIPSETTING( 0x06, "4" )
- PORT_DIPNAME( 0x08, 0x08, "Unused SW 2-4" ) // SW2-4
+ PORT_DIPNAME( 0x08, 0x08, "Unused SW 2-4" ) // SW2-4
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x30, 0x10, DEF_STR( Difficulty ) ) // SW2-5 and SW2-6
@@ -291,16 +291,16 @@ static INPUT_PORTS_START( mugsmash )
PORT_DIPSETTING( 0x10, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x20, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x30, DEF_STR( Very_Hard ) )
- PORT_DIPNAME( 0x40, 0x40, "Draw Objects" ) // SW2-7 (in "test mode" only)
+ PORT_DIPNAME( 0x40, 0x40, "Draw Objects" ) // SW2-7 (in "test mode" only)
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, "Freeze" ) // SW2-8 (= "Screen Pause" in "test mode")
+ PORT_DIPNAME( 0x80, 0x80, "Freeze" ) // SW2-8 (= "Screen Pause" in "test mode")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
INPUT_PORTS_END
#else
static INPUT_PORTS_START( mugsmash )
- PORT_START /* IN0 - $180000.w */
+ PORT_START_TAG("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 )
@@ -309,15 +309,15 @@ static INPUT_PORTS_START( mugsmash )
PORT_DIPNAME( 0x1000, 0x1000, "Color Test" ) // SW1-7 (in "test mode" only)
PORT_DIPSETTING( 0x1000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x2000, 0x2000, "Draw SF." ) // SW1-8 (in "test mode" only)
+ PORT_DIPNAME( 0x2000, 0x2000, "Draw SF." ) // SW1-8 (in "test mode" only)
PORT_DIPSETTING( 0x2000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN1 - $180002.w */
+ PORT_START_TAG("IN1") /* IN1 - $180002.w */
MUGSMASH_PLAYER_INPUT( 2, IPT_START2 )
- PORT_SERVICE( 0x0100, IP_ACTIVE_LOW ) // SW1-1
+ PORT_SERVICE( 0x0100, IP_ACTIVE_LOW ) // SW1-1
PORT_DIPNAME( 0x0e00, 0x0000, DEF_STR( Coinage ) ) // SW1-2 to SW1-4
PORT_DIPSETTING( 0x0c00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0a00, DEF_STR( 3C_1C ) )
@@ -327,7 +327,7 @@ static INPUT_PORTS_START( mugsmash )
PORT_DIPSETTING( 0x0400, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x0600, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0x0e00, DEF_STR( Free_Play ) )
- PORT_DIPNAME( 0x1000, 0x0000, DEF_STR( Allow_Continue ) ) // SW1-5
+ PORT_DIPNAME( 0x1000, 0x0000, DEF_STR( Allow_Continue ) ) // SW1-5
PORT_DIPSETTING( 0x1000, DEF_STR( No ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Yes ) )
PORT_DIPNAME( 0x2000, 0x2000, "Sound Test" ) // SW1-6 (in "test mode" only)
@@ -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 /* IN2 - $180004.w */
+ PORT_START_TAG("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 )
@@ -356,7 +356,7 @@ static INPUT_PORTS_START( mugsmash )
PORT_DIPNAME( 0x0800, 0x0800, "Unused SW 2-4" ) // SW2-4
PORT_DIPSETTING( 0x0800, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x3000, 0x1000, DEF_STR( Difficulty ) ) // SW2-5 and SW2-6
+ PORT_DIPNAME( 0x3000, 0x1000, DEF_STR( Difficulty ) ) // SW2-5 and SW2-6
PORT_DIPSETTING( 0x0000, DEF_STR( Very_Easy) )
PORT_DIPSETTING( 0x1000, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x2000, DEF_STR( Hard ) )
@@ -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 /* IN3 - $180006.w */
+ PORT_START_TAG("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 9a5324ef566..9f1b70f5068 100644
--- a/src/mame/drivers/multigam.c
+++ b/src/mame/drivers/multigam.c
@@ -100,11 +100,11 @@ static WRITE8_HANDLER( multigam_IN0_w )
in_0_shift = 0;
in_1_shift = 0;
- in_0 = input_port_read_indexed(machine, 0);
- in_1 = input_port_read_indexed(machine, 1);
+ in_0 = input_port_read(machine, "P1");
+ in_1 = input_port_read(machine, "P2");
multigam_in_dsw_shift = 0;
- multigam_in_dsw = input_port_read_indexed(machine, 3);
+ multigam_in_dsw = input_port_read(machine, "DSW");
}
static READ8_HANDLER( multigam_IN1_r )
@@ -117,7 +117,7 @@ static READ8_HANDLER( multigam_inputs_r )
/* bit 0: serial input (dsw)
bit 1: coin */
return ((multigam_in_dsw >> multigam_in_dsw_shift++) & 0x01) |
- input_port_read_indexed(machine, 2);
+ input_port_read(machine, "IN0");
}
@@ -450,7 +450,7 @@ ADDRESS_MAP_END
*******************************************************/
static INPUT_PORTS_START( multigam_common )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 /* IN1 */
+ PORT_START_TAG("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 /* IN2 */
+ PORT_START_TAG("IN0") /* IN2 */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 )
INPUT_PORTS_END
static INPUT_PORTS_START( multigam )
PORT_INCLUDE( multigam_common )
- PORT_START /* IN3 */
+ PORT_START_TAG("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 /* IN3 */
+ PORT_START_TAG("DSW") /* IN3 */
PORT_DIPNAME( 0x06, 0x00, "Coin/Time" )
PORT_DIPSETTING( 0x00, "15 min" )
PORT_DIPSETTING( 0x04, "8 min" )
diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c
index 97883b76b40..3655a31fe15 100644
--- a/src/mame/drivers/mystwarr.c
+++ b/src/mame/drivers/mystwarr.c
@@ -119,7 +119,7 @@ static READ16_HANDLER( mweeprom_r )
{
if (ACCESSING_BITS_0_7)
{
- int res = input_port_read_indexed(machine, 1) | eeprom_read_bit();
+ int res = input_port_read(machine, "IN1") | eeprom_read_bit();
if (init_eeprom_count)
{
@@ -139,7 +139,7 @@ static READ16_HANDLER( vseeprom_r )
{
if (ACCESSING_BITS_0_7)
{
- int res = input_port_read_indexed(machine, 1) | eeprom_read_bit();
+ int res = input_port_read(machine, "IN1") | eeprom_read_bit();
if (init_eeprom_count)
{
@@ -173,10 +173,10 @@ static READ16_HANDLER( dddeeprom_r )
{
if (ACCESSING_BITS_8_15)
{
- return (input_port_read_indexed(machine, 1) | eeprom_read_bit())<<8;
+ return (input_port_read(machine, "IN1") | eeprom_read_bit())<<8;
}
- return input_port_read_indexed(machine, 3);
+ return input_port_read(machine, "P2");
}
static WRITE16_HANDLER( mmeeprom_w )
@@ -316,27 +316,27 @@ static WRITE16_HANDLER( irq_ack_w )
static READ16_HANDLER( player1_r )
{
- return input_port_read_indexed(machine, 2) | (input_port_read_indexed(machine, 3)<<8);
+ return input_port_read(machine, "P1") | (input_port_read(machine, "P2")<<8);
}
static READ16_HANDLER( player2_r )
{
- return input_port_read_indexed(machine, 4) | (input_port_read_indexed(machine, 5)<<8);
+ return input_port_read(machine, "P3") | (input_port_read(machine, "P4")<<8);
}
static READ16_HANDLER( mmplayer1_r )
{
- return input_port_read_indexed(machine, 2) | (input_port_read_indexed(machine, 4)<<8);
+ return input_port_read(machine, "P1") | (input_port_read(machine, "P3")<<8);
}
static READ16_HANDLER( mmplayer2_r )
{
- return input_port_read_indexed(machine, 3) | (input_port_read_indexed(machine, 5)<<8);
+ return input_port_read(machine, "P2") | (input_port_read(machine, "P4")<<8);
}
static READ16_HANDLER( mmcoins_r )
{
- int res = input_port_read_indexed(machine, 0);
+ int res = input_port_read(machine, "IN0");
if (init_eeprom_count)
{
@@ -349,7 +349,7 @@ static READ16_HANDLER( mmcoins_r )
static READ16_HANDLER( dddcoins_r )
{
- int res = (input_port_read_indexed(machine, 0)<<8) | input_port_read_indexed(machine, 2);
+ int res = (input_port_read(machine, "IN0")<<8) | input_port_read(machine, "P1");
if (init_eeprom_count)
{
@@ -1091,7 +1091,7 @@ MACHINE_DRIVER_END
/**********************************************************************************/
static INPUT_PORTS_START( mystwarr )
- PORT_START
+ PORT_START_TAG("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 )
@@ -1101,7 +1101,7 @@ static INPUT_PORTS_START( mystwarr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START_TAG("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 )
@@ -1117,7 +1117,7 @@ static INPUT_PORTS_START( mystwarr )
PORT_DIPSETTING( 0x40, "2")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START_TAG("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)
@@ -1127,7 +1127,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
+ PORT_START_TAG("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)
@@ -1137,7 +1137,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
+ PORT_START_TAG("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)
@@ -1147,7 +1147,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
+ PORT_START_TAG("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)
@@ -1159,7 +1159,7 @@ static INPUT_PORTS_START( mystwarr )
INPUT_PORTS_END
static INPUT_PORTS_START( metamrph )
- PORT_START
+ PORT_START_TAG("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 )
@@ -1169,7 +1169,7 @@ static INPUT_PORTS_START( metamrph )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START_TAG("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 )
@@ -1187,7 +1187,7 @@ static INPUT_PORTS_START( metamrph )
PORT_DIPSETTING( 0x80, DEF_STR( No ))
PORT_DIPSETTING( 0x00, DEF_STR( Yes ))
- PORT_START
+ PORT_START_TAG("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)
@@ -1197,7 +1197,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
+ PORT_START_TAG("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)
@@ -1207,7 +1207,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
+ PORT_START_TAG("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)
@@ -1217,7 +1217,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
+ PORT_START_TAG("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)
@@ -1229,7 +1229,7 @@ static INPUT_PORTS_START( metamrph )
INPUT_PORTS_END
static INPUT_PORTS_START( viostorm )
- PORT_START
+ PORT_START_TAG("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 )
@@ -1239,7 +1239,7 @@ static INPUT_PORTS_START( viostorm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START_TAG("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 )
@@ -1257,7 +1257,7 @@ static INPUT_PORTS_START( viostorm )
PORT_DIPSETTING( 0x00, "3")
PORT_DIPSETTING( 0x80, "2")
- PORT_START
+ PORT_START_TAG("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)
@@ -1267,7 +1267,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
+ PORT_START_TAG("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)
@@ -1277,7 +1277,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
+ PORT_START_TAG("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)
@@ -1287,7 +1287,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
+ PORT_START_TAG("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)
@@ -1299,7 +1299,7 @@ static INPUT_PORTS_START( viostorm )
INPUT_PORTS_END
static INPUT_PORTS_START( dadandrn )
- PORT_START
+ PORT_START_TAG("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 )
@@ -1309,7 +1309,7 @@ static INPUT_PORTS_START( dadandrn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START_TAG("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 )
@@ -1323,7 +1323,7 @@ static INPUT_PORTS_START( dadandrn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START_TAG("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)
@@ -1333,7 +1333,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
+ PORT_START_TAG("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)
@@ -1343,7 +1343,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
+ PORT_START_TAG("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)
@@ -1353,7 +1353,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
+ PORT_START_TAG("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)
@@ -1365,7 +1365,7 @@ static INPUT_PORTS_START( dadandrn )
INPUT_PORTS_END
static INPUT_PORTS_START( martchmp )
- PORT_START
+ PORT_START_TAG("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 )
@@ -1375,7 +1375,7 @@ static INPUT_PORTS_START( martchmp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START_TAG("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 )
@@ -1389,7 +1389,7 @@ static INPUT_PORTS_START( martchmp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START_TAG("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)
@@ -1399,7 +1399,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
+ PORT_START_TAG("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)
@@ -1409,7 +1409,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
+ PORT_START_TAG("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)
@@ -1419,7 +1419,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
+ PORT_START_TAG("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 f690903234d..d179de2445f 100644
--- a/src/mame/drivers/n8080.c
+++ b/src/mame/drivers/n8080.c
@@ -59,11 +59,11 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( main_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7)
- 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("IN0")
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
+ AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2")
AM_RANGE(0x03, 0x03) AM_READ(n8080_shift_r)
- AM_RANGE(0x04, 0x04) AM_READ(input_port_3_r)
+ AM_RANGE(0x04, 0x04) AM_READ_PORT("IN3")
AM_RANGE(0x02, 0x02) AM_WRITE(n8080_shift_bits_w)
AM_RANGE(0x03, 0x03) AM_WRITE(n8080_shift_data_w)
@@ -150,7 +150,7 @@ MACHINE_DRIVER_END
static INPUT_PORTS_START( spacefev )
- PORT_START
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("IN3")
INPUT_PORTS_END
static INPUT_PORTS_START( highsplt )
- PORT_START
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("IN3")
INPUT_PORTS_END
static INPUT_PORTS_START( spacelnc )
- PORT_START
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("IN3")
INPUT_PORTS_END
static INPUT_PORTS_START( sheriff )
- PORT_START
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("IN1")
- PORT_START
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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 /* 04 */
+ PORT_START_TAG("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 /* 05 */
+ PORT_START_TAG("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 9c3ada2d1d0..d04de5f19b2 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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("ACCEL")
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START
+ PORT_START_TAG("BRAKE")
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
- PORT_START
+ PORT_START_TAG("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 eeeaa4ba995..b568e3faebc 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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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 )
@@ -506,16 +506,17 @@ simulate_mcu( running_machine *machine )
int i;
UINT16 data;
UINT8 poll_coins;
+ static const char *portnames[] = { "P1", "P2", "P3", "P4" };
namcona1_workram[0xf60/2] = 0x0000; /* mcu ready */
if (is_na2)
{
- mcu_ram[0xfc0/2] = input_port_read_indexed(machine, 0x0); /* dipswitch */
+ mcu_ram[0xfc0/2] = input_port_read(machine, "DSW"); /* dipswitch */
for( i=1; i<=4; i++ )
{
- data = input_port_read_indexed(machine, i)<<8;
+ data = input_port_read(machine, portnames[i-1])<<8;
switch( namcona1_gametype )
{
case NAMCO_KNCKHEAD:
@@ -534,11 +535,11 @@ simulate_mcu( running_machine *machine )
if( data&0x4000 ) data |= 0x10; /* jump */
if( i==1 )
{
- if( input_port_read_indexed(machine, 1)&0x80 ) data |= 0x80; /* P1 start */
+ if( input_port_read(machine, "P1") & 0x80 ) data |= 0x80; /* P1 start */
}
if( i==2 )
{
- if( input_port_read_indexed(machine, 2)&0x80 ) data |= 0x80; /* P2 start */
+ if( input_port_read(machine, "P2") & 0x80 ) data |= 0x80; /* P2 start */
}
break;
@@ -557,7 +558,7 @@ simulate_mcu( running_machine *machine )
mcu_ram[0xfc0/2+0x08] = 0xffff; /* analog6,7 */
mcu_ram[0xfc0/2+0x09] = 0xffff; /* encoder0,1 */
- poll_coins = input_port_read_indexed(machine, 5); /* coin input */
+ poll_coins = input_port_read(machine, "COIN"); /* coin input */
if( (poll_coins&0x8)&~(mCoinState&0x8) ) mCoinCount[0]++;
if( (poll_coins&0x4)&~(mCoinState&0x4) ) mCoinCount[1]++;
if( (poll_coins&0x2)&~(mCoinState&0x2) ) mCoinCount[2]++;
@@ -568,14 +569,14 @@ simulate_mcu( running_machine *machine )
mcu_ram[0xfc0/2+0xb] = (mCoinCount[2]<<8)|mCoinCount[3];
/* special handling for F/A */
- data = ~((input_port_read_indexed(machine, 1)<<8)|input_port_read_indexed(machine, 2));
+ data = ~((input_port_read(machine, "P1")<<8)|input_port_read(machine, "P2"));
mcu_ram[0xffc/2] = data;
mcu_ram[0xffe/2] = data;
if( namcona1_gametype == NAMCO_XDAY2 )
{
- int p1 = input_port_read_indexed(machine, 1);
- int p2 = input_port_read_indexed(machine, 2);
+ int p1 = input_port_read(machine, "P1");
+ int p2 = input_port_read(machine, "P2");
UINT32 code = 0;
if( p2&0x40 ) code |= 0x2000; // enter (top-level of self-test)
if( p2&0x20 ) code |= 0x1000; // exit (top-level of self-test)
@@ -1155,19 +1156,19 @@ static READ8_HANDLER( port7_r )
switch (mcu_port6 & 0xe0)
{
case 0x40:
- return input_port_read_indexed(machine, 0);
+ return input_port_read(machine, "P1");
break;
case 0x60:
- return input_port_read_indexed(machine, 1);
+ return input_port_read(machine, "P2");
break;
case 0x20:
- return input_port_read_indexed(machine, 4);
+ return input_port_read(machine, "DSW");
break;
case 0x00:
- return input_port_read_indexed(machine, 3);
+ return input_port_read(machine, "P4");
break;
}
@@ -1216,7 +1217,7 @@ static MACHINE_RESET( namcona1_mcu )
static READ8_HANDLER( portana_r )
{
static const UINT8 bitnum[8] = { 0x40, 0x20, 0x10, 0x01, 0x02, 0x04, 0x08, 0x80 };
- UINT8 port = input_port_read_indexed(machine, 2);
+ UINT8 port = input_port_read(machine, "P3");
return (port & bitnum[offset>>1]) ? 0xff : 0x00;
}
diff --git a/src/mame/drivers/namconb1.c b/src/mame/drivers/namconb1.c
index 308c452a6f6..fa2cd7c0b38 100644
--- a/src/mame/drivers/namconb1.c
+++ b/src/mame/drivers/namconb1.c
@@ -664,10 +664,10 @@ static READ32_HANDLER( gunbulet_gun_r )
switch( offset )
{
- case 0: case 1: result = (UINT8)(0x0f+input_port_read_indexed(machine, 7)*224/255); break; /* Y (p2) */
- case 2: case 3: result = (UINT8)(0x26+input_port_read_indexed(machine, 6)*288/314); break; /* X (p2) */
- case 4: case 5: result = (UINT8)(0x0f+input_port_read_indexed(machine, 5)*224/255); break; /* Y (p1) */
- case 6: case 7: result = (UINT8)(0x26+input_port_read_indexed(machine, 4)*288/314); break; /* X (p1) */
+ case 0: case 1: result = (UINT8)(0x0f + input_port_read(machine, "LIGHT1_Y") * 224/255); break; /* Y (p2) */
+ case 2: case 3: result = (UINT8)(0x26 + input_port_read(machine, "LIGHT1_X") * 288/314); break; /* X (p2) */
+ case 4: case 5: result = (UINT8)(0x0f + input_port_read(machine, "LIGHT0_Y") * 224/255); break; /* Y (p1) */
+ case 6: case 7: result = (UINT8)(0x26 + input_port_read(machine, "LIGHT0_X") * 288/314); break; /* X (p1) */
}
return result<<24;
} /* gunbulet_gun_r */
@@ -1218,11 +1218,11 @@ ROM_END
/***************************************************************/
static INPUT_PORTS_START( gunbulet )
- PORT_START
+ PORT_START_TAG("COIN")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
- PORT_START
+ PORT_START_TAG("DSW")
PORT_DIPNAME( 0x01, 0x00, "DSW2 (Unused)" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1232,31 +1232,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
+ PORT_START_TAG("P1")
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START
+ PORT_START_TAG("P2")
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
- PORT_START
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("COIN")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
- PORT_START
+ PORT_START_TAG("DSW")
PORT_DIPNAME( 0x01, 0x00, "Freeze Screen" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1278,25 +1278,25 @@ static INPUT_PORTS_START( machbrkr )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* C75 status */
- PORT_START
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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)
@@ -1305,11 +1305,11 @@ INPUT_PORTS_END
#endif
static INPUT_PORTS_START( outfxies )
- PORT_START
+ PORT_START_TAG("COIN")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
- PORT_START
+ PORT_START_TAG("DSW")
PORT_DIPNAME( 0x01, 0x00, "Freeze Screen" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1331,7 +1331,7 @@ static INPUT_PORTS_START( outfxies )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* C75 status */
- PORT_START
+ PORT_START_TAG("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
@@ -1341,7 +1341,7 @@ static INPUT_PORTS_START( outfxies )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START
+ PORT_START_TAG("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)
@@ -1353,11 +1353,11 @@ static INPUT_PORTS_START( outfxies )
INPUT_PORTS_END
static INPUT_PORTS_START( namconb1 )
- PORT_START
+ PORT_START_TAG("COIN")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
- PORT_START
+ PORT_START_TAG("DSW")
PORT_DIPNAME( 0x01, 0x00, "DSW2 (Unused)" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -1379,7 +1379,7 @@ static INPUT_PORTS_START( namconb1 )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) /* C75 status */
- PORT_START
+ PORT_START_TAG("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
@@ -1389,7 +1389,7 @@ static INPUT_PORTS_START( namconb1 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON3 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_START
+ PORT_START_TAG("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/namcos12.c b/src/mame/drivers/namcos12.c
index e5155a2a775..a2af1fd138d 100644
--- a/src/mame/drivers/namcos12.c
+++ b/src/mame/drivers/namcos12.c
@@ -1146,16 +1146,16 @@ static READ32_HANDLER( system11gun_r )
switch( offset )
{
case 0:
- data = input_port_read_indexed(machine, 3 );
+ data = input_port_read(machine, "LIGHT0_X");
break;
case 1:
- data = ( input_port_read_indexed(machine, 4 ) ) | ( ( input_port_read_indexed(machine, 4 ) + 1 ) << 16 );
+ data = ( input_port_read(machine, "LIGHT0_Y") ) | ( ( input_port_read(machine, "LIGHT0_Y") + 1 ) << 16 );
break;
case 2:
- data = input_port_read_indexed(machine, 5 );
+ data = input_port_read(machine, "LIGHT1_X");
break;
case 3:
- data = ( input_port_read_indexed(machine, 6 ) ) | ( ( input_port_read_indexed(machine, 6 ) + 1 ) << 16 );
+ data = ( input_port_read(machine, "LIGHT1_Y") ) | ( ( input_port_read(machine, "LIGHT1_Y") + 1 ) << 16 );
break;
}
verboselog( 2, "system11gun_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
@@ -1383,7 +1383,7 @@ static WRITE8_HANDLER( s12_mcu_settings_w )
static READ8_HANDLER( s12_mcu_gun_h_r )
{
- const input_port_config *port = input_port_by_tag(machine->portconfig, "IN3");
+ const input_port_config *port = input_port_by_tag(machine->portconfig, "LIGHT0_X");
if( port != NULL )
{
int rv = input_port_read_direct( port ) << 6;
@@ -1402,7 +1402,7 @@ static READ8_HANDLER( s12_mcu_gun_h_r )
static READ8_HANDLER( s12_mcu_gun_v_r )
{
- const input_port_config *port = input_port_by_tag(machine->portconfig, "IN4");
+ const input_port_config *port = input_port_by_tag(machine->portconfig, "LIGHT0_Y");
if( port != NULL )
{
int rv = input_port_read_direct( port ) << 6;
@@ -1420,7 +1420,7 @@ static READ8_HANDLER( s12_mcu_gun_v_r )
}
static ADDRESS_MAP_START( s12h8iomap, ADDRESS_SPACE_IO, 8 )
- AM_RANGE(H8_PORT7, H8_PORT7) AM_READ( input_port_0_r )
+ AM_RANGE(H8_PORT7, H8_PORT7) AM_READ_PORT("DSW")
AM_RANGE(H8_PORT8, H8_PORT8) AM_READ( s12_mcu_p8_r ) AM_WRITENOP
AM_RANGE(H8_PORTA, H8_PORTA) AM_READWRITE( s12_mcu_pa_r, s12_mcu_pa_w )
AM_RANGE(H8_PORTB, H8_PORTB) AM_READWRITE( s12_mcu_portB_r, s12_mcu_portB_w )
@@ -1510,7 +1510,7 @@ static MACHINE_DRIVER_START( coh700 )
MACHINE_DRIVER_END
static INPUT_PORTS_START( namcos12 )
- PORT_START_TAG("IN0")
+ PORT_START_TAG("DSW")
PORT_DIPNAME( 0x0080, 0x0080, DEF_STR(Service_Mode) )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1519,7 +1519,7 @@ static INPUT_PORTS_START( namcos12 )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_BIT( 0xff3f, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN1")
+ PORT_START_TAG("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)
@@ -1537,7 +1537,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("IN2")
+ PORT_START_TAG("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,63 +1559,63 @@ INPUT_PORTS_END
static INPUT_PORTS_START( ptblank2 )
PORT_INCLUDE( namcos12 )
- PORT_MODIFY("IN1")
+ PORT_MODIFY("IN0")
PORT_BIT( 0x6f6f, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_MODIFY("IN2")
+ PORT_MODIFY("IN1")
PORT_BIT( 0x00ee, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START_TAG("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("IN4")
+ PORT_START_TAG("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("IN5")
+ PORT_START_TAG("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("IN6")
+ PORT_START_TAG("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
static INPUT_PORTS_START( ghlpanic )
PORT_INCLUDE( namcos12 )
- PORT_MODIFY("IN1")
+ PORT_MODIFY("IN0")
PORT_BIT( 0x6f6f, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_MODIFY("IN2")
+ PORT_MODIFY("IN1")
PORT_BIT( 0x00ee, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START_TAG("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("IN4")
+ PORT_START_TAG("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("IN5")
+ PORT_START_TAG("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("IN6")
+ PORT_START_TAG("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
static INPUT_PORTS_START( golgo13 )
PORT_INCLUDE( namcos12 )
- PORT_MODIFY("IN1")
+ PORT_MODIFY("IN0")
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0xff43, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_MODIFY("IN2")
+ PORT_MODIFY("IN1")
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x10ee, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN3")
+ PORT_START_TAG("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("IN4")
+ PORT_START_TAG("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 748b66c819f..66b6a58fa75 100644
--- a/src/mame/drivers/namcos2.c
+++ b/src/mame/drivers/namcos2.c
@@ -739,7 +739,7 @@ static ADDRESS_MAP_START( readmem_mcu, ADDRESS_SPACE_PROGRAM, 8 )
/* input ports and dips are mapped here */
AM_RANGE(0x0000, 0x0000) AM_READ(SMH_NOP) /* Keep logging quiet */
AM_RANGE(0x0001, 0x0001) AM_READ(namcos2_input_port_0_r)
- AM_RANGE(0x0002, 0x0002) AM_READ(input_port_1_r)
+ AM_RANGE(0x0002, 0x0002) AM_READ_PORT("MCUC")
AM_RANGE(0x0003, 0x0003) AM_READ(namcos2_mcu_port_d_r)
AM_RANGE(0x0007, 0x0007) AM_READ(namcos2_input_port_10_r)
AM_RANGE(0x0010, 0x0010) AM_READ(namcos2_mcu_analog_ctrl_r)
@@ -747,11 +747,11 @@ static ADDRESS_MAP_START( readmem_mcu, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0008, 0x003f) AM_READ(SMH_RAM) /* Fill in register to stop logging */
AM_RANGE(0x0040, 0x01bf) AM_READ(SMH_RAM)
AM_RANGE(0x01c0, 0x1fff) AM_READ(SMH_ROM)
- AM_RANGE(0x2000, 0x2000) AM_READ(input_port_11_r)
+ AM_RANGE(0x2000, 0x2000) AM_READ_PORT("DSW")
AM_RANGE(0x3000, 0x3000) AM_READ(namcos2_input_port_12_r)
- AM_RANGE(0x3001, 0x3001) AM_READ(input_port_13_r)
- AM_RANGE(0x3002, 0x3002) AM_READ(input_port_14_r)
- AM_RANGE(0x3003, 0x3003) AM_READ(input_port_15_r)
+ AM_RANGE(0x3001, 0x3001) AM_READ_PORT("MCUDI1")
+ AM_RANGE(0x3002, 0x3002) AM_READ_PORT("MCUDI2")
+ AM_RANGE(0x3003, 0x3003) AM_READ_PORT("MCUDI3")
AM_RANGE(0x5000, 0x57ff) AM_READ(namcos2_dpram_byte_r)
AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_NOP) /* watchdog */
AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM)
@@ -888,7 +888,7 @@ static INPUT_PORTS_START( default )
INPUT_PORTS_END
static INPUT_PORTS_START( gollygho )
- PORT_START_TAG("INB")
+ PORT_START_TAG("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,21 +900,21 @@ static INPUT_PORTS_START( gollygho )
NAMCOS2_MCU_PORT_C_DEFAULT
- PORT_START_TAG("GUNX1")
+ PORT_START_TAG("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("GUNY1")
+ PORT_START_TAG("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("GUNX2")
+ PORT_START_TAG("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("GUNY2")
+ PORT_START_TAG("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("NOP0")
+ PORT_START_TAG("AN4")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("NOP1")
+ PORT_START_TAG("AN5")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("NOP2")
+ PORT_START_TAG("AN6")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("NOP3")
+ PORT_START_TAG("AN7")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START_TAG("MCUH") /* 63B05Z0 - PORT H */ \
@@ -925,7 +925,7 @@ static INPUT_PORTS_START( gollygho )
INPUT_PORTS_END
static INPUT_PORTS_START( bubbletr )
- PORT_START_TAG("INB")
+ PORT_START_TAG("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,21 +937,21 @@ static INPUT_PORTS_START( bubbletr )
NAMCOS2_MCU_PORT_C_DEFAULT
- PORT_START_TAG("GUNX1")
+ PORT_START_TAG("AN0")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(8)
- PORT_START_TAG("GUNY1")
+ PORT_START_TAG("AN1")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(8)
- PORT_START_TAG("GUNX2")
+ PORT_START_TAG("AN2")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(8) PORT_PLAYER(2)
- PORT_START_TAG("GUNY2")
+ PORT_START_TAG("AN3")
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(8) PORT_PLAYER(2)
- PORT_START_TAG("NOP0")
+ PORT_START_TAG("AN4")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("NOP1")
+ PORT_START_TAG("AN5")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("NOP2")
+ PORT_START_TAG("AN6")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("NOP3")
+ PORT_START_TAG("AN7")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START_TAG("MCUH") /* 63B05Z0 - PORT H */ \
@@ -1135,15 +1135,20 @@ static INPUT_PORTS_START( fourtrax )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service Button") PORT_CODE(KEYCODE_F1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START_TAG("AN02") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 0 2 */
+ /* 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_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN13") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 3 */
+ PORT_START_TAG("AN1") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 1 3 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN24") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 4 */
+ PORT_START_TAG("AN2") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 2 4 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN35") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 5 */
+ PORT_START_TAG("AN3") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 3 5 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("AN46") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 6 */
+ PORT_START_TAG("AN4") /* 63B05Z0 - 8 CHANNEL ANALOG - CHANNEL 4 6 */
+ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_START_TAG("AN5")
+ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_START_TAG("AN6")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START_TAG("AN7") /* Steering Wheel 7 */ /* sensitivity, delta, min, max */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(75) PORT_KEYDELTA(100) PORT_PLAYER(1)
@@ -1206,17 +1211,18 @@ static INPUT_PORTS_START( assault )
NAMCOS2_MCU_DIPSW_DEFAULT
- PORT_START_TAG("3000") /* 63B05Z0 - $3000 */
+ /* These are tagged this way to make easier reads by tag */
+ PORT_START_TAG("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 /* 63B05Z0 - $3001 */
+ PORT_START_TAG("MCUDI1") /* 63B05Z0 - $3001 */
+ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_START_TAG("MCUDI2") /* 63B05Z0 - $3002 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 63B05Z0 - $3002 */
+ PORT_START_TAG("MCUDI3") /* 63B05Z0 - $3003 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
-// PORT_START /* 63B05Z0 - $3003 */
-// PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( suzuka )
diff --git a/src/mame/drivers/naughtyb.c b/src/mame/drivers/naughtyb.c
index 7cb576ae2fb..c6f3f0d9900 100644
--- a/src/mame/drivers/naughtyb.c
+++ b/src/mame/drivers/naughtyb.c
@@ -111,14 +111,14 @@ TODO:
static READ8_HANDLER( in0_port_r )
{
- int in0 = input_port_read_indexed(machine, 0);
+ int in0 = input_port_read(machine, "IN0");
if ( naughtyb_cocktail )
{
// cabinet == cocktail -AND- handling player 2
in0 = ( in0 & 0x03 ) | // start buttons
- ( input_port_read_indexed(machine, 1) & 0xFC ); // cocktail inputs
+ ( input_port_read(machine, "IN0_COCKTAIL") & 0xFC ); // cocktail inputs
}
return in0;
@@ -128,8 +128,8 @@ static READ8_HANDLER( dsw0_port_r )
{
// vblank replaces the cabinet dip
- return ( ( input_port_read_indexed(machine, 2) & 0x7F ) | // dsw0
- ( input_port_read_indexed(machine, 3) & 0x80 ) ); // vblank
+ return ( ( input_port_read(machine, "DSW0") & 0x7F ) | // dsw0
+ ( input_port_read(machine, "FAKE") & 0x80 ) ); // vblank
}
/* Pop Flamer
@@ -217,7 +217,7 @@ ADDRESS_MAP_END
static INTERRUPT_GEN( naughtyb_interrupt )
{
- if (input_port_read_indexed(machine, 3) & 1)
+ if (input_port_read(machine, "FAKE") & 1)
cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, PULSE_LINE);
}
diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c
index 66408d73b7b..1b5c2c44cb1 100644
--- a/src/mame/drivers/nemesis.c
+++ b/src/mame/drivers/nemesis.c
@@ -217,8 +217,8 @@ static READ16_HANDLER( konamigt_input_word_r )
bit 12-15: accel
*/
- int data=input_port_read_indexed(machine, 7);
- int data2=input_port_read_indexed(machine, 6);
+ int data=input_port_read(machine, "IN3");
+ int data2=input_port_read(machine, "PADDLE");
int ret=0x0000;
@@ -245,10 +245,10 @@ static READ16_HANDLER( selected_ip_r )
{
switch (hcrash_selected_ip & 0xf)
{ // From WEC Le Mans Schems:
- case 0xc: return input_port_read_indexed(machine,8); // Accel - Schems: Accelevr
- case 0: return input_port_read_indexed(machine,8);
- case 0xd: return input_port_read_indexed(machine,9); // Wheel - Schems: Handlevr
- case 1: return input_port_read_indexed(machine,9);
+ case 0xc: return input_port_read(machine, "ACCEL"); // Accel - Schems: Accelevr
+ case 0: return input_port_read(machine, "ACCEL");
+ case 0xd: return input_port_read(machine, "WHEEL"); // Wheel - Schems: Handlevr
+ case 1: return input_port_read(machine, "WHEEL");
default: return ~0;
}
@@ -276,13 +276,13 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x056000, 0x056fff) AM_READ(SMH_RAM)
AM_RANGE(0x05a000, 0x05afff) AM_READ(SMH_RAM)
- AM_RANGE(0x05c400, 0x05c401) AM_READ(input_port_4_word_r) /* DSW0 */
- AM_RANGE(0x05c402, 0x05c403) AM_READ(input_port_5_word_r) /* DSW1 */
+ AM_RANGE(0x05c400, 0x05c401) AM_READ_PORT("DSW0") /* DSW0 */
+ AM_RANGE(0x05c402, 0x05c403) AM_READ_PORT("DSW1") /* DSW1 */
- AM_RANGE(0x05cc00, 0x05cc01) AM_READ(input_port_0_word_r) /* IN0 */
- AM_RANGE(0x05cc02, 0x05cc03) AM_READ(input_port_1_word_r) /* IN1 */
- AM_RANGE(0x05cc04, 0x05cc05) AM_READ(input_port_2_word_r) /* IN2 */
- AM_RANGE(0x05cc06, 0x05cc07) AM_READ(input_port_3_word_r) /* TEST */
+ AM_RANGE(0x05cc00, 0x05cc01) AM_READ_PORT("IN0") /* IN0 */
+ AM_RANGE(0x05cc02, 0x05cc03) AM_READ_PORT("IN1") /* IN1 */
+ AM_RANGE(0x05cc04, 0x05cc05) AM_READ_PORT("IN2") /* IN2 */
+ AM_RANGE(0x05cc06, 0x05cc07) AM_READ_PORT("TEST") /* TEST */
AM_RANGE(0x060000, 0x067fff) AM_READ(SMH_RAM)
ADDRESS_MAP_END
@@ -384,13 +384,13 @@ static ADDRESS_MAP_START( konamigt_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x056000, 0x056fff) AM_READ(SMH_RAM)
AM_RANGE(0x05a000, 0x05afff) AM_READ(SMH_RAM)
- AM_RANGE(0x05c400, 0x05c401) AM_READ(input_port_4_word_r) /* DSW0 */
- AM_RANGE(0x05c402, 0x05c403) AM_READ(input_port_5_word_r) /* DSW1 */
+ AM_RANGE(0x05c400, 0x05c401) AM_READ_PORT("DSW0") /* DSW0 */
+ AM_RANGE(0x05c402, 0x05c403) AM_READ_PORT("DSW1") /* DSW1 */
- AM_RANGE(0x05cc00, 0x05cc01) AM_READ(input_port_0_word_r) /* IN0 */
- AM_RANGE(0x05cc02, 0x05cc03) AM_READ(input_port_1_word_r) /* IN1 */
- AM_RANGE(0x05cc04, 0x05cc05) AM_READ(input_port_2_word_r) /* IN2 */
- AM_RANGE(0x05cc06, 0x05cc07) AM_READ(input_port_3_word_r) /* TEST */
+ AM_RANGE(0x05cc00, 0x05cc01) AM_READ_PORT("IN0") /* IN0 */
+ AM_RANGE(0x05cc02, 0x05cc03) AM_READ_PORT("IN1") /* IN1 */
+ AM_RANGE(0x05cc04, 0x05cc05) AM_READ_PORT("IN2") /* IN2 */
+ AM_RANGE(0x05cc06, 0x05cc07) AM_READ_PORT("TEST") /* TEST */
AM_RANGE(0x060000, 0x067fff) AM_READ(SMH_RAM)
AM_RANGE(0x070000, 0x070001) AM_READ(konamigt_input_word_r)
@@ -441,12 +441,12 @@ static ADDRESS_MAP_START( gx400_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x056000, 0x056fff) AM_READ(SMH_RAM)
AM_RANGE(0x057000, 0x057fff) AM_READ(SMH_RAM)
AM_RANGE(0x05a000, 0x05afff) AM_READ(SMH_RAM)
- AM_RANGE(0x05c402, 0x05c403) AM_READ(input_port_4_word_r) /* DSW0 */
- AM_RANGE(0x05c404, 0x05c405) AM_READ(input_port_5_word_r) /* DSW1 */
- AM_RANGE(0x05c406, 0x05c407) AM_READ(input_port_3_word_r) /* TEST */
- AM_RANGE(0x05cc00, 0x05cc01) AM_READ(input_port_0_word_r) /* IN0 */
- AM_RANGE(0x05cc02, 0x05cc03) AM_READ(input_port_1_word_r) /* IN1 */
- AM_RANGE(0x05cc04, 0x05cc05) AM_READ(input_port_2_word_r) /* IN2 */
+ AM_RANGE(0x05c402, 0x05c403) AM_READ_PORT("DSW0") /* DSW0 */
+ AM_RANGE(0x05c404, 0x05c405) AM_READ_PORT("DSW1") /* DSW1 */
+ AM_RANGE(0x05c406, 0x05c407) AM_READ_PORT("TEST") /* TEST */
+ AM_RANGE(0x05cc00, 0x05cc01) AM_READ_PORT("IN0") /* IN0 */
+ AM_RANGE(0x05cc02, 0x05cc03) AM_READ_PORT("IN1") /* IN1 */
+ AM_RANGE(0x05cc04, 0x05cc05) AM_READ_PORT("IN2") /* IN2 */
AM_RANGE(0x060000, 0x07ffff) AM_READ(SMH_RAM)
AM_RANGE(0x080000, 0x0bffff) AM_READ(SMH_ROM)
ADDRESS_MAP_END
@@ -495,12 +495,12 @@ static ADDRESS_MAP_START( rf2_gx400_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x055000, 0x055fff) AM_READ(SMH_RAM)
AM_RANGE(0x056000, 0x056fff) AM_READ(SMH_RAM)
AM_RANGE(0x05a000, 0x05afff) AM_READ(SMH_RAM)
- AM_RANGE(0x05c402, 0x05c403) AM_READ(input_port_4_word_r) /* DSW0 */
- AM_RANGE(0x05c404, 0x05c405) AM_READ(input_port_5_word_r) /* DSW1 */
- AM_RANGE(0x05c406, 0x05c407) AM_READ(input_port_3_word_r) /* TEST */
- AM_RANGE(0x05cc00, 0x05cc01) AM_READ(input_port_0_word_r) /* IN0 */
- AM_RANGE(0x05cc02, 0x05cc03) AM_READ(input_port_1_word_r) /* IN1 */
- AM_RANGE(0x05cc04, 0x05cc05) AM_READ(input_port_2_word_r) /* IN2 */
+ AM_RANGE(0x05c402, 0x05c403) AM_READ_PORT("DSW0") /* DSW0 */
+ AM_RANGE(0x05c404, 0x05c405) AM_READ_PORT("DSW1") /* DSW1 */
+ AM_RANGE(0x05c406, 0x05c407) AM_READ_PORT("TEST") /* TEST */
+ AM_RANGE(0x05cc00, 0x05cc01) AM_READ_PORT("IN0") /* IN0 */
+ AM_RANGE(0x05cc02, 0x05cc03) AM_READ_PORT("IN1") /* IN1 */
+ AM_RANGE(0x05cc04, 0x05cc05) AM_READ_PORT("IN2") /* IN2 */
AM_RANGE(0x060000, 0x067fff) AM_READ(SMH_RAM)
AM_RANGE(0x070000, 0x070001) AM_READ(konamigt_input_word_r)
AM_RANGE(0x080000, 0x0bffff) AM_READ(SMH_ROM)
@@ -560,14 +560,14 @@ ADDRESS_MAP_END
/******************************************************************************/
static ADDRESS_MAP_START( salamand_readmem, ADDRESS_SPACE_PROGRAM, 16 )
- AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) /* ROM BIOS */
+ AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) /* ROM BIOS */
AM_RANGE(0x080000, 0x087fff) AM_READ(SMH_RAM)
AM_RANGE(0x090000, 0x091fff) AM_READ(SMH_RAM)
- AM_RANGE(0x0c0002, 0x0c0003) AM_READ(input_port_3_word_r) /* DSW0 */
- AM_RANGE(0x0c2000, 0x0c2001) AM_READ(input_port_0_word_r) /* Coins, start buttons, test mode */
- AM_RANGE(0x0c2002, 0x0c2003) AM_READ(input_port_1_word_r) /* IN1 */
- AM_RANGE(0x0c2004, 0x0c2005) AM_READ(input_port_2_word_r) /* IN2 */
- AM_RANGE(0x0c2006, 0x0c2007) AM_READ(input_port_4_word_r) /* DSW1 */
+ AM_RANGE(0x0c0002, 0x0c0003) AM_READ_PORT("DSW0") /* DSW0 */
+ AM_RANGE(0x0c2000, 0x0c2001) AM_READ_PORT("IN0") /* Coins, start buttons, test mode */
+ AM_RANGE(0x0c2002, 0x0c2003) AM_READ_PORT("IN1") /* IN1 */
+ AM_RANGE(0x0c2004, 0x0c2005) AM_READ_PORT("IN2") /* IN2 */
+ AM_RANGE(0x0c2006, 0x0c2007) AM_READ_PORT("DSW1") /* DSW1 */
AM_RANGE(0x100000, 0x100fff) AM_READ(SMH_RAM)
AM_RANGE(0x101000, 0x101fff) AM_READ(SMH_RAM)
AM_RANGE(0x102000, 0x102fff) AM_READ(SMH_RAM)
@@ -607,11 +607,11 @@ static ADDRESS_MAP_START( blkpnthr_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) /* ROM BIOS */
AM_RANGE(0x080000, 0x081fff) AM_READ(SMH_RAM)
AM_RANGE(0x090000, 0x097fff) AM_READ(SMH_RAM)
- AM_RANGE(0x0c0002, 0x0c0003) AM_READ(input_port_3_word_r) /* DSW0 */
- AM_RANGE(0x0c2000, 0x0c2001) AM_READ(input_port_0_word_r) /* Coins, start buttons, test mode */
- AM_RANGE(0x0c2002, 0x0c2003) AM_READ(input_port_1_word_r) /* IN1 */
- AM_RANGE(0x0c2004, 0x0c2005) AM_READ(input_port_2_word_r) /* IN2 */
- AM_RANGE(0x0c2006, 0x0c2007) AM_READ(input_port_4_word_r) /* DSW1 */
+ AM_RANGE(0x0c0002, 0x0c0003) AM_READ_PORT("DSW0") /* DSW0 */
+ AM_RANGE(0x0c2000, 0x0c2001) AM_READ_PORT("IN0") /* Coins, start buttons, test mode */
+ AM_RANGE(0x0c2002, 0x0c2003) AM_READ_PORT("IN1") /* IN1 */
+ AM_RANGE(0x0c2004, 0x0c2005) AM_READ_PORT("IN2") /* IN2 */
+ AM_RANGE(0x0c2006, 0x0c2007) AM_READ_PORT("DSW1") /* DSW1 */
AM_RANGE(0x100000, 0x100fff) AM_READ(SMH_RAM)
AM_RANGE(0x101000, 0x101fff) AM_READ(SMH_RAM)
AM_RANGE(0x102000, 0x102fff) AM_READ(SMH_RAM)
@@ -648,16 +648,16 @@ static ADDRESS_MAP_START( blkpnthr_writemem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
static ADDRESS_MAP_START( citybomb_readmem, ADDRESS_SPACE_PROGRAM, 16 )
- AM_RANGE(0x000000, 0x01ffff) AM_READ(SMH_ROM) /* ROM BIOS */
+ AM_RANGE(0x000000, 0x01ffff) AM_READ(SMH_ROM) /* ROM BIOS */
AM_RANGE(0x080000, 0x087fff) AM_READ(SMH_RAM)
AM_RANGE(0x0e0000, 0x0e1fff) AM_READ(SMH_RAM)
- AM_RANGE(0x0f0000, 0x0f0001) AM_READ(input_port_4_word_r) /* DSW1 */
- AM_RANGE(0x0f0002, 0x0f0003) AM_READ(input_port_2_word_r) /* IN2 */
- AM_RANGE(0x0f0004, 0x0f0005) AM_READ(input_port_1_word_r) /* IN1 */
- AM_RANGE(0x0f0006, 0x0f0007) AM_READ(input_port_0_word_r) /* Coins, start buttons, test mode */
- AM_RANGE(0x0f0008, 0x0f0009) AM_READ(input_port_3_word_r) /* DSW0 */
- AM_RANGE(0x0f0020, 0x0f0021) AM_READ(SMH_NOP) /* Analog device */
- AM_RANGE(0x100000, 0x1bffff) AM_READ(SMH_ROM) /* ROM BIOS */
+ AM_RANGE(0x0f0000, 0x0f0001) AM_READ_PORT("DSW1") /* DSW1 */
+ AM_RANGE(0x0f0002, 0x0f0003) AM_READ_PORT("IN2") /* IN2 */
+ AM_RANGE(0x0f0004, 0x0f0005) AM_READ_PORT("IN1") /* IN1 */
+ AM_RANGE(0x0f0006, 0x0f0007) AM_READ_PORT("IN0") /* Coins, start buttons, test mode */
+ AM_RANGE(0x0f0008, 0x0f0009) AM_READ_PORT("DSW0") /* DSW0 */
+ AM_RANGE(0x0f0020, 0x0f0021) AM_READ(SMH_NOP) /* Analog device */
+ AM_RANGE(0x100000, 0x1bffff) AM_READ(SMH_ROM) /* ROM BIOS */
AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM)
AM_RANGE(0x210000, 0x210fff) AM_READ(SMH_RAM)
AM_RANGE(0x211000, 0x211fff) AM_READ(SMH_RAM)
@@ -696,15 +696,15 @@ static ADDRESS_MAP_START( citybomb_writemem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
static ADDRESS_MAP_START( nyanpani_readmem, ADDRESS_SPACE_PROGRAM, 16 )
- AM_RANGE(0x000000, 0x01ffff) AM_READ(SMH_ROM) /* ROM BIOS */
+ AM_RANGE(0x000000, 0x01ffff) AM_READ(SMH_ROM) /* ROM BIOS */
AM_RANGE(0x040000, 0x047fff) AM_READ(SMH_RAM)
AM_RANGE(0x060000, 0x061fff) AM_READ(SMH_RAM)
- AM_RANGE(0x100000, 0x13ffff) AM_READ(SMH_ROM) /* ROM BIOS */
- AM_RANGE(0x070000, 0x070001) AM_READ(input_port_4_word_r) /* DSW1 */
- AM_RANGE(0x070002, 0x070003) AM_READ(input_port_2_word_r) /* IN2 */
- AM_RANGE(0x070004, 0x070005) AM_READ(input_port_1_word_r) /* IN1 */
- AM_RANGE(0x070006, 0x070007) AM_READ(input_port_0_word_r) /* Coins, start buttons, test mode */
- AM_RANGE(0x070008, 0x070009) AM_READ(input_port_3_word_r) /* DSW0 */
+ AM_RANGE(0x100000, 0x13ffff) AM_READ(SMH_ROM) /* ROM BIOS */
+ AM_RANGE(0x070000, 0x070001) AM_READ_PORT("DSW1") /* DSW1 */
+ AM_RANGE(0x070002, 0x070003) AM_READ_PORT("IN2") /* IN2 */
+ AM_RANGE(0x070004, 0x070005) AM_READ_PORT("IN1") /* IN1 */
+ AM_RANGE(0x070006, 0x070007) AM_READ_PORT("IN0") /* Coins, start buttons, test mode */
+ AM_RANGE(0x070008, 0x070009) AM_READ_PORT("DSW0") /* DSW0 */
AM_RANGE(0x200000, 0x200fff) AM_READ(SMH_RAM)
AM_RANGE(0x201000, 0x201fff) AM_READ(SMH_RAM)
AM_RANGE(0x202000, 0x202fff) AM_READ(SMH_RAM)
@@ -804,11 +804,11 @@ static ADDRESS_MAP_START( hcrash_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x090000, 0x091fff) AM_RAM_WRITE(salamander_palette_word_w) AM_BASE(&paletteram16)
AM_RANGE(0x0a0000, 0x0a0001) AM_WRITE(nemesis_irq_enable_word_w) /* irq enable */
AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE(salamand_soundlatch_word_w)
- AM_RANGE(0x0c0002, 0x0c0003) AM_READ(input_port_4_word_r)
- AM_RANGE(0x0c0004, 0x0c0005) AM_READ(input_port_5_word_r)
- AM_RANGE(0x0c0006, 0x0c0007) AM_READ(input_port_3_word_r)
+ AM_RANGE(0x0c0002, 0x0c0003) AM_READ_PORT("DSW0")
+ AM_RANGE(0x0c0004, 0x0c0005) AM_READ_PORT("DSW1")
+ AM_RANGE(0x0c0006, 0x0c0007) AM_READ_PORT("TEST")
AM_RANGE(0x0c0008, 0x0c0009) AM_WRITENOP /* watchdog probably */
- AM_RANGE(0x0c000a, 0x0c000b) AM_READ(input_port_0_word_r)
+ AM_RANGE(0x0c000a, 0x0c000b) AM_READ_PORT("IN0")
AM_RANGE(0x0c2000, 0x0c2001) AM_READ(konamigt_input_word_r) /* Konami GT control */
AM_RANGE(0x0c2800, 0x0c2801) AM_WRITENOP
AM_RANGE(0x0c2802, 0x0c2803) AM_WRITE(gx400_irq2_enable_word_w) // or at 0x0c2804 ?
@@ -869,7 +869,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( nemesis )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -879,7 +879,7 @@ static INPUT_PORTS_START( nemesis )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START_TAG("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)
@@ -889,7 +889,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 /* IN2 */
+ PORT_START_TAG("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)
@@ -899,7 +899,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 /* TEST */
+ PORT_START_TAG("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 ) )
@@ -913,10 +913,10 @@ static INPUT_PORTS_START( nemesis )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* DSW0 */
+ PORT_START_TAG("DSW0") /* DSW0 */
GX400_COINAGE_DIP
- PORT_START /* DSW1 */
+ PORT_START_TAG("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -942,7 +942,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( nemesuk )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -952,7 +952,7 @@ static INPUT_PORTS_START( nemesuk )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START_TAG("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)
@@ -962,7 +962,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 /* IN2 */
+ PORT_START_TAG("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)
@@ -972,7 +972,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 /* TEST */
+ PORT_START_TAG("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 ) )
@@ -986,10 +986,10 @@ static INPUT_PORTS_START( nemesuk )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* DSW0 */
+ PORT_START_TAG("DSW0") /* DSW0 */
GX400_COINAGE_DIP
- PORT_START /* DSW1 */
+ PORT_START_TAG("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -1016,7 +1016,7 @@ INPUT_PORTS_END
/* This needs to be sorted */
static INPUT_PORTS_START( konamigt )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -1026,14 +1026,14 @@ static INPUT_PORTS_START( konamigt )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START_TAG("IN1") /* IN1 */
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON3 ) /* gear */
PORT_BIT( 0xef, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN2 */
+ PORT_START_TAG("IN2") /* IN2 */
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* TEST */
+ PORT_START_TAG("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 ) )
@@ -1047,10 +1047,10 @@ static INPUT_PORTS_START( konamigt )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* DSW0 */
+ PORT_START_TAG("DSW0") /* DSW0 */
GX400_COINAGE_DIP
- PORT_START /* DSW1 */
+ PORT_START_TAG("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 ) )
@@ -1075,10 +1075,10 @@ static INPUT_PORTS_START( konamigt )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* IN6 */
+ PORT_START_TAG("PADDLE") /* IN6 */
PORT_BIT( 0x7f, 0x40, IPT_PADDLE ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10)
- PORT_START /* IN7 */
+ PORT_START_TAG("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 )
@@ -1087,7 +1087,7 @@ INPUT_PORTS_END
/* This needs to be sorted */
static INPUT_PORTS_START( rf2 )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -1097,14 +1097,14 @@ static INPUT_PORTS_START( rf2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START_TAG("IN1") /* IN1 */
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_BUTTON3 ) /* gear (0-7) */
PORT_BIT( 0x8f, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN2 */
+ PORT_START_TAG("IN2") /* IN2 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* TEST */
+ PORT_START_TAG("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 ) )
@@ -1118,10 +1118,10 @@ static INPUT_PORTS_START( rf2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* DSW0 */
+ PORT_START_TAG("DSW0") /* DSW0 */
GX400_COINAGE_DIP
- PORT_START /* DSW1 */
+ PORT_START_TAG("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 ) )
@@ -1146,10 +1146,10 @@ static INPUT_PORTS_START( rf2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* IN6 */
+ PORT_START_TAG("PADDLE") /* IN6 */
PORT_BIT( 0x7f, 0x40, IPT_PADDLE ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10)
- PORT_START /* IN7 */
+ PORT_START_TAG("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 )
@@ -1158,7 +1158,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( gwarrior )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -1168,7 +1168,7 @@ static INPUT_PORTS_START( gwarrior )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START_TAG("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)
@@ -1178,7 +1178,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 /* IN2 */
+ PORT_START_TAG("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)
@@ -1188,7 +1188,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 /* TEST */
+ PORT_START_TAG("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 ) )
@@ -1202,10 +1202,10 @@ static INPUT_PORTS_START( gwarrior )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* DSW0 */
+ PORT_START_TAG("DSW0") /* DSW0 */
GX400_COINAGE_DIP
- PORT_START /* DSW1 */
+ PORT_START_TAG("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -1231,7 +1231,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( twinbee )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -1241,18 +1241,17 @@ static INPUT_PORTS_START( twinbee )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START_TAG("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)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
-
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
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_UNKNOWN )
- PORT_START /* IN2 */
+ PORT_START_TAG("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 +1261,7 @@ static INPUT_PORTS_START( twinbee )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* TEST */
+ PORT_START_TAG("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 +1275,10 @@ static INPUT_PORTS_START( twinbee )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* DSW0 */
+ PORT_START_TAG("DSW0") /* DSW0 */
GX400_COINAGE_DIP
- PORT_START /* DSW1 */
+ PORT_START_TAG("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -1305,7 +1304,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( gradius )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 +1314,7 @@ static INPUT_PORTS_START( gradius )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START_TAG("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 +1324,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 /* IN2 */
+ PORT_START_TAG("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 +1334,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 /* TEST */
+ PORT_START_TAG("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 +1348,10 @@ static INPUT_PORTS_START( gradius )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* DSW0 */
+ PORT_START_TAG("DSW0") /* DSW0 */
GX400_COINAGE_DIP
- PORT_START /* DSW1 */
+ PORT_START_TAG("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -1378,7 +1377,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( salamand )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 +1391,7 @@ static INPUT_PORTS_START( salamand )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_LOW, "SWT:3" )
- PORT_START /* IN1 */
+ PORT_START_TAG("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 +1403,7 @@ static INPUT_PORTS_START( salamand )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START /* IN2 */
+ PORT_START_TAG("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,8 +1413,7 @@ static INPUT_PORTS_START( salamand )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
-
- PORT_START /* DSW0 */
+ PORT_START_TAG("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 ) )
@@ -1446,7 +1444,7 @@ static INPUT_PORTS_START( salamand )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW1 */
+ PORT_START_TAG("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -1472,7 +1470,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( lifefrcj )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -1486,7 +1484,7 @@ static INPUT_PORTS_START( lifefrcj )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_LOW, "SWT:3" )
- PORT_START /* IN1 */
+ PORT_START_TAG("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)
@@ -1498,7 +1496,7 @@ static INPUT_PORTS_START( lifefrcj )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START /* IN2 */
+ PORT_START_TAG("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)
@@ -1508,8 +1506,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 /* DSW0 */
+ PORT_START_TAG("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 ) )
@@ -1545,7 +1542,7 @@ static INPUT_PORTS_START( lifefrcj )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x00, "Disabled" )
- PORT_START /* DSW1 */
+ PORT_START_TAG("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -1570,7 +1567,7 @@ static INPUT_PORTS_START( lifefrcj )
INPUT_PORTS_END
static INPUT_PORTS_START( blkpnthr )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -1585,7 +1582,7 @@ static INPUT_PORTS_START( blkpnthr )
PORT_DIPSETTING( 0x40, "3 Areas" )
PORT_DIPSETTING( 0x00, "4 Areas" )
- PORT_START /* IN1 */
+ PORT_START_TAG("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)
@@ -1595,7 +1592,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 /* IN2 */
+ PORT_START_TAG("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)
@@ -1605,8 +1602,7 @@ static INPUT_PORTS_START( blkpnthr )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
-
- PORT_START /* DSW0 */
+ PORT_START_TAG("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 ) )
@@ -1642,7 +1638,7 @@ static INPUT_PORTS_START( blkpnthr )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x00, "Disabled" )
- PORT_START /* DSW1 */
+ PORT_START_TAG("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -1667,7 +1663,7 @@ static INPUT_PORTS_START( blkpnthr )
INPUT_PORTS_END
static INPUT_PORTS_START( citybomb )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -1681,7 +1677,7 @@ static INPUT_PORTS_START( citybomb )
PORT_DIPSETTING( 0x00, DEF_STR( Dual ) )
PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_LOW, "SWT:3" )
- PORT_START /* IN1 */
+ PORT_START_TAG("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)
@@ -1693,7 +1689,7 @@ static INPUT_PORTS_START( citybomb )
PORT_DIPSETTING( 0x00, "Handle" )
PORT_DIPSETTING( 0x80, DEF_STR( Joystick ) )
- PORT_START /* IN2 */
+ PORT_START_TAG("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)
@@ -1703,7 +1699,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 /* DSW0 */
+ PORT_START_TAG("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 ) )
@@ -1739,7 +1735,7 @@ static INPUT_PORTS_START( citybomb )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x00, "Disabled" )
- PORT_START /* DSW1 */
+ PORT_START_TAG("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 ) )
@@ -1759,7 +1755,7 @@ static INPUT_PORTS_START( citybomb )
INPUT_PORTS_END
static INPUT_PORTS_START( nyanpani )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -1771,7 +1767,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 /* IN1 */
+ PORT_START_TAG("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)
@@ -1781,7 +1777,7 @@ static INPUT_PORTS_START( nyanpani )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN2 */
+ PORT_START_TAG("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)
@@ -1791,7 +1787,7 @@ static INPUT_PORTS_START( nyanpani )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* DSW0 */
+ PORT_START_TAG("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 ) )
@@ -1827,7 +1823,7 @@ static INPUT_PORTS_START( nyanpani )
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) )
PORT_DIPSETTING( 0x00, "Disabled" )
- PORT_START /* DSW1 */
+ PORT_START_TAG("DSW1") /* DSW1 */
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -1844,7 +1840,7 @@ static INPUT_PORTS_START( nyanpani )
INPUT_PORTS_END
static INPUT_PORTS_START( hcrash )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -1854,7 +1850,7 @@ static INPUT_PORTS_START( hcrash )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START_TAG("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 )
@@ -1864,10 +1860,10 @@ static INPUT_PORTS_START( hcrash )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START /* IN2 */
+ PORT_START_TAG("IN2") /* IN2 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* TEST */
+ PORT_START_TAG("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 ) )
@@ -1891,10 +1887,10 @@ static INPUT_PORTS_START( hcrash )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW0 */
+ PORT_START_TAG("DSW0") /* DSW0 */
GX400_COINAGE_DIP
- PORT_START /* DSW1 */
+ PORT_START_TAG("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" )
@@ -1919,19 +1915,19 @@ static INPUT_PORTS_START( hcrash )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
/* Konami GT specific control */
- PORT_START /* IN6 */
+ PORT_START_TAG("PADDLE") /* IN6 */
PORT_BIT( 0x7f, 0x40, IPT_PADDLE ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10)
- PORT_START /* IN7 */
+ PORT_START_TAG("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 /* IN8 - Accelerator */
+ PORT_START_TAG("ACCEL") /* IN8 - Accelerator */
PORT_BIT( 0xff, 0, IPT_PEDAL ) PORT_MINMAX(0,0x80) PORT_SENSITIVITY(30) PORT_KEYDELTA(10)
- PORT_START /* IN9 - Steering Wheel */
+ PORT_START_TAG("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/nitedrvr.c b/src/mame/drivers/nitedrvr.c
index 08661115523..dce92f5097e 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 // fake
+ PORT_START_TAG("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 // fake
+ PORT_START_TAG("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 // fake
+ PORT_START_TAG("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 // fake
+ PORT_START_TAG("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 // fake
+ PORT_START_TAG("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,7 +103,7 @@ 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 // fake
+ PORT_START_TAG("STEER") // fake
PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
PORT_START_TAG("MOTOR")
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index 9dc86fe7aab..e365bc5ec6a 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -333,7 +333,7 @@ static READ16_HANDLER( tharrier_mcu_r )
return res << 8;
}
else
- return ~input_port_read_indexed(machine,1);
+ return ~input_port_read(machine, "IN1");
}
static WRITE16_HANDLER( macross2_sound_command_w )
@@ -385,10 +385,10 @@ static WRITE16_HANDLER( afega_soundlatch_w )
static ADDRESS_MAP_START( vandyke_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM)
- AM_RANGE(0x080000, 0x080001) AM_READ(input_port_0_word_r)
- AM_RANGE(0x080002, 0x080003) AM_READ(input_port_1_word_r)
- AM_RANGE(0x080008, 0x080009) AM_READ(input_port_2_word_r)
- AM_RANGE(0x08000a, 0x08000b) AM_READ(input_port_3_word_r)
+ AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
+ AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
+ AM_RANGE(0x080008, 0x080009) AM_READ_PORT("DSW1")
+ AM_RANGE(0x08000a, 0x08000b) AM_READ_PORT("DSW2")
AM_RANGE(0x08000e, 0x08000f) AM_READ(NMK004_r)
AM_RANGE(0x088000, 0x0887ff) AM_READ(SMH_RAM)
AM_RANGE(0x090000, 0x093fff) AM_READ(nmk_bgvideoram_r)
@@ -411,9 +411,9 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( manybloc_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM)
- AM_RANGE(0x080000, 0x080001) AM_READ(input_port_0_word_r)
- AM_RANGE(0x080002, 0x080003) AM_READ(input_port_1_word_r)
- AM_RANGE(0x080004, 0x080005) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
+ AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
+ AM_RANGE(0x080004, 0x080005) AM_READ_PORT("DSW1")
AM_RANGE(0x08001e, 0x08001f) AM_READ(soundlatch2_word_r)
AM_RANGE(0x088000, 0x0883ff) AM_READ(SMH_RAM)
AM_RANGE(0x090000, 0x093fff) AM_READ(nmk_bgvideoram_r)
@@ -467,11 +467,11 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( tharrier_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM)
- AM_RANGE(0x080000, 0x080001) AM_READ(input_port_0_word_r)
+ AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
AM_RANGE(0x080002, 0x080003) AM_READ(tharrier_mcu_r) //input_port_1_word_r },
- AM_RANGE(0x080004, 0x080005) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x080004, 0x080005) AM_READ_PORT("DSW1")
AM_RANGE(0x08000e, 0x08000f) AM_READ(soundlatch2_word_r) /* from Z80 */
- AM_RANGE(0x080202, 0x080203) AM_READ(input_port_3_word_r )
+ AM_RANGE(0x080202, 0x080203) AM_READ_PORT("IN2")
AM_RANGE(0x088000, 0x0883ff) AM_READ(SMH_RAM)
AM_RANGE(0x090000, 0x093fff) AM_READ(nmk_bgvideoram_r)
@@ -498,9 +498,9 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mustang_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
- AM_RANGE(0x080000, 0x080001) AM_READ(input_port_0_word_r)
- AM_RANGE(0x080002, 0x080003) AM_READ(input_port_1_word_r)
- AM_RANGE(0x080004, 0x080005) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
+ AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
+ AM_RANGE(0x080004, 0x080005) AM_READ_PORT("DSW1")
AM_RANGE(0x08000e, 0x08000f) AM_READWRITE(NMK004_r, SMH_NOP)
AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w)
AM_RANGE(0x080016, 0x080017) AM_WRITE(SMH_NOP) // frame number?
@@ -515,9 +515,9 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mustangb_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
- AM_RANGE(0x080000, 0x080001) AM_READ(input_port_0_word_r)
- AM_RANGE(0x080002, 0x080003) AM_READ(input_port_1_word_r)
- AM_RANGE(0x080004, 0x080005) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
+ AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
+ AM_RANGE(0x080004, 0x080005) AM_READ_PORT("DSW1")
AM_RANGE(0x08000e, 0x08000f) AM_READWRITE(SMH_NOP, SMH_NOP)
AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w)
AM_RANGE(0x080016, 0x080017) AM_WRITE(SMH_NOP) // frame number?
@@ -533,9 +533,9 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( twinactn_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
- AM_RANGE(0x080000, 0x080001) AM_READ(input_port_0_word_r)
- AM_RANGE(0x080002, 0x080003) AM_READ(input_port_1_word_r)
- AM_RANGE(0x080004, 0x080005) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
+ AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
+ AM_RANGE(0x080004, 0x080005) AM_READ_PORT("DSW1")
AM_RANGE(0x08000e, 0x08000f) AM_READWRITE(SMH_NOP, SMH_NOP)
AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w)
AM_RANGE(0x080016, 0x080017) AM_WRITE(SMH_NOP) // frame number?
@@ -549,20 +549,15 @@ static ADDRESS_MAP_START( twinactn_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-
-
-
-
-
static ADDRESS_MAP_START( acrobatm_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x00000, 0x3ffff) AM_READ(SMH_ROM)
AM_RANGE(0x80000, 0x8ffff) AM_RAM AM_BASE(&nmk16_mainram)
- AM_RANGE(0xc0000, 0xc0001) AM_READ(input_port_0_word_r)
- AM_RANGE(0xc0002, 0xc0003) AM_READ(input_port_1_word_r)
- AM_RANGE(0xc0008, 0xc0009) AM_READ(input_port_2_word_r)
- AM_RANGE(0xc000a, 0xc000b) AM_READ(input_port_3_word_r)
+ AM_RANGE(0xc0000, 0xc0001) AM_READ_PORT("IN0")
+ AM_RANGE(0xc0002, 0xc0003) AM_READ_PORT("IN1")
+ AM_RANGE(0xc0008, 0xc0009) AM_READ_PORT("DSW1")
+ AM_RANGE(0xc000a, 0xc000b) AM_READ_PORT("DSW2")
AM_RANGE(0xc000e, 0xc000f) AM_READ(NMK004_r)
AM_RANGE(0xc4000, 0xc45ff) AM_READ(SMH_RAM)
AM_RANGE(0xcc000, 0xcffff) AM_READ(nmk_bgvideoram_r)
@@ -583,10 +578,10 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( bioship_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM)
- AM_RANGE(0x080000, 0x080001) AM_READ(input_port_0_word_r)
- AM_RANGE(0x080002, 0x080003) AM_READ(input_port_1_word_r)
- AM_RANGE(0x080008, 0x080009) AM_READ(input_port_2_word_r)
- AM_RANGE(0x08000a, 0x08000b) AM_READ(input_port_3_word_r)
+ AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
+ AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
+ AM_RANGE(0x080008, 0x080009) AM_READ_PORT("DSW1")
+ AM_RANGE(0x08000a, 0x08000b) AM_READ_PORT("DSW2")
AM_RANGE(0x08000e, 0x08000f) AM_READ(NMK004_r)
AM_RANGE(0x088000, 0x0887ff) AM_READ(SMH_RAM)
AM_RANGE(0x090000, 0x093fff) AM_READ(nmk_bgvideoram_r)
@@ -856,10 +851,10 @@ static ADDRESS_MAP_START( tdragon_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0c8000, 0x0c87ff) AM_READ(SMH_RAM) /* Palette RAM */
- AM_RANGE(0x0c0000, 0x0c0001) AM_READ(input_port_0_word_r)
- AM_RANGE(0x0c0002, 0x0c0003) AM_READ(input_port_1_word_r)
- AM_RANGE(0x0c0008, 0x0c0009) AM_READ(input_port_2_word_r)
- AM_RANGE(0x0c000a, 0x0c000b) AM_READ(input_port_3_word_r)
+ AM_RANGE(0x0c0000, 0x0c0001) AM_READ_PORT("IN0")
+ AM_RANGE(0x0c0002, 0x0c0003) AM_READ_PORT("IN1")
+ AM_RANGE(0x0c0008, 0x0c0009) AM_READ_PORT("DSW1")
+ AM_RANGE(0x0c000a, 0x0c000b) AM_READ_PORT("DSW2")
AM_RANGE(0x0c000e, 0x0c000f) AM_READ(NMK004_r)
AM_RANGE(0x0cc000, 0x0cffff) AM_READ(nmk_bgvideoram_r)
AM_RANGE(0x0d0000, 0x0d07ff) AM_READ(nmk_txvideoram_r)
@@ -897,9 +892,9 @@ static ADDRESS_MAP_START( ssmissin_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM)
AM_RANGE(0x0b0000, 0x0bffff) AM_RAM AM_BASE(&nmk16_mainram)
AM_RANGE(0x0c8000, 0x0c87ff) AM_READ(SMH_RAM) /* Palette RAM */
- AM_RANGE(0x0c0000, 0x0c0001) 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(0x0c0000, 0x0c0001) AM_READ_PORT("IN0")
+ AM_RANGE(0x0c0004, 0x0c0005) AM_READ_PORT("IN1")
+ AM_RANGE(0x0c0006, 0x0c0007) AM_READ_PORT("DSW1")
// AM_RANGE(0x0c000e, 0x0c000f) AM_READ(??)
AM_RANGE(0x0cc000, 0x0cffff) AM_READ(nmk_bgvideoram_r)
AM_RANGE(0x0d0000, 0x0d07ff) AM_READ(nmk_txvideoram_r)
@@ -939,10 +934,10 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( strahl_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x00000, 0x3ffff) AM_READ(SMH_ROM)
- AM_RANGE(0x80000, 0x80001) AM_READ(input_port_0_word_r)
- AM_RANGE(0x80002, 0x80003) AM_READ(input_port_1_word_r)
- AM_RANGE(0x80008, 0x80009) AM_READ(input_port_2_word_r)
- AM_RANGE(0x8000a, 0x8000b) AM_READ(input_port_3_word_r)
+ AM_RANGE(0x80000, 0x80001) AM_READ_PORT("IN0")
+ AM_RANGE(0x80002, 0x80003) AM_READ_PORT("IN1")
+ AM_RANGE(0x80008, 0x80009) AM_READ_PORT("DSW1")
+ AM_RANGE(0x8000a, 0x8000b) AM_READ_PORT("DSW2")
AM_RANGE(0x8000e, 0x8000f) AM_READ(NMK004_r)
AM_RANGE(0x8c000, 0x8c7ff) AM_READ(SMH_RAM)
AM_RANGE(0x90000, 0x93fff) AM_READ(nmk_bgvideoram_r)
@@ -966,10 +961,10 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( macross_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM)
- AM_RANGE(0x080000, 0x080001) AM_READ(input_port_0_word_r)
- AM_RANGE(0x080002, 0x080003) AM_READ(input_port_1_word_r)
- AM_RANGE(0x080008, 0x080009) AM_READ(input_port_2_word_r)
- AM_RANGE(0x08000a, 0x08000b) AM_READ(input_port_3_word_r)
+ AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
+ AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
+ AM_RANGE(0x080008, 0x080009) AM_READ_PORT("DSW1")
+ AM_RANGE(0x08000a, 0x08000b) AM_READ_PORT("DSW2")
AM_RANGE(0x08000e, 0x08000f) AM_READ(NMK004_r)
AM_RANGE(0x088000, 0x0887ff) AM_READ(SMH_RAM)
AM_RANGE(0x090000, 0x093fff) AM_READ(nmk_bgvideoram_r)
@@ -991,10 +986,10 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( gunnail_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x080000, 0x080001) AM_READ(input_port_0_word_r)
- AM_RANGE(0x080002, 0x080003) AM_READ(input_port_1_word_r)
- AM_RANGE(0x080008, 0x080009) AM_READ(input_port_2_word_r)
- AM_RANGE(0x08000a, 0x08000b) AM_READ(input_port_3_word_r)
+ AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
+ AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
+ AM_RANGE(0x080008, 0x080009) AM_READ_PORT("DSW1")
+ AM_RANGE(0x08000a, 0x08000b) AM_READ_PORT("DSW2")
AM_RANGE(0x08000e, 0x08000f) AM_READ(NMK004_r)
AM_RANGE(0x080014, 0x080015) AM_WRITE(nmk_flipscreen_w)
AM_RANGE(0x080016, 0x080017) AM_WRITE(SMH_NOP) /* IRQ enable? */
@@ -1011,10 +1006,10 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( macross2_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM)
- AM_RANGE(0x100000, 0x100001) AM_READ(input_port_0_word_r)
- AM_RANGE(0x100002, 0x100003) AM_READ(input_port_1_word_r)
- AM_RANGE(0x100008, 0x100009) AM_READ(input_port_2_word_r)
- AM_RANGE(0x10000a, 0x10000b) AM_READ(input_port_3_word_r)
+ AM_RANGE(0x100000, 0x100001) AM_READ_PORT("IN0")
+ AM_RANGE(0x100002, 0x100003) AM_READ_PORT("IN1")
+ AM_RANGE(0x100008, 0x100009) AM_READ_PORT("DSW1")
+ AM_RANGE(0x10000a, 0x10000b) AM_READ_PORT("DSW2")
AM_RANGE(0x10000e, 0x10000f) AM_READ(macross2_sound_result_r) /* from Z80 */
AM_RANGE(0x120000, 0x1207ff) AM_READ(SMH_RAM)
AM_RANGE(0x140000, 0x14ffff) AM_READ(nmk_bgvideoram_r)
@@ -1118,10 +1113,10 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( bjtwin_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM)
- AM_RANGE(0x080000, 0x080001) AM_READ(input_port_0_word_r)
- AM_RANGE(0x080002, 0x080003) AM_READ(input_port_1_word_r)
- AM_RANGE(0x080008, 0x080009) AM_READ(input_port_2_word_r)
- AM_RANGE(0x08000a, 0x08000b) AM_READ(input_port_3_word_r)
+ AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
+ AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
+ AM_RANGE(0x080008, 0x080009) AM_READ_PORT("DSW1")
+ AM_RANGE(0x08000a, 0x08000b) AM_READ_PORT("DSW2")
AM_RANGE(0x084000, 0x084001) AM_READ(OKIM6295_status_0_lsb_r)
AM_RANGE(0x084010, 0x084011) AM_READ(OKIM6295_status_1_lsb_r)
AM_RANGE(0x088000, 0x0887ff) AM_READ(SMH_RAM)
@@ -1145,7 +1140,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( vandyke )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -1155,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 /* IN1 */
+ PORT_START_TAG("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)
@@ -1173,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 /* DSW 1 */
+ PORT_START_TAG("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" )
@@ -1196,7 +1191,7 @@ static INPUT_PORTS_START( vandyke )
PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x80, DEF_STR( Hardest ) )
- PORT_START /* DSW 2 */
+ PORT_START_TAG("DSW2") /* DSW 2 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1224,7 +1219,7 @@ static INPUT_PORTS_START( vandyke )
INPUT_PORTS_END
static INPUT_PORTS_START( blkheart )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -1234,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 /* IN1 */
+ PORT_START_TAG("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)
@@ -1252,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 /* DSW 1 */
+ PORT_START_TAG("DSW1") /* DSW 1 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1274,7 +1269,7 @@ static INPUT_PORTS_START( blkheart )
PORT_DIPSETTING( 0x80, "4" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_START /* DSW 2 */
+ PORT_START_TAG("DSW2") /* DSW 2 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1302,11 +1297,11 @@ static INPUT_PORTS_START( blkheart )
INPUT_PORTS_END
static INPUT_PORTS_START( manybloc )
- PORT_START /* IN0 - 0x080000 */
+ PORT_START_TAG("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 /* IN1 - 0x080002 */
+ PORT_START_TAG("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
@@ -1324,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 /* DSW - 0x080004 -> 0x0f0036 */
+ PORT_START_TAG("DSW1") /* DSW - 0x080004 -> 0x0f0036 */
PORT_DIPNAME( 0x0001, 0x0000, "Slot System" )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0001, DEF_STR( On ) )
@@ -1381,7 +1376,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( tharrier )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -1390,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 /* IN1 */
+ PORT_START_TAG("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 )
@@ -1408,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 /* DSW */
+ PORT_START_TAG("DSW1") /* DSW */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1455,7 +1450,7 @@ static INPUT_PORTS_START( tharrier )
PORT_DIPSETTING( 0x8000, "4" )
PORT_DIPSETTING( 0x0000, "5" )
- PORT_START /* IN2 ? */
+ PORT_START_TAG("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)
@@ -1477,7 +1472,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( mustang )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -1487,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 /* IN1 */
+ PORT_START_TAG("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)
@@ -1505,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 /* DSW */
+ PORT_START_TAG("DSW1") /* DSW */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1555,7 +1550,7 @@ static INPUT_PORTS_START( mustang )
INPUT_PORTS_END
static INPUT_PORTS_START( hachamf )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -1565,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 /* IN1 */
+ PORT_START_TAG("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)
@@ -1583,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 /* DSW A */
+ PORT_START_TAG("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 ) )
@@ -1634,7 +1629,7 @@ static INPUT_PORTS_START( hachamf )
INPUT_PORTS_END
static INPUT_PORTS_START( strahl )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -1644,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 /* IN1 */
+ PORT_START_TAG("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)
@@ -1662,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 /* DSW A */
+ PORT_START_TAG("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 ) )
@@ -1688,7 +1683,7 @@ static INPUT_PORTS_START( strahl )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW B */
+ PORT_START_TAG("DSW2") /* DSW B */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x02, "2" )
PORT_DIPSETTING( 0x03, "3" )
@@ -1711,7 +1706,7 @@ static INPUT_PORTS_START( strahl )
INPUT_PORTS_END
static INPUT_PORTS_START( acrobatm )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -1721,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 /* IN1 */
+ PORT_START_TAG("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)
@@ -1739,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 /* DSW A */
+ PORT_START_TAG("DSW1") /* DSW A */
PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1765,7 +1760,7 @@ static INPUT_PORTS_START( acrobatm )
PORT_DIPSETTING( 0x00A0, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x0020, DEF_STR( 1C_4C ) )
- PORT_START /* DSW B */
+ PORT_START_TAG("DSW2") /* DSW B */
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x06, 0x06, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x02, "50k and 100k" )
@@ -1788,7 +1783,7 @@ static INPUT_PORTS_START( acrobatm )
INPUT_PORTS_END
static INPUT_PORTS_START( bioship )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -1798,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 /* IN1 */
+ PORT_START_TAG("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)
@@ -1816,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 /* DSW A */
+ PORT_START_TAG("DSW1") /* DSW A */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1838,7 +1833,7 @@ static INPUT_PORTS_START( bioship )
PORT_DIPSETTING( 0x0080, "4" )
PORT_DIPSETTING( 0x0040, "5" )
- PORT_START /* DSW B */
+ PORT_START_TAG("DSW2") /* DSW B */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1866,7 +1861,7 @@ static INPUT_PORTS_START( bioship )
INPUT_PORTS_END
static INPUT_PORTS_START( tdragon )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -1876,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 /* IN1 */
+ PORT_START_TAG("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)
@@ -1894,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 /* DSW 1 */
+ PORT_START_TAG("DSW1") /* DSW 1 */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1918,7 +1913,7 @@ static INPUT_PORTS_START( tdragon )
PORT_DIPSETTING( 0x00c0, "3" )
PORT_DIPSETTING( 0x0080, "4" )
- PORT_START /* DSW 2 */
+ PORT_START_TAG("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 ) )
@@ -1946,7 +1941,7 @@ static INPUT_PORTS_START( tdragon )
INPUT_PORTS_END
static INPUT_PORTS_START( tdragonb )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -1956,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 /* IN1 */
+ PORT_START_TAG("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)
@@ -1974,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 /* DSW 1 */
+ PORT_START_TAG("DSW1") /* DSW 1 */
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x0000, "1" )
PORT_DIPSETTING( 0x0002, "2" )
@@ -1998,7 +1993,7 @@ static INPUT_PORTS_START( tdragonb )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START /* DSW 2 */
+ PORT_START_TAG("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 ) )
@@ -2026,7 +2021,7 @@ static INPUT_PORTS_START( tdragonb )
INPUT_PORTS_END
static INPUT_PORTS_START( ssmissin )
- PORT_START /* IN0 */
+ PORT_START_TAG("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"
@@ -2036,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 /* IN1 */
+ PORT_START_TAG("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)
@@ -2054,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 /* DSW 1 */
+ PORT_START_TAG("DSW1") /* DSW 1 */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -2116,7 +2111,7 @@ static INPUT_PORTS_START( ssmissin )
INPUT_PORTS_END
static INPUT_PORTS_START( airattck )
- PORT_START /* IN0 */
+ PORT_START_TAG("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"
@@ -2126,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 /* IN1 */
+ PORT_START_TAG("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)
@@ -2144,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 /* DSW 1 */
+ PORT_START_TAG("DSW1") /* DSW 1 */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -2194,7 +2189,7 @@ static INPUT_PORTS_START( airattck )
INPUT_PORTS_END
static INPUT_PORTS_START( macross )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -2204,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 /* IN1 */
+ PORT_START_TAG("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)
@@ -2222,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 /* DSW A */
+ PORT_START_TAG("DSW1") /* DSW A */
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -2244,7 +2239,7 @@ static INPUT_PORTS_START( macross )
PORT_DIPSETTING( 0xc0, "3" )
PORT_DIPSETTING( 0x80, "4" )
- PORT_START /* DSW B */
+ PORT_START_TAG("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 ) )
@@ -2282,7 +2277,7 @@ static INPUT_PORTS_START( macross )
INPUT_PORTS_END
static INPUT_PORTS_START( macross2 )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -2292,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 /* IN1 */
+ PORT_START_TAG("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)
@@ -2310,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 /* DSW A */
+ PORT_START_TAG("DSW1") /* DSW A */
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -2333,7 +2328,7 @@ static INPUT_PORTS_START( macross2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW B */
+ PORT_START_TAG("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 ) )
@@ -2371,7 +2366,7 @@ static INPUT_PORTS_START( macross2 )
INPUT_PORTS_END
static INPUT_PORTS_START( tdragon2 )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -2381,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 /* IN1 */
+ PORT_START_TAG("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)
@@ -2399,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 /* DSW A */
+ PORT_START_TAG("DSW1") /* DSW A */
PORT_SERVICE( 0x01, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x02, 0x02, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
@@ -2421,7 +2416,7 @@ static INPUT_PORTS_START( tdragon2 )
PORT_DIPSETTING( 0xc0, "3" )
PORT_DIPSETTING( 0x80, "4" )
- PORT_START /* DSW B */
+ PORT_START_TAG("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 ) )
@@ -2459,7 +2454,7 @@ static INPUT_PORTS_START( tdragon2 )
INPUT_PORTS_END
static INPUT_PORTS_START( gunnail )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -2469,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 /* IN1 */
+ PORT_START_TAG("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)
@@ -2487,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 /* DSW A */
+ PORT_START_TAG("DSW1") /* DSW A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2512,7 +2507,7 @@ static INPUT_PORTS_START( gunnail )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW B */
+ PORT_START_TAG("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 ) )
@@ -2540,7 +2535,7 @@ static INPUT_PORTS_START( gunnail )
INPUT_PORTS_END
static INPUT_PORTS_START( raphero )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -2550,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 /* IN1 */
+ PORT_START_TAG("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)
@@ -2568,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 /* DSW A */
+ PORT_START_TAG("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 ) )
@@ -2590,7 +2585,7 @@ static INPUT_PORTS_START( raphero )
PORT_DIPSETTING( 0xc0, "3" )
PORT_DIPSETTING( 0x80, "4" )
- PORT_START /* DSW B */
+ PORT_START_TAG("DSW2") /* DSW B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2618,7 +2613,7 @@ static INPUT_PORTS_START( raphero )
INPUT_PORTS_END
static INPUT_PORTS_START( sabotenb )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -2628,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 /* IN1 */
+ PORT_START_TAG("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)
@@ -2646,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 /* DSW A */
+ PORT_START_TAG("DSW1") /* DSW A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2664,7 +2659,7 @@ static INPUT_PORTS_START( sabotenb )
PORT_DIPSETTING( 0xc0, "3" )
PORT_DIPSETTING( 0x80, "4" )
- PORT_START /* DSW B */
+ PORT_START_TAG("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 ) )
@@ -2692,7 +2687,7 @@ static INPUT_PORTS_START( sabotenb )
INPUT_PORTS_END
static INPUT_PORTS_START( bjtwin )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -2702,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 /* IN1 */
+ PORT_START_TAG("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)
@@ -2720,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 /* DSW A */
+ PORT_START_TAG("DSW1") /* DSW A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2744,7 +2739,7 @@ static INPUT_PORTS_START( bjtwin )
PORT_DIPSETTING( 0xc0, "3" )
PORT_DIPSETTING( 0x80, "4" )
- PORT_START /* DSW B */
+ PORT_START_TAG("DSW2") /* DSW B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2772,7 +2767,7 @@ static INPUT_PORTS_START( bjtwin )
INPUT_PORTS_END
static INPUT_PORTS_START( nouryoku )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 )
@@ -2782,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 /* IN1 */
+ PORT_START_TAG("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)
@@ -2800,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 /* DSW A */
+ PORT_START_TAG("DSW1") /* DSW A */
PORT_DIPNAME( 0x03, 0x03, "Life Decrease Speed" )
PORT_DIPSETTING( 0x02, "Slow" )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -2824,7 +2819,7 @@ static INPUT_PORTS_START( nouryoku )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_4C ) )
- PORT_START /* DSW B */
+ PORT_START_TAG("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 ) )
@@ -2864,7 +2859,7 @@ INPUT_PORTS_END
Stagger I
***************************************************************************/
-static INPUT_PORTS_START( stagger1 )
+static INPUT_PORTS_START( afega_common )
PORT_START_TAG("IN0") // $080000.w
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -2893,8 +2888,13 @@ static INPUT_PORTS_START( stagger1 )
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_UNKNOWN )
+INPUT_PORTS_END
- PORT_START_TAG("IN2") // $080004.w
+
+static INPUT_PORTS_START( stagger1 )
+ PORT_INCLUDE( afega_common )
+
+ PORT_START_TAG("DSW1") // $080004.w
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -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("IN2") // $080004.w -- probably just redhawk but inverted
+ PORT_START_TAG("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 ) )
@@ -3022,36 +3022,9 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( grdnstrm )
- PORT_START_TAG("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 )
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_START1 )
- 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( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_INCLUDE( afega_common )
- PORT_START_TAG("IN1") // 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)
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) 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_UNKNOWN )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) 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_UNKNOWN )
-
- PORT_START_TAG("IN2") // $080004.w
+ PORT_START_TAG("DSW1") // $080004.w
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -3097,40 +3070,15 @@ static INPUT_PORTS_START( grdnstrm )
PORT_DIPSETTING( 0xa000, DEF_STR( 1C_3C ) )
INPUT_PORTS_END
-/* Pop's Pop's */
+/***************************************************************************
+ Pop's Pop's
+***************************************************************************/
static INPUT_PORTS_START( popspops )
- PORT_START_TAG("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 )
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_START1 )
- 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( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("IN1") // 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)
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) 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_UNKNOWN )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) 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_UNKNOWN )
+ PORT_INCLUDE( afega_common )
/* the dips on this are a mess.. service mode doesn't seem to be 100% trustable */
- PORT_START_TAG("IN2") // $080004.w
+ PORT_START_TAG("DSW1") // $080004.w
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -3178,43 +3126,14 @@ static INPUT_PORTS_START( popspops )
PORT_DIPSETTING( 0xa000, DEF_STR( 1C_3C ) )
INPUT_PORTS_END
-
-
/***************************************************************************
Bubble 2000
***************************************************************************/
static INPUT_PORTS_START( bubl2000 )
- PORT_START_TAG("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 )
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_START1 )
- 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( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("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)
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) 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_UNKNOWN )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) 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_UNKNOWN )
+ PORT_INCLUDE( afega_common )
- PORT_START_TAG("IN2") // $080004.w
+ PORT_START_TAG("DSW1") // $080004.w
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -3268,36 +3187,9 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( mangchi )
- PORT_START_TAG("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 )
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_START1 )
- 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( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("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)
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) 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_UNKNOWN )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) 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_UNKNOWN )
+ PORT_INCLUDE( afega_common )
- PORT_START_TAG("IN2") // $080004.w
+ PORT_START_TAG("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 ) )
@@ -3352,36 +3244,9 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( firehawk )
- PORT_START_TAG("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 )
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_START1 )
- 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( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("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)
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) 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_UNKNOWN )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) 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_UNKNOWN )
+ PORT_INCLUDE( afega_common )
- PORT_START_TAG("IN2") // $080004.w
+ PORT_START_TAG("DSW1") // $080004.w
PORT_DIPNAME( 0x0001, 0x0001, "Show Dip-Switch Settings" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -3436,36 +3301,9 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( spec2k )
- PORT_START_TAG("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 )
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_START1 )
- 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( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("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)
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) 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_UNKNOWN )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) 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_UNKNOWN )
+ PORT_INCLUDE( afega_common )
- PORT_START_TAG("IN2") // $080004.w
+ PORT_START_TAG("DSW1") // $080004.w
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -3518,36 +3356,16 @@ INPUT_PORTS_END
***************************************************************************/
static INPUT_PORTS_START( twinactn )
- PORT_START_TAG("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 )
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_START2 )
+ PORT_INCLUDE( afega_common )
+
+ PORT_MODIFY("IN0") // $080000.w
PORT_SERVICE_NO_TOGGLE(0x0020, IP_ACTIVE_LOW ) // Test in service mode
- 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_TAG("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)
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) 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_MODIFY("IN1") // $080002.w
PORT_BIT( 0x0080, IP_ACTIVE_HIGH,IPT_UNKNOWN ) // Tested at boot
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) 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_HIGH,IPT_UNKNOWN ) // Tested at boot
- PORT_START_TAG("IN2") // $080004.w
+ PORT_START_TAG("DSW1") // $080004.w
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -4838,14 +4656,14 @@ static WRITE16_HANDLER( afega_scroll1_w )
static ADDRESS_MAP_START( afega, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0xfffff)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
- AM_RANGE(0x080000, 0x080001) AM_READ(input_port_0_word_r) // Buttons
- AM_RANGE(0x080002, 0x080003) AM_READ(input_port_1_word_r) // P1 + P2
- AM_RANGE(0x080004, 0x080005) AM_READ(input_port_2_word_r) // 2 x DSW
+ AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0") // Buttons
+ AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1") // P1 + P2
+ AM_RANGE(0x080004, 0x080005) AM_READ_PORT("DSW1") // 2 x DSW
AM_RANGE(0x080012, 0x080013) AM_READ(afega_unknown_r)
AM_RANGE(0x080000, 0x08001d) AM_WRITE(SMH_RAM) //
- AM_RANGE(0x08001e, 0x08001f) AM_WRITE(afega_soundlatch_w) // To Sound CPU
+ AM_RANGE(0x08001e, 0x08001f) AM_WRITE(afega_soundlatch_w) // To Sound CPU
/**/AM_RANGE(0x084000, 0x084003) AM_RAM_WRITE(afega_scroll0_w) // Scroll on redhawkb (mirror or changed?..)
-/**/AM_RANGE(0x084004, 0x084007) AM_RAM_WRITE(afega_scroll1_w) // Scroll on redhawkb (mirror or changed?..)
+/**/AM_RANGE(0x084004, 0x084007) AM_RAM_WRITE(afega_scroll1_w) // Scroll on redhawkb (mirror or changed?..)
AM_RANGE(0x080020, 0x087fff) AM_WRITE(SMH_RAM) //
/**/AM_RANGE(0x088000, 0x0885ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) // Palette
AM_RANGE(0x088600, 0x08bfff) AM_WRITE(SMH_RAM) //
diff --git a/src/mame/drivers/nova2001.c b/src/mame/drivers/nova2001.c
index 1db8b46896b..f9602c81c80 100644
--- a/src/mame/drivers/nova2001.c
+++ b/src/mame/drivers/nova2001.c
@@ -135,7 +135,7 @@ static UINT8 ninjakun_io_a002_ctrl;
static READ8_HANDLER( ninjakun_io_A002_r )
{
- return ninjakun_io_a002_ctrl | input_port_read_indexed(machine, 2); /* vblank */
+ return ninjakun_io_a002_ctrl | input_port_read(machine, "IN2"); /* vblank */
}
static WRITE8_HANDLER( ninjakun_cpu1_io_A002_w )
@@ -292,7 +292,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( nova2001 )
- PORT_START
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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 /* dsw0 */
+ PORT_START_TAG("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 /* dsw1 */
+ PORT_START_TAG("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 ) )
@@ -435,7 +435,7 @@ static INPUT_PORTS_START( ninjakun )
INPUT_PORTS_END
static INPUT_PORTS_START( pkunwar )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 /* IN1 */
+ PORT_START_TAG("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 /* DSW0 */
+ PORT_START_TAG("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 /* DSW1 */
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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 /* DSW1 */
+ PORT_START_TAG("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 /* DSW2*/
+ PORT_START_TAG("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/nwk-tr.c b/src/mame/drivers/nwk-tr.c
index a9caa12e905..9b62b8486e5 100644
--- a/src/mame/drivers/nwk-tr.c
+++ b/src/mame/drivers/nwk-tr.c
@@ -738,11 +738,11 @@ static double adc12138_input_callback(int input)
int value = 0;
switch (input)
{
- case 0: value = input_port_read_indexed(Machine, 4) - 0x800; break;
- case 1: value = input_port_read_indexed(Machine, 5); break;
- case 2: value = input_port_read_indexed(Machine, 6); break;
- case 3: value = input_port_read_indexed(Machine, 7); break;
- case 4: value = input_port_read_indexed(Machine, 8); break;
+ case 0: value = input_port_read(Machine, "ANALOG1") - 0x800; break;
+ case 1: value = input_port_read(Machine, "ANALOG2"); break;
+ case 2: value = input_port_read(Machine, "ANALOG3"); break;
+ case 3: value = input_port_read(Machine, "ANALOG4"); break;
+ case 4: value = input_port_read(Machine, "ANALOG5"); break;
}
return (double)(value) / 2047.0;
@@ -755,15 +755,15 @@ static READ32_HANDLER( sysreg_r )
{
if (ACCESSING_BITS_24_31)
{
- r |= input_port_read_indexed(machine, 0) << 24;
+ r |= input_port_read(machine, "IN0") << 24;
}
if (ACCESSING_BITS_16_23)
{
- r |= input_port_read_indexed(machine, 1) << 16;
+ r |= input_port_read(machine, "IN1") << 16;
}
if (ACCESSING_BITS_8_15)
{
- r |= input_port_read_indexed(machine, 2) << 8;
+ r |= input_port_read(machine, "IN2") << 8;
}
if (ACCESSING_BITS_0_7)
{
@@ -774,7 +774,7 @@ static READ32_HANDLER( sysreg_r )
{
if (ACCESSING_BITS_24_31)
{
- r |= input_port_read_indexed(machine, 3) << 24;
+ r |= input_port_read(machine, "DSW") << 24;
}
}
return r;
@@ -1008,7 +1008,7 @@ ADDRESS_MAP_END
/*****************************************************************************/
static INPUT_PORTS_START( nwktr )
- PORT_START
+ PORT_START_TAG("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)
@@ -1018,17 +1018,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
+ PORT_START_TAG("IN1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START_TAG("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
+ PORT_START_TAG("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/nycaptor.c b/src/mame/drivers/nycaptor.c
index 5ffa8fe943b..e66ab197201 100644
--- a/src/mame/drivers/nycaptor.c
+++ b/src/mame/drivers/nycaptor.c
@@ -195,15 +195,15 @@ static READ8_HANDLER( nycaptor_b_r )
static READ8_HANDLER( nycaptor_by_r )
{
- int port=input_port_read_indexed(machine, 6);
- if(nyc_gametype==1)
- port=255-port;
- return port-8;
+ int port=input_port_read(machine, "LIGHTY");
+ if(nyc_gametype == 1)
+ port = 255 - port;
+ return port - 8;
}
static READ8_HANDLER( nycaptor_bx_r )
{
- return (input_port_read_indexed(machine, 5)+0x27)|1;
+ return (input_port_read(machine, "LIGHTX") + 0x27) | 1;
}
@@ -298,11 +298,11 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xd002, 0xd002) AM_READ(nycaptor_generic_control_r)
AM_RANGE(0xd400, 0xd400) AM_READ(from_snd_r)
AM_RANGE(0xd401, 0xd401) AM_READ(SMH_NOP)
- AM_RANGE(0xd800, 0xd800) AM_READ(input_port_0_r)
- AM_RANGE(0xd801, 0xd801) AM_READ(input_port_1_r)
- AM_RANGE(0xd802, 0xd802) AM_READ(input_port_2_r)
- AM_RANGE(0xd803, 0xd803) AM_READ(input_port_3_r)
- AM_RANGE(0xd804, 0xd804) AM_READ(input_port_4_r)
+ AM_RANGE(0xd800, 0xd800) AM_READ_PORT("DSW0")
+ AM_RANGE(0xd801, 0xd801) AM_READ_PORT("DSW1")
+ AM_RANGE(0xd802, 0xd802) AM_READ_PORT("DSW2")
+ AM_RANGE(0xd803, 0xd803) AM_READ_PORT("IN0")
+ AM_RANGE(0xd804, 0xd804) AM_READ_PORT("IN1")
AM_RANGE(0xd805, 0xd805) AM_READ(nycaptor_mcu_status_r1)
AM_RANGE(0xd806, 0xd806) AM_READ(SMH_NOP) /* unknown ?sound? */
AM_RANGE(0xd807, 0xd807) AM_READ(nycaptor_mcu_status_r2)
@@ -332,11 +332,11 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( readmem_sub, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
- AM_RANGE(0xd800, 0xd800) AM_READ(input_port_0_r)
- AM_RANGE(0xd801, 0xd801) AM_READ(input_port_1_r)
- AM_RANGE(0xd802, 0xd802) AM_READ(input_port_2_r)
- AM_RANGE(0xd803, 0xd803) AM_READ(input_port_3_r)
- AM_RANGE(0xd804, 0xd804) AM_READ(input_port_4_r)
+ AM_RANGE(0xd800, 0xd800) AM_READ_PORT("DSW0")
+ AM_RANGE(0xd801, 0xd801) AM_READ_PORT("DSW1")
+ AM_RANGE(0xd802, 0xd802) AM_READ_PORT("DSW2")
+ AM_RANGE(0xd803, 0xd803) AM_READ_PORT("IN0")
+ AM_RANGE(0xd804, 0xd804) AM_READ_PORT("IN1")
AM_RANGE(0xdc00, 0xdc9f) AM_READ(nycaptor_spriteram_r)
AM_RANGE(0xdd00, 0xdeff) AM_READ(nycaptor_palette_r)
AM_RANGE(0xdf00, 0xdf00) AM_READ(nycaptor_bx_r)
@@ -437,17 +437,17 @@ static WRITE8_HANDLER( cyclshtg_generic_control_w )
static ADDRESS_MAP_START( cyclshtg_readmem, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
+ AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1)
- AM_RANGE(0xc000, 0xcfff) AM_READ(nycaptor_videoram_r)
- AM_RANGE(0xd000, 0xd000) AM_READ(cyclshtg_mcu_r)
+ AM_RANGE(0xc000, 0xcfff) AM_READ(nycaptor_videoram_r)
+ AM_RANGE(0xd000, 0xd000) AM_READ(cyclshtg_mcu_r)
AM_RANGE(0xd002, 0xd002) AM_READ(nycaptor_generic_control_r)
- AM_RANGE(0xd400, 0xd400) AM_READ(from_snd_r)
- AM_RANGE(0xd800, 0xd800) AM_READ(input_port_0_r)
- AM_RANGE(0xd801, 0xd801) AM_READ(input_port_1_r)
- AM_RANGE(0xd802, 0xd802) AM_READ(input_port_2_r)
- AM_RANGE(0xd803, 0xd803) AM_READ(input_port_3_r)
- AM_RANGE(0xd804, 0xd804) AM_READ(input_port_4_r)
+ AM_RANGE(0xd400, 0xd400) AM_READ(from_snd_r)
+ AM_RANGE(0xd800, 0xd800) AM_READ_PORT("DSW0")
+ AM_RANGE(0xd801, 0xd801) AM_READ_PORT("DSW1")
+ AM_RANGE(0xd802, 0xd802) AM_READ_PORT("DSW2")
+ AM_RANGE(0xd803, 0xd803) AM_READ_PORT("IN0")
+ AM_RANGE(0xd804, 0xd804) AM_READ_PORT("IN1")
AM_RANGE(0xd805, 0xd805) AM_READ(cyclshtg_mcu_status_r)
AM_RANGE(0xd806, 0xd806) AM_READ(SMH_NOP)
AM_RANGE(0xd807, 0xd807) AM_READ(cyclshtg_mcu_status_r)
@@ -455,7 +455,7 @@ static ADDRESS_MAP_START( cyclshtg_readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xdca0, 0xdcbf) AM_READ(nycaptor_scrlram_r)
AM_RANGE(0xdd00, 0xdeff) AM_READ(nycaptor_palette_r)
AM_RANGE(0xdf03, 0xdf03) AM_READ(nycaptor_gfxctrl_r)
- AM_RANGE(0xe000, 0xffff) AM_READ(nycaptor_sharedram_r)
+ AM_RANGE(0xe000, 0xffff) AM_READ(nycaptor_sharedram_r)
ADDRESS_MAP_END
static ADDRESS_MAP_START( cyclshtg_writemem, ADDRESS_SPACE_PROGRAM, 8 )
@@ -476,19 +476,19 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( cyclshtg_readmem_sub, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM)
- AM_RANGE(0xd800, 0xd800) AM_READ(input_port_0_r)
- AM_RANGE(0xd801, 0xd801) AM_READ(input_port_1_r)
- AM_RANGE(0xd802, 0xd802) AM_READ(input_port_2_r)
- AM_RANGE(0xd803, 0xd803) AM_READ(input_port_3_r)
- AM_RANGE(0xd804, 0xd804) AM_READ(input_port_4_r)
+ AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM)
+ AM_RANGE(0xd800, 0xd800) AM_READ_PORT("DSW0")
+ AM_RANGE(0xd801, 0xd801) AM_READ_PORT("DSW1")
+ AM_RANGE(0xd802, 0xd802) AM_READ_PORT("DSW2")
+ AM_RANGE(0xd803, 0xd803) AM_READ_PORT("IN0")
+ AM_RANGE(0xd804, 0xd804) AM_READ_PORT("IN1")
AM_RANGE(0xdc00, 0xdc9f) AM_READ(nycaptor_spriteram_r)
AM_RANGE(0xdd00, 0xdeff) AM_READ(nycaptor_palette_r)
AM_RANGE(0xdf00, 0xdf00) AM_READ(nycaptor_bx_r)
AM_RANGE(0xdf01, 0xdf01) AM_READ(nycaptor_by_r)
AM_RANGE(0xdf02, 0xdf02) AM_READ(nycaptor_b_r)
AM_RANGE(0xdf03, 0xdf03) AM_READ(nycaptor_gfxctrl_r)
- AM_RANGE(0xe000, 0xffff) AM_READ(nycaptor_sharedram_r)
+ AM_RANGE(0xe000, 0xffff) AM_READ(nycaptor_sharedram_r)
ADDRESS_MAP_END
static ADDRESS_MAP_START( cyclshtg_writemem_sub, ADDRESS_SPACE_PROGRAM, 8 )
@@ -507,13 +507,13 @@ static READ8_HANDLER(unk_r)
}
static ADDRESS_MAP_START( bronx_readmem, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
+ AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1)
- AM_RANGE(0xc000, 0xcfff) AM_READ(nycaptor_videoram_r)
- AM_RANGE(0xd000, 0xd000) AM_READ(cyclshtg_mcu_r)
+ AM_RANGE(0xc000, 0xcfff) AM_READ(nycaptor_videoram_r)
+ AM_RANGE(0xd000, 0xd000) AM_READ(cyclshtg_mcu_r)
AM_RANGE(0xd002, 0xd002) AM_READ(nycaptor_generic_control_r)
- AM_RANGE(0xd400, 0xd400) AM_READ(from_snd_r)
- AM_RANGE(0xd401, 0xd401) AM_READ(unk_r)
+ AM_RANGE(0xd400, 0xd400) AM_READ(from_snd_r)
+ AM_RANGE(0xd401, 0xd401) AM_READ(unk_r)
AM_RANGE(0xd800, 0xd800) AM_READ(input_port_0_r)
AM_RANGE(0xd801, 0xd801) AM_READ(input_port_1_r)
AM_RANGE(0xd802, 0xd802) AM_READ(input_port_2_r)
@@ -526,7 +526,7 @@ static ADDRESS_MAP_START( bronx_readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xdca0, 0xdcbf) AM_READ(nycaptor_scrlram_r)
AM_RANGE(0xdd00, 0xdeff) AM_READ(nycaptor_palette_r)
AM_RANGE(0xdf03, 0xdf03) AM_READ(nycaptor_gfxctrl_r)
- AM_RANGE(0xe000, 0xffff) AM_READ(nycaptor_sharedram_r)
+ AM_RANGE(0xe000, 0xffff) AM_READ(nycaptor_sharedram_r)
ADDRESS_MAP_END
static ADDRESS_MAP_START( bronx_writemem, ADDRESS_SPACE_PROGRAM, 8 )
@@ -540,21 +540,21 @@ static ADDRESS_MAP_START( bronx_writemem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xdc00, 0xdc9f) AM_WRITE(nycaptor_spriteram_w)
AM_RANGE(0xdca0, 0xdcbf) AM_WRITE(nycaptor_scrlram_w) AM_BASE(&nycaptor_scrlram)
AM_RANGE(0xdd00, 0xdeff) AM_WRITE(nycaptor_palette_w)
- AM_RANGE(0xdf03, 0xdf03) AM_WRITE(nycaptor_gfxctrl_w)
+ AM_RANGE(0xdf03, 0xdf03) AM_WRITE(nycaptor_gfxctrl_w)
AM_RANGE(0xe000, 0xffff) AM_WRITE(nycaptor_sharedram_w) AM_BASE(&nycaptor_sharedram)
ADDRESS_MAP_END
static ADDRESS_MAP_START( bronx_io, ADDRESS_SPACE_IO, 8 )
- AM_RANGE(0x0000, 0x7fff) AM_ROM AM_REGION(REGION_USER1, 0)
+ AM_RANGE(0x0000, 0x7fff) AM_ROM AM_REGION(REGION_USER1, 0)
ADDRESS_MAP_END
static ADDRESS_MAP_START( bronx_readmem_sub, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
- AM_RANGE(0xd800, 0xd800) AM_READ(input_port_0_r)
- AM_RANGE(0xd801, 0xd801) AM_READ(input_port_1_r)
- AM_RANGE(0xd802, 0xd802) AM_READ(input_port_2_r)
- AM_RANGE(0xd803, 0xd803) AM_READ(input_port_3_r)
- AM_RANGE(0xd804, 0xd804) AM_READ(input_port_4_r)
+ AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
+ AM_RANGE(0xd800, 0xd800) AM_READ_PORT("DSW0")
+ AM_RANGE(0xd801, 0xd801) AM_READ_PORT("DSW1")
+ AM_RANGE(0xd802, 0xd802) AM_READ_PORT("DSW2")
+ AM_RANGE(0xd803, 0xd803) AM_READ_PORT("IN0")
+ AM_RANGE(0xd804, 0xd804) AM_READ_PORT("IN1")
AM_RANGE(0xd805, 0xd805) AM_READ(cyclshtg_mcu_status_r1)
AM_RANGE(0xd807, 0xd807) AM_READ(cyclshtg_mcu_status_r)
AM_RANGE(0xdc00, 0xdc9f) AM_READ(nycaptor_spriteram_r)
@@ -563,7 +563,7 @@ static ADDRESS_MAP_START( bronx_readmem_sub, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xdf01, 0xdf01) AM_READ(nycaptor_by_r)
AM_RANGE(0xdf02, 0xdf02) AM_READ(nycaptor_b_r)
AM_RANGE(0xdf03, 0xdf03) AM_READ(nycaptor_gfxctrl_r)
- AM_RANGE(0xe000, 0xffff) AM_READ(nycaptor_sharedram_r)
+ AM_RANGE(0xe000, 0xffff) AM_READ(nycaptor_sharedram_r)
ADDRESS_MAP_END
static ADDRESS_MAP_START( bronx_writemem_sub, ADDRESS_SPACE_PROGRAM, 8 )
@@ -580,141 +580,141 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( cyclshtg )
- PORT_START_TAG("IN0")
- PORT_DIPNAME( 0x04, 0x04, "Test Mode" )
- PORT_DIPSETTING( 0x04, 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_DIPSETTING( 0x30, DEF_STR( 1C_1C ) )
- PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) )
- PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) )
-
- PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_B ) )
- PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) )
- PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) )
- PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) )
- PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
+ PORT_START_TAG("DSW0")
+ PORT_DIPNAME( 0x04, 0x04, "Test Mode" )
+ PORT_DIPSETTING( 0x04, 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_DIPSETTING( 0x30, DEF_STR( 1C_1C ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) )
+ PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) )
+
+ PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_B ) )
+ PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) )
+ PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) )
+ PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x08, DEF_STR( On ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x08, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START_TAG("DSW1")
- PORT_START_TAG("IN2")
+ PORT_START_TAG("DSW2")
- PORT_START_TAG("IN3")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_START_TAG("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_DIPNAME( 0x08, 0x08, DEF_STR( Tilt ) )
- PORT_DIPSETTING( 0x08, DEF_STR( No ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_COIN1 )
+ PORT_DIPNAME( 0x08, 0x08, DEF_STR( Tilt ) )
+ PORT_DIPSETTING( 0x08, DEF_STR( No ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
+ PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN2 )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START_TAG("IN4")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
+ PORT_START_TAG("IN1")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
- PORT_START_TAG("IN5")
+ PORT_START_TAG("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("IN6")
+ PORT_START_TAG("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("IN0")
+ PORT_START_TAG("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" )
- PORT_DIPSETTING( 0x01, "100k, 300k then every 300k" )
- PORT_DIPSETTING( 0x00, "150k, 300k then every 300k" )
+ PORT_DIPSETTING( 0x02, "20k, 80k then every 80k" )
+ PORT_DIPSETTING( 0x03, "50k, 150k then every 200k" )
+ PORT_DIPSETTING( 0x01, "100k, 300k then every 300k" )
+ PORT_DIPSETTING( 0x00, "150k, 300k then every 300k" )
PORT_DIPNAME( 0x04, 0x04, "Infinite Bullets (Cheat)")
- PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x18, 0x18, DEF_STR( Lives ) )
- PORT_DIPSETTING( 0x08, "1" )
- PORT_DIPSETTING( 0x00, "2" )
- PORT_DIPSETTING( 0x18, "3" )
- PORT_DIPSETTING( 0x10, "5" )
+ PORT_DIPSETTING( 0x08, "1" )
+ PORT_DIPSETTING( 0x00, "2" )
+ PORT_DIPSETTING( 0x18, "3" )
+ PORT_DIPSETTING( 0x10, "5" )
PORT_DIPNAME( 0x20, 0x20, DEF_STR( Free_Play ) )
- PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x40, 0x00, DEF_STR( Allow_Continue ) )
- PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Demo_Sounds ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x80, DEF_STR( On ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("IN1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) )
- PORT_DIPSETTING( 0x0f, DEF_STR( 9C_1C ) )
- PORT_DIPSETTING( 0x0e, DEF_STR( 8C_1C ) )
- PORT_DIPSETTING( 0x0d, DEF_STR( 7C_1C ) )
- PORT_DIPSETTING( 0x0c, DEF_STR( 6C_1C ) )
- PORT_DIPSETTING( 0x0b, DEF_STR( 5C_1C ) )
- PORT_DIPSETTING( 0x0a, DEF_STR( 4C_1C ) )
- PORT_DIPSETTING( 0x09, DEF_STR( 3C_1C ) )
- PORT_DIPSETTING( 0x08, 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_DIPSETTING( 0x03, DEF_STR( 1C_4C ) )
- PORT_DIPSETTING( 0x04, DEF_STR( 1C_5C ) )
- PORT_DIPSETTING( 0x05, DEF_STR( 1C_6C ) )
- PORT_DIPSETTING( 0x06, DEF_STR( 1C_7C ) )
- PORT_DIPSETTING( 0x07, DEF_STR( 1C_8C ) )
+ PORT_DIPSETTING( 0x0f, DEF_STR( 9C_1C ) )
+ PORT_DIPSETTING( 0x0e, DEF_STR( 8C_1C ) )
+ PORT_DIPSETTING( 0x0d, DEF_STR( 7C_1C ) )
+ PORT_DIPSETTING( 0x0c, DEF_STR( 6C_1C ) )
+ PORT_DIPSETTING( 0x0b, DEF_STR( 5C_1C ) )
+ PORT_DIPSETTING( 0x0a, DEF_STR( 4C_1C ) )
+ PORT_DIPSETTING( 0x09, DEF_STR( 3C_1C ) )
+ PORT_DIPSETTING( 0x08, 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_DIPSETTING( 0x03, DEF_STR( 1C_4C ) )
+ PORT_DIPSETTING( 0x04, DEF_STR( 1C_5C ) )
+ PORT_DIPSETTING( 0x05, DEF_STR( 1C_6C ) )
+ PORT_DIPSETTING( 0x06, DEF_STR( 1C_7C ) )
+ PORT_DIPSETTING( 0x07, DEF_STR( 1C_8C ) )
PORT_DIPNAME( 0xf0, 0x00, DEF_STR( Coin_B ) )
- PORT_DIPSETTING( 0xf0, DEF_STR( 9C_1C ) )
- PORT_DIPSETTING( 0xe0, DEF_STR( 8C_1C ) )
- PORT_DIPSETTING( 0xd0, DEF_STR( 7C_1C ) )
- PORT_DIPSETTING( 0xc0, DEF_STR( 6C_1C ) )
- PORT_DIPSETTING( 0xb0, DEF_STR( 5C_1C ) )
- PORT_DIPSETTING( 0xa0, DEF_STR( 4C_1C ) )
- PORT_DIPSETTING( 0x90, DEF_STR( 3C_1C ) )
- PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ) )
- PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
- PORT_DIPSETTING( 0x10, DEF_STR( 1C_2C ) )
- PORT_DIPSETTING( 0x20, DEF_STR( 1C_3C ) )
- PORT_DIPSETTING( 0x30, DEF_STR( 1C_4C ) )
- PORT_DIPSETTING( 0x40, DEF_STR( 1C_5C ) )
- PORT_DIPSETTING( 0x50, DEF_STR( 1C_6C ) )
- PORT_DIPSETTING( 0x60, DEF_STR( 1C_7C ) )
- PORT_DIPSETTING( 0x70, DEF_STR( 1C_8C ) )
-
- PORT_START_TAG("IN2")
+ PORT_DIPSETTING( 0xf0, DEF_STR( 9C_1C ) )
+ PORT_DIPSETTING( 0xe0, DEF_STR( 8C_1C ) )
+ PORT_DIPSETTING( 0xd0, DEF_STR( 7C_1C ) )
+ PORT_DIPSETTING( 0xc0, DEF_STR( 6C_1C ) )
+ PORT_DIPSETTING( 0xb0, DEF_STR( 5C_1C ) )
+ PORT_DIPSETTING( 0xa0, DEF_STR( 4C_1C ) )
+ PORT_DIPSETTING( 0x90, DEF_STR( 3C_1C ) )
+ PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) )
+ PORT_DIPSETTING( 0x10, DEF_STR( 1C_2C ) )
+ PORT_DIPSETTING( 0x20, DEF_STR( 1C_3C ) )
+ PORT_DIPSETTING( 0x30, DEF_STR( 1C_4C ) )
+ PORT_DIPSETTING( 0x40, DEF_STR( 1C_5C ) )
+ PORT_DIPSETTING( 0x50, DEF_STR( 1C_6C ) )
+ PORT_DIPSETTING( 0x60, DEF_STR( 1C_7C ) )
+ PORT_DIPSETTING( 0x70, DEF_STR( 1C_8C ) )
+
+ PORT_START_TAG("DSW2")
PORT_DIPNAME( 0x01, 0x01, "Freeze" )
- PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x02, 0x02, "Training Spot" )
- PORT_DIPSETTING( 0x00, DEF_STR( No ) )
- PORT_DIPSETTING( 0x02, DEF_STR( Yes ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( No ) )
+ PORT_DIPSETTING( 0x02, DEF_STR( Yes ) )
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Difficulty ) )
- PORT_DIPSETTING( 0x0c, DEF_STR( Easy ) )
- PORT_DIPSETTING( 0x04, DEF_STR( Normal ) )
- PORT_DIPSETTING( 0x08, DEF_STR( Hard ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
+ PORT_DIPSETTING( 0x0c, DEF_STR( Easy ) )
+ PORT_DIPSETTING( 0x04, DEF_STR( Normal ) )
+ PORT_DIPSETTING( 0x08, DEF_STR( Hard ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
PORT_DIPNAME( 0x10, 0x10, "Coinage Display" )
- PORT_DIPSETTING( 0x00, DEF_STR( No ) )
- PORT_DIPSETTING( 0x10, DEF_STR( Yes ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( No ) )
+ PORT_DIPSETTING( 0x10, DEF_STR( Yes ) )
PORT_DIPNAME( 0x20, 0x20, "Reset Damage" )
- PORT_DIPSETTING( 0x20, "Every Stage" )
- PORT_DIPSETTING( 0x00, "Every 4 Stages" )
+ PORT_DIPSETTING( 0x20, "Every Stage" )
+ PORT_DIPSETTING( 0x00, "Every 4 Stages" )
PORT_DIPNAME( 0x40, 0x40, "No Hit (Cheat)")
- PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x80, 0x80, "Coin Slots" )
- PORT_DIPSETTING( 0x00, "1" )
- PORT_DIPSETTING( 0x80, "2" )
+ PORT_DIPSETTING( 0x00, "1" )
+ PORT_DIPSETTING( 0x80, "2" )
- PORT_START_TAG("IN3")
+ PORT_START_TAG("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("IN4")
+ PORT_START_TAG("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN5")
+ PORT_START_TAG("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("IN6")
+ PORT_START_TAG("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
@@ -1312,6 +1312,6 @@ static DRIVER_INIT(cyclshtg)
GAME( 1985, nycaptor, 0, nycaptor, nycaptor, nycaptor, ROT0, "Taito", "N.Y. Captor", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND )
GAME( 1986, cyclshtg, 0, cyclshtg, cyclshtg, cyclshtg, ROT90, "Taito", "Cycle Shooting", GAME_NOT_WORKING)
-//bootlegs
+/* bootlegs */
GAME( 1986, bronx, cyclshtg, bronx, cyclshtg, bronx, ROT90, "bootleg", "Bronx",GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND)
GAME( 1986, colt , nycaptor, bronx, nycaptor, colt, ROT0, "bootleg", "Colt",GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND|GAME_WRONG_COLORS)
diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c
index 5a5326f8c41..9b52315b3ab 100644
--- a/src/mame/drivers/nyny.c
+++ b/src/mame/drivers/nyny.c
@@ -138,13 +138,13 @@ static INTERRUPT_GEN( update_pia_1 )
/* update the different PIA pins from the input ports */
/* CA1 - copy of PA0 (COIN1) */
- pia_1_ca1_w(machine, 0, input_port_read_indexed(machine, 0) & 0x01);
+ pia_1_ca1_w(machine, 0, input_port_read(machine, "IN0") & 0x01);
/* CA2 - copy of PA1 (SERVICE1) */
- pia_1_ca2_w(machine, 0, input_port_read_indexed(machine, 0) & 0x02);
+ pia_1_ca2_w(machine, 0, input_port_read(machine, "IN0") & 0x02);
/* CB1 - (crosshatch) */
- pia_1_cb1_w(machine, 0, input_port_read_indexed(machine, 5));
+ pia_1_cb1_w(machine, 0, input_port_read(machine, "CROSS"));
/* CB2 - NOT CONNECTED */
}
@@ -545,7 +545,7 @@ static ADDRESS_MAP_START( nyny_audio_1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x007f) AM_RAM /* internal RAM */
AM_RANGE(0x0080, 0x0fff) AM_NOP
AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x0fff) AM_READWRITE(soundlatch_r, audio_1_answer_w)
- AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x0fff) AM_READ(input_port_4_r)
+ AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x0fff) AM_READ_PORT("SW3")
AM_RANGE(0x3000, 0x3000) AM_MIRROR(0x0ffc) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
AM_RANGE(0x3001, 0x3001) AM_MIRROR(0x0ffc) AM_WRITE(AY8910_control_port_0_w)
AM_RANGE(0x3002, 0x3002) AM_MIRROR(0x0ffc) AM_READWRITE(AY8910_read_port_1_r, AY8910_write_port_1_w)
@@ -649,7 +649,7 @@ static INPUT_PORTS_START( nyny )
PORT_DIPSETTING( 0x40, "+2" )
PORT_DIPSETTING( 0x20, "+3" )
- PORT_START /* connected to PIA1 CB1 input */
+ PORT_START_TAG("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/ojankohs.c b/src/mame/drivers/ojankohs.c
index a52fb4c2568..1629478dcc0 100644
--- a/src/mame/drivers/ojankohs.c
+++ b/src/mame/drivers/ojankohs.c
@@ -145,18 +145,18 @@ static READ8_HANDLER( ojankohs_keymatrix_r )
int ret;
switch (ojankohs_portselect) {
- case 0x01: ret = input_port_read(machine, "IN4"); break;
- case 0x02: ret = input_port_read(machine, "IN5"); break;
- case 0x04: ret = input_port_read(machine, "IN6"); break;
- case 0x08: ret = input_port_read(machine, "IN7"); break;
- case 0x10: ret = input_port_read(machine, "IN8"); break;
+ case 0x01: ret = input_port_read(machine, "KEY0"); break;
+ case 0x02: ret = input_port_read(machine, "KEY1"); break;
+ case 0x04: ret = input_port_read(machine, "KEY2"); break;
+ case 0x08: ret = input_port_read(machine, "KEY3"); break;
+ case 0x10: ret = input_port_read(machine, "KEY4"); break;
case 0x20: ret = 0xff; break;
case 0x3f: ret = 0xff;
- ret &= input_port_read(machine, "IN4");
- ret &= input_port_read(machine, "IN5");
- ret &= input_port_read(machine, "IN6");
- ret &= input_port_read(machine, "IN7");
- ret &= input_port_read(machine, "IN8");
+ ret &= input_port_read(machine, "KEY0");
+ ret &= input_port_read(machine, "KEY1");
+ ret &= input_port_read(machine, "KEY2");
+ ret &= input_port_read(machine, "KEY3");
+ ret &= input_port_read(machine, "KEY4");
break;
default: ret = 0xff;
logerror("PC:%04X unknown %02X\n", activecpu_get_pc(), ojankohs_portselect);
@@ -170,13 +170,18 @@ static READ8_HANDLER( ojankoc_keymatrix_r )
{
int i;
int ret = 0;
+ static const char *const keynames[2][5] =
+ {
+ { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4" },
+ { "KEY5", "KEY6", "KEY7", "KEY8", "KEY9" }
+ };
for (i = 0; i < 5; i++) {
if (~ojankohs_portselect & (1 << i))
- ret |= input_port_read_indexed(machine, i + offset * 5 + 2);
+ ret |= input_port_read(machine, keynames[offset][i]);
}
- return (ret & 0x3f) | (input_port_read_indexed(machine, 12 + offset) & 0xc0);
+ return (ret & 0x3f) | (input_port_read(machine, offset ? "IN1" : "IN0") & 0xc0);
}
static READ8_HANDLER( ojankohs_ay8910_0_r )
@@ -349,6 +354,57 @@ static ADDRESS_MAP_START( writeport_ojankoc, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xff, 0xff) AM_WRITE(AY8910_control_port_0_w)
ADDRESS_MAP_END
+static INPUT_PORTS_START( mahjong_p1 )
+ PORT_START_TAG("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 )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
+ 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_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 )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
+ 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_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 )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
+ 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("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 )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
+ 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("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 )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+INPUT_PORTS_END
static INPUT_PORTS_START( ojankohs )
PORT_START_TAG("IN0") /* (0) TEST SW */
@@ -408,55 +464,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("IN4") /* (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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("IN5") /* (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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("IN6") /* (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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
- 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("IN7") /* (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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
- 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("IN8") /* (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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_INCLUDE( mahjong_p1 )
INPUT_PORTS_END
static INPUT_PORTS_START( ojankoy )
@@ -527,55 +535,7 @@ static INPUT_PORTS_START( ojankoy )
PORT_DIPSETTING( 0x80, "Yes / No" )
PORT_DIPSETTING( 0x00, "No / Yes" )
- PORT_START_TAG("IN4") /* (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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("IN5") /* (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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("IN6") /* (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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
- 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("IN7") /* (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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
- 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("IN8") /* (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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_INCLUDE( mahjong_p1 )
INPUT_PORTS_END
static INPUT_PORTS_START( ccasino )
@@ -651,55 +611,7 @@ static INPUT_PORTS_START( ccasino )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN4") /* (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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("IN5") /* (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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("IN6") /* (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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
- 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("IN7") /* (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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
- 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("IN8") /* (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 )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_INCLUDE( mahjong_p1 )
PORT_START_TAG("DSW3") /* (9) DIPSW-3 */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 3-1" )
@@ -805,52 +717,57 @@ static INPUT_PORTS_START( ojankoc )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2") /* (2) PORT 1-0 */
+ PORT_START_TAG("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 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_MAHJONG_M )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_MAHJONG_KAN )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* (3) PORT 1-1 */
+ PORT_START_TAG("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 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_MAHJONG_N )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_MAHJONG_REACH )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_MAHJONG_BET )
- PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN4") /* (4) PORT 1-2 */
+ PORT_START_TAG("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 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_MAHJONG_CHI )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_MAHJONG_RON )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN5") /* (5) PORT 1-3 */
+ PORT_START_TAG("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 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_MAHJONG_PON )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN6") /* (6) PORT 1-4 */
+ PORT_START_TAG("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 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_MAHJONG_FLIP_FLOP )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_MAHJONG_BIG )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_MAHJONG_SMALL )
- PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN7") /* (7) PORT 2-0 */
+ PORT_START_TAG("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)
@@ -859,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("IN8") /* (8) PORT 2-1 */
+ PORT_START_TAG("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)
@@ -868,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("IN9") /* (9) PORT 2-2 */
+ PORT_START_TAG("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)
@@ -877,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("IN10") /* (10) PORT 2-3 */
+ PORT_START_TAG("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)
@@ -886,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("IN11") /* (11) PORT 2-4 */
+ PORT_START_TAG("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)
@@ -895,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("IN12") /* IN1 (12) */
+ PORT_START_TAG("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("IN13") /* IN2 (13) */
+ PORT_START_TAG("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/omegrace.c b/src/mame/drivers/omegrace.c
index 67e1e7e4931..e5e73c10d9b 100644
--- a/src/mame/drivers/omegrace.c
+++ b/src/mame/drivers/omegrace.c
@@ -292,7 +292,7 @@ static const UINT8 spinnerTable[64] =
static READ8_HANDLER( omegrace_spinner1_r )
{
- return (spinnerTable[input_port_read_indexed(machine, 4) & 0x3f]);
+ return (spinnerTable[input_port_read(machine, "SPIN0") & 0x3f]);
}
@@ -347,15 +347,15 @@ static ADDRESS_MAP_START( port_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x08, 0x08) AM_READ(omegrace_vg_go_r)
AM_RANGE(0x09, 0x09) AM_READ(watchdog_reset_r)
AM_RANGE(0x0a, 0x0a) AM_WRITE(avgdvg_reset_w)
- AM_RANGE(0x0b, 0x0b) AM_READ(omegrace_vg_status_r) /* vg_halt */
- AM_RANGE(0x10, 0x10) AM_READ(input_port_0_r) /* DIP SW C4 */
- AM_RANGE(0x17, 0x17) AM_READ(input_port_1_r) /* DIP SW C6 */
- AM_RANGE(0x11, 0x11) AM_READ(input_port_2_r) /* Player 1 input */
- AM_RANGE(0x12, 0x12) AM_READ(input_port_3_r) /* Player 2 input */
- AM_RANGE(0x13, 0x13) AM_WRITE(omegrace_leds_w) /* coin counters, leds, flip screen */
- AM_RANGE(0x14, 0x14) AM_WRITE(omegrace_soundlatch_w) /* Sound command */
- AM_RANGE(0x15, 0x15) AM_READ(omegrace_spinner1_r) /* 1st controller */
- AM_RANGE(0x16, 0x16) AM_READ(input_port_5_r) /* 2nd controller (cocktail) */
+ AM_RANGE(0x0b, 0x0b) AM_READ(omegrace_vg_status_r) /* vg_halt */
+ AM_RANGE(0x10, 0x10) AM_READ_PORT("DSW1") /* DIP SW C4 */
+ AM_RANGE(0x17, 0x17) AM_READ_PORT("DSW2") /* DIP SW C6 */
+ AM_RANGE(0x11, 0x11) AM_READ_PORT("IN0") /* Player 1 input */
+ AM_RANGE(0x12, 0x12) AM_READ_PORT("IN1") /* Player 2 input */
+ AM_RANGE(0x13, 0x13) AM_WRITE(omegrace_leds_w) /* coin counters, leds, flip screen */
+ AM_RANGE(0x14, 0x14) AM_WRITE(omegrace_soundlatch_w) /* Sound command */
+ AM_RANGE(0x15, 0x15) AM_READ(omegrace_spinner1_r) /* 1st controller */
+ AM_RANGE(0x16, 0x16) AM_READ(input_port_5_r) /* 2nd controller (cocktail) */
ADDRESS_MAP_END
@@ -388,79 +388,79 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( omegrace )
- PORT_START /* SW0 */
+ PORT_START_TAG("DSW1") /* SW0 */
PORT_DIPNAME( 0x03, 0x03, "1st Bonus Life" ) PORT_DIPLOCATION("SW1:1,2")
- PORT_DIPSETTING ( 0x00, "40k" )
- PORT_DIPSETTING ( 0x01, "50k" )
- PORT_DIPSETTING ( 0x02, "70k" )
- PORT_DIPSETTING ( 0x03, "100k" )
+ PORT_DIPSETTING ( 0x00, "40k" )
+ PORT_DIPSETTING ( 0x01, "50k" )
+ PORT_DIPSETTING ( 0x02, "70k" )
+ PORT_DIPSETTING ( 0x03, "100k" )
PORT_DIPNAME( 0x0c, 0x0c, "2nd & 3rd Bonus Life" ) PORT_DIPLOCATION("SW1:3,4")
- PORT_DIPSETTING ( 0x00, "150k 250k" )
- PORT_DIPSETTING ( 0x04, "250k 500k" )
- PORT_DIPSETTING ( 0x08, "500k 750k" )
- PORT_DIPSETTING ( 0x0c, "750k 1500k" )
+ PORT_DIPSETTING ( 0x00, "150k 250k" )
+ PORT_DIPSETTING ( 0x04, "250k 500k" )
+ PORT_DIPSETTING ( 0x08, "500k 750k" )
+ PORT_DIPSETTING ( 0x0c, "750k 1500k" )
PORT_DIPNAME( 0x30, 0x30, "Credit(s)/Ships" ) PORT_DIPLOCATION("SW1:5,6")
- PORT_DIPSETTING ( 0x00, "1C/2S 2C/4S" )
- PORT_DIPSETTING ( 0x10, "1C/2S 2C/5S" )
- PORT_DIPSETTING ( 0x20, "1C/3S 2C/6S" )
- PORT_DIPSETTING ( 0x30, "1C/3S 2C/7S" )
+ PORT_DIPSETTING ( 0x00, "1C/2S 2C/4S" )
+ PORT_DIPSETTING ( 0x10, "1C/2S 2C/5S" )
+ PORT_DIPSETTING ( 0x20, "1C/3S 2C/6S" )
+ PORT_DIPSETTING ( 0x30, "1C/3S 2C/7S" )
PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unused ) ) PORT_DIPLOCATION("SW1:7")
- PORT_DIPSETTING ( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING ( 0x40, DEF_STR( On ) )
+ PORT_DIPSETTING ( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING ( 0x40, DEF_STR( On ) )
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unused ) ) PORT_DIPLOCATION("SW1:8")
- PORT_DIPSETTING ( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING ( 0x80, DEF_STR( On ) )
+ PORT_DIPSETTING ( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING ( 0x80, DEF_STR( On ) )
- PORT_START /* SW1 */
+ PORT_START_TAG("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 ) )
- PORT_DIPSETTING ( 0x03, DEF_STR( 4C_5C ) )
- PORT_DIPSETTING ( 0x04, DEF_STR( 3C_4C ) )
- PORT_DIPSETTING ( 0x05, DEF_STR( 2C_3C ) )
- PORT_DIPSETTING ( 0x00, DEF_STR( 1C_2C ) )
- PORT_DIPSETTING ( 0x01, DEF_STR( 1C_3C ) )
- PORT_DIPSETTING ( 0x02, DEF_STR( 1C_5C ) )
+ PORT_DIPSETTING ( 0x06, DEF_STR( 2C_1C ) )
+ PORT_DIPSETTING ( 0x07, DEF_STR( 1C_1C ) )
+ PORT_DIPSETTING ( 0x03, DEF_STR( 4C_5C ) )
+ PORT_DIPSETTING ( 0x04, DEF_STR( 3C_4C ) )
+ PORT_DIPSETTING ( 0x05, DEF_STR( 2C_3C ) )
+ PORT_DIPSETTING ( 0x00, DEF_STR( 1C_2C ) )
+ PORT_DIPSETTING ( 0x01, DEF_STR( 1C_3C ) )
+ PORT_DIPSETTING ( 0x02, DEF_STR( 1C_5C ) )
PORT_DIPNAME( 0x38, 0x38, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW2:4,5,6")
- PORT_DIPSETTING ( 0x30, DEF_STR( 2C_1C ) )
- PORT_DIPSETTING ( 0x38, DEF_STR( 1C_1C ) )
- PORT_DIPSETTING ( 0x18, DEF_STR( 4C_5C ) )
- PORT_DIPSETTING ( 0x20, DEF_STR( 3C_4C ) )
- PORT_DIPSETTING ( 0x28, DEF_STR( 2C_3C ) )
- PORT_DIPSETTING ( 0x00, DEF_STR( 1C_2C ) )
- PORT_DIPSETTING ( 0x08, DEF_STR( 1C_3C ) )
- PORT_DIPSETTING ( 0x10, DEF_STR( 1C_5C ) )
+ PORT_DIPSETTING ( 0x30, DEF_STR( 2C_1C ) )
+ PORT_DIPSETTING ( 0x38, DEF_STR( 1C_1C ) )
+ PORT_DIPSETTING ( 0x18, DEF_STR( 4C_5C ) )
+ PORT_DIPSETTING ( 0x20, DEF_STR( 3C_4C ) )
+ PORT_DIPSETTING ( 0x28, DEF_STR( 2C_3C ) )
+ PORT_DIPSETTING ( 0x00, DEF_STR( 1C_2C ) )
+ PORT_DIPSETTING ( 0x08, DEF_STR( 1C_3C ) )
+ PORT_DIPSETTING ( 0x10, DEF_STR( 1C_5C ) )
PORT_DIPNAME( 0x40, 0x00, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW2:7")
- PORT_DIPSETTING ( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING ( 0x40, DEF_STR( On ) )
+ PORT_DIPSETTING ( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING ( 0x40, DEF_STR( On ) )
PORT_DIPNAME( 0x80, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:8")
- PORT_DIPSETTING ( 0x00, DEF_STR( Upright ) )
- PORT_DIPSETTING ( 0x80, DEF_STR( Cocktail ) )
-
- PORT_START /* 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 )
- PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_TILT )
- PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
- PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
+ PORT_DIPSETTING ( 0x00, DEF_STR( Upright ) )
+ PORT_DIPSETTING ( 0x80, DEF_STR( Cocktail ) )
+
+ PORT_START_TAG("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 )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_TILT )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START /* IN3 - port 0x12 */
- PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
- PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
+ PORT_START_TAG("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)")
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START4 ) PORT_NAME("2 Players Start (2 credits)")
- PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT ( 0x20, 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_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 /* IN4 - port 0x15 - spinner */
+ PORT_START_TAG("SPIN0") /* IN4 - port 0x15 - spinner */
PORT_BIT(0x3f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(12) PORT_KEYDELTA(10)
- PORT_START /* IN5 - port 0x16 - second spinner */
+ PORT_START_TAG("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 644f61a4330..3d9df1d6371 100644
--- a/src/mame/drivers/oneshot.c
+++ b/src/mame/drivers/oneshot.c
@@ -53,7 +53,7 @@ VIDEO_UPDATE( maddonna );
static READ16_HANDLER( oneshot_in0_word_r )
{
- int data = input_port_read_indexed(machine, 0);
+ int data = input_port_read(machine, "DSW1");
switch (data & 0x0c)
{
@@ -124,10 +124,10 @@ static ADDRESS_MAP_START( oneshot_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x190036, 0x190037) AM_READ(oneshot_gun_y_p1_r)
AM_RANGE(0x19003e, 0x19003f) AM_READ(oneshot_gun_y_p2_r)
AM_RANGE(0x19c020, 0x19c021) AM_READ(oneshot_in0_word_r)
- AM_RANGE(0x19c024, 0x19c025) AM_READ(input_port_1_word_r)
- AM_RANGE(0x19c02c, 0x19c02d) AM_READ(input_port_2_word_r)
- AM_RANGE(0x19c030, 0x19c031) AM_READ(input_port_3_word_r)
- AM_RANGE(0x19c034, 0x19c035) AM_READ(input_port_4_word_r)
+ AM_RANGE(0x19c024, 0x19c025) AM_READ_PORT("DSW2")
+ AM_RANGE(0x19c02c, 0x19c02d) AM_READ_PORT("CREDITS")
+ AM_RANGE(0x19c030, 0x19c031) AM_READ_PORT("P1")
+ AM_RANGE(0x19c034, 0x19c035) AM_READ_PORT("P2")
ADDRESS_MAP_END
static ADDRESS_MAP_START( oneshot_writemem, ADDRESS_SPACE_PROGRAM, 16 )
@@ -161,7 +161,7 @@ static ADDRESS_MAP_START( snd_writemem, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
static INPUT_PORTS_START( oneshot )
- PORT_START /* DSW 1 (0x19c020.l -> 0x08006c.l) */
+ PORT_START_TAG("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 /* DSW 2 (0x19c024.l -> 0x08006e.l) */
+ PORT_START_TAG("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 /* Credits (0x19c02c.l -> 0x08007a.l) */
+ PORT_START_TAG("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 /* Player 1 Gun Trigger (0x19c030.l) */
+ PORT_START_TAG("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 /* Player 2 Gun Trigger (0x19c034.l) */
+ PORT_START_TAG("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 /* Player 1 Gun X ($190026.l) */
+ PORT_START_TAG("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 /* Player 1 Gun Y ($190036.l) */
+ PORT_START_TAG("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 /* Player 2 Gun X ($19002e.l) */
+ PORT_START_TAG("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 /* Player 2 Gun Y ($19003e.l) */
+ PORT_START_TAG("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 /* DSW A */
+ PORT_START_TAG("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 /* DSW B */
+ PORT_START_TAG("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 /* Credits */
+ PORT_START_TAG("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 /* Player 1 */
+ PORT_START_TAG("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 /* Player 1 */
+ PORT_START_TAG("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/orbit.c b/src/mame/drivers/orbit.c
index e93e2510a37..78854045703 100644
--- a/src/mame/drivers/orbit.c
+++ b/src/mame/drivers/orbit.c
@@ -120,11 +120,11 @@ static MACHINE_RESET( orbit )
static ADDRESS_MAP_START( orbit_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x00ff) AM_MIRROR(0x0700) AM_RAM
- AM_RANGE(0x0800, 0x0800) AM_MIRROR(0x07ff) AM_READ(input_port_0_r)
- AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x07ff) AM_READ(input_port_1_r)
- AM_RANGE(0x1800, 0x1800) AM_MIRROR(0x07ff) AM_READ(input_port_2_r)
- AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x07ff) AM_READ(input_port_3_r)
- AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x07ff) AM_READ(input_port_4_r)
+ AM_RANGE(0x0800, 0x0800) AM_MIRROR(0x07ff) AM_READ_PORT("P1")
+ AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x07ff) AM_READ_PORT("P2")
+ AM_RANGE(0x1800, 0x1800) AM_MIRROR(0x07ff) AM_READ_PORT("DSW1")
+ AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x07ff) AM_READ_PORT("DSW2")
+ AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x07ff) AM_READ_PORT("BUTTONS")
AM_RANGE(0x3000, 0x33bf) AM_MIRROR(0x0400) AM_RAM_WRITE(orbit_playfield_w) AM_BASE(&orbit_playfield_ram)
AM_RANGE(0x33c0, 0x33ff) AM_MIRROR(0x0400) AM_RAM AM_BASE(&orbit_sprite_ram)
AM_RANGE(0x3800, 0x3800) AM_MIRROR(0x00ff) AM_WRITE(orbit_note_w)
@@ -145,7 +145,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( orbit )
- PORT_START /* 0800 */
+ PORT_START_TAG("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 /* 1000 */
+ PORT_START_TAG("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 /* 1800 */
+ PORT_START_TAG("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 /* 2000 */
+ PORT_START_TAG("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 /* 2800 */
+ PORT_START_TAG("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/overdriv.c b/src/mame/drivers/overdriv.c
index 6172d9b5250..1f7a1d511a1 100644
--- a/src/mame/drivers/overdriv.c
+++ b/src/mame/drivers/overdriv.c
@@ -129,7 +129,7 @@ static READ16_HANDLER( eeprom_r )
//logerror("%06x eeprom_r\n",activecpu_get_pc());
/* bit 6 is EEPROM data */
- res = (eeprom_read_bit() << 6) | input_port_read_indexed(machine,0);
+ res = (eeprom_read_bit() << 6) | input_port_read(machine,"INPUT");
return res;
}
@@ -258,8 +258,8 @@ static ADDRESS_MAP_START( overdriv_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x040000, 0x043fff) AM_READ(SMH_RAM)
AM_RANGE(0x080000, 0x080fff) AM_READ(SMH_RAM)
AM_RANGE(0x0c0000, 0x0c0001) AM_READ(eeprom_r)
- AM_RANGE(0x0c0002, 0x0c0003) AM_READ(input_port_1_word_r)
- AM_RANGE(0x180000, 0x180001) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x0c0002, 0x0c0003) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0x180000, 0x180001) AM_READ_PORT("PADDLE")
AM_RANGE(0x1d8000, 0x1d8003) AM_READ(overdriv_sound_0_r) /* K053260 */
AM_RANGE(0x1e0000, 0x1e0003) AM_READ(overdriv_sound_1_r) /* K053260 */
AM_RANGE(0x200000, 0x203fff) AM_READ(sharedram_r)
@@ -295,30 +295,30 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( overdriv_readmem2, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM)
AM_RANGE(0x080000, 0x083fff) AM_READ(SMH_RAM)
-AM_RANGE(0x0c0000, 0x0c1fff) AM_READ(SMH_RAM)
-AM_RANGE(0x100000, 0x10000f) AM_READ(SMH_NOP) // K053250 #0
-AM_RANGE(0x108000, 0x10800f) AM_READ(SMH_NOP) // K053250 #1
+ AM_RANGE(0x0c0000, 0x0c1fff) AM_READ(SMH_RAM)
+ AM_RANGE(0x100000, 0x10000f) AM_READ(SMH_NOP) // K053250 #0
+ AM_RANGE(0x108000, 0x10800f) AM_READ(SMH_NOP) // K053250 #1
AM_RANGE(0x118000, 0x118fff) AM_READ(K053247_word_r)
AM_RANGE(0x120000, 0x120001) AM_READ(K053246_word_r)
AM_RANGE(0x128000, 0x128001) AM_READ(cpuB_ctrl_r)
AM_RANGE(0x200000, 0x203fff) AM_READ(sharedram_r)
-AM_RANGE(0x208000, 0x20bfff) AM_READ(SMH_RAM)
+ AM_RANGE(0x208000, 0x20bfff) AM_READ(SMH_RAM)
-AM_RANGE(0x218000, 0x219fff) AM_READ(SMH_NOP) // K053250 #0 gfx ROM read (LSB)
-AM_RANGE(0x220000, 0x221fff) AM_READ(SMH_NOP) // K053250 #1 gfx ROM read (LSB)
+ AM_RANGE(0x218000, 0x219fff) AM_READ(SMH_NOP) // K053250 #0 gfx ROM read (LSB)
+ AM_RANGE(0x220000, 0x221fff) AM_READ(SMH_NOP) // K053250 #1 gfx ROM read (LSB)
ADDRESS_MAP_END
static ADDRESS_MAP_START( overdriv_writemem2, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM)
AM_RANGE(0x080000, 0x083fff) AM_WRITE(SMH_RAM) /* work RAM */
-AM_RANGE(0x0c0000, 0x0c1fff) AM_WRITE(SMH_RAM)
-AM_RANGE(0x100000, 0x10000f) AM_WRITE(SMH_NOP) // K053250 #0
-AM_RANGE(0x108000, 0x10800f) AM_WRITE(SMH_NOP) // K053250 #1
+ AM_RANGE(0x0c0000, 0x0c1fff) AM_WRITE(SMH_RAM)
+ AM_RANGE(0x100000, 0x10000f) AM_WRITE(SMH_NOP) // K053250 #0
+ AM_RANGE(0x108000, 0x10800f) AM_WRITE(SMH_NOP) // K053250 #1
AM_RANGE(0x118000, 0x118fff) AM_WRITE(K053247_word_w)
AM_RANGE(0x128000, 0x128001) AM_WRITE(cpuB_ctrl_w) /* enable K053247 ROM reading, plus something else */
AM_RANGE(0x130000, 0x130007) AM_WRITE(K053246_word_w)
AM_RANGE(0x200000, 0x203fff) AM_WRITE(sharedram_w)
-AM_RANGE(0x208000, 0x20bfff) AM_WRITE(SMH_RAM)
+ AM_RANGE(0x208000, 0x20bfff) AM_WRITE(SMH_RAM)
ADDRESS_MAP_END
@@ -344,7 +344,7 @@ ADDRESS_MAP_END
/* is missing. */
static INPUT_PORTS_START( overdriv )
- PORT_START
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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 e4e99c0b3f2..23d008fdbcd 100644
--- a/src/mame/drivers/pacland.c
+++ b/src/mame/drivers/pacland.c
@@ -209,8 +209,10 @@ static READ8_HANDLER( pacland_input_r )
{
int shift = 4 * (offset & 1);
int port = offset & 2;
- int r = ( input_port_read_indexed(machine, port+0 ) << shift ) & 0xf0;
- r |= ( input_port_read_indexed(machine, port+1 ) >> (4-shift) ) & 0x0f;
+ static const char *portnames[] = { "DSWA", "DSWB", "IN0", "IN1" };
+ int r = (input_port_read(machine, portnames[port]) << shift) & 0xf0;
+ r |= (input_port_read(machine, portnames[port+1]) >> (4-shift)) & 0x0f;
+
return r;
}
@@ -280,7 +282,7 @@ static READ8_HANDLER( readFF )
}
static ADDRESS_MAP_START( mcu_port_map, ADDRESS_SPACE_IO, 8 )
- AM_RANGE(HD63701_PORT1, HD63701_PORT1) AM_READ(input_port_4_r)
+ AM_RANGE(HD63701_PORT1, HD63701_PORT1) AM_READ_PORT("IN2")
AM_RANGE(HD63701_PORT1, HD63701_PORT1) AM_WRITE(pacland_coin_w)
AM_RANGE(HD63701_PORT2, HD63701_PORT2) AM_READ(readFF) /* leds won't work otherwise */
AM_RANGE(HD63701_PORT2, HD63701_PORT2) AM_WRITE(pacland_led_w)
@@ -289,7 +291,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( pacland )
- PORT_START /* DSWA */
+ PORT_START_TAG("DSWA") /* DSWA */
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x60, 0x60, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x40, "2" )
@@ -310,7 +312,7 @@ static INPUT_PORTS_START( pacland )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
- PORT_START /* DSWB */
+ PORT_START_TAG("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" )
@@ -335,7 +337,7 @@ static INPUT_PORTS_START( pacland )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
- PORT_START /* Memory Mapped Port */
+ PORT_START_TAG("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 )
@@ -347,7 +349,7 @@ static INPUT_PORTS_START( pacland )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START /* Memory Mapped Port */
+ PORT_START_TAG("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 )
@@ -357,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 /* MCU Input Port */
+ PORT_START_TAG("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 3d3fdc6a803..04213aaea02 100644
--- a/src/mame/drivers/pacman.c
+++ b/src/mame/drivers/pacman.c
@@ -553,7 +553,7 @@ static READ8_HANDLER( alibaba_mystery_2_r )
static READ8_HANDLER( maketrax_special_port2_r )
{
- int data = input_port_read_indexed(machine, 2);
+ int data = input_port_read(machine, "IN1");
int pc = activecpu_get_previouspc();
if ((pc == 0x1973) || (pc == 0x2389)) return data | 0x40;
@@ -596,7 +596,7 @@ static READ8_HANDLER( maketrax_special_port3_r )
static READ8_HANDLER( korosuke_special_port2_r )
{
- int data = input_port_read_indexed(machine,2);
+ int data = input_port_read(machine, "IN1");
int pc = activecpu_get_previouspc();
if ((pc == 0x196e) || (pc == 0x2387)) return data | 0x40;
@@ -811,10 +811,10 @@ static ADDRESS_MAP_START( pacman_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(SMH_NOP)
AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(SMH_NOP)
AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ(input_port_0_r) /* IN0 */
- AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ(input_port_1_r) /* IN1 */
- AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_READ(input_port_2_r) /* DSW1 */
- AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_READ(input_port_3_r) /* DSW2 */
+ AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ_PORT("IN0") /* IN0 */
+ AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ_PORT("IN1") /* IN1 */
+ AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_READ_PORT("DSW1") /* DSW1 */
+ AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_READ_PORT("DSW2") /* DSW2 */
ADDRESS_MAP_END
// The Pacman code uses $5004 and $5005 for LED's and $5007 for coin lockout. This hardware does not
// exist on any Pacman or Puckman board I have seen. DW
@@ -839,10 +839,10 @@ static ADDRESS_MAP_START( mspacman_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(SMH_NOP)
AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(SMH_NOP)
AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ(input_port_0_r) /* IN0 */
- AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ(input_port_1_r) /* IN1 */
- AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_READ(input_port_2_r) /* DSW1 */
- AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_READ(input_port_3_r) /* DSW2 */
+ AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ_PORT("IN0") /* IN0 */
+ AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ_PORT("IN1") /* IN1 */
+ AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_READ_PORT("DSW1") /* DSW1 */
+ AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_READ_PORT("DSW2") /* DSW2 */
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1)
ADDRESS_MAP_END
@@ -866,10 +866,10 @@ static ADDRESS_MAP_START( woodpek_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(SMH_NOP)
AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(SMH_NOP)
AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ(input_port_0_r) /* IN0 */
- AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ(input_port_1_r) /* IN1 */
- AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_READ(input_port_2_r) /* DSW1 */
- AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_READ(input_port_3_r) /* DSW2 */
+ AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ_PORT("IN0") /* IN0 */
+ AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ_PORT("IN1") /* IN1 */
+ AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_READ_PORT("DSW1") /* DSW1 */
+ AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_READ_PORT("DSW2") /* DSW2 */
AM_RANGE(0x8000, 0xbfff) AM_ROM
ADDRESS_MAP_END
@@ -894,9 +894,9 @@ static ADDRESS_MAP_START( alibaba_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x50c1, 0x50c1) AM_MIRROR(0xaf00) AM_WRITE(pacman_flipscreen_w)
AM_RANGE(0x50c2, 0x50c2) AM_MIRROR(0xaf00) AM_WRITE(interrupt_enable_w)
AM_RANGE(0x50c3, 0x50ff) AM_MIRROR(0xaf00) AM_WRITE(SMH_NOP)
- AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ(input_port_0_r) /* IN0 */
- AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ(input_port_1_r) /* IN1 */
- AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_READ(input_port_2_r) /* DSW1 */
+ AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ_PORT("IN0") /* IN0 */
+ AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ_PORT("IN1") /* IN1 */
+ AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_READ_PORT("DSW1") /* DSW1 */
AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf00) AM_READ(alibaba_mystery_1_r)
AM_RANGE(0x50c1, 0x50c1) AM_MIRROR(0xaf00) AM_READ(alibaba_mystery_2_r)
AM_RANGE(0x50c2, 0x50ff) AM_MIRROR(0xaf00) AM_READ(pacman_read_nop)
@@ -924,10 +924,10 @@ static ADDRESS_MAP_START( dremshpr_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(SMH_NOP)
AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(SMH_NOP)
AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ(input_port_0_r) /* IN0 */
- AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ(input_port_1_r) /* IN1 */
- AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_READ(input_port_2_r) /* DSW1 */
- AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_READ(input_port_3_r) /* DSW2 */
+ AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ_PORT("IN0") /* IN0 */
+ AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ_PORT("IN1") /* IN1 */
+ AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_READ_PORT("DSW1") /* DSW1 */
+ AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_READ_PORT("DSW2") /* DSW2 */
AM_RANGE(0x8000, 0xbfff) AM_ROM
ADDRESS_MAP_END
@@ -951,10 +951,10 @@ static ADDRESS_MAP_START( epos_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(SMH_NOP)
AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(SMH_NOP)
AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ(input_port_0_r) /* IN0 */
- AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ(input_port_1_r) /* IN1 */
- AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_READ(input_port_2_r) /* DSW1 */
- AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_READ(input_port_3_r) /* DSW2 */
+ AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ_PORT("IN0") /* IN0 */
+ AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ_PORT("IN1") /* IN1 */
+ AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_READ_PORT("DSW1") /* DSW1 */
+ AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_READ_PORT("DSW2") /* DSW2 */
ADDRESS_MAP_END
@@ -976,10 +976,10 @@ static ADDRESS_MAP_START( vanvan_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(SMH_NOP)
AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(SMH_NOP) /* ??? toggled before reading 5000 */
AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ(input_port_0_r) /* IN0 */
- AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ(input_port_1_r) /* IN1 */
- AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_READ(input_port_2_r) /* DSW1 */
- AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_READ(input_port_3_r) /* DSW2 */
+ AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ_PORT("IN0") /* IN0 */
+ AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ_PORT("IN1") /* IN1 */
+ AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_READ_PORT("DSW1") /* DSW1 */
+ AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_READ_PORT("DSW2") /* DSW2 */
AM_RANGE(0x8000, 0x8fff) AM_MIRROR(0x3000) AM_ROM
/* probably a leftover from development: the Sanritsu version */
/* writes the color lookup table here, while the Karateko version */
@@ -1005,9 +1005,9 @@ static ADDRESS_MAP_START( s2650games_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1586, 0x1587) AM_MIRROR(0xe000) AM_WRITE(SMH_NOP)
AM_RANGE(0x15c0, 0x15c0) AM_MIRROR(0xe000) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x15c7, 0x15c7) AM_MIRROR(0xe000) AM_WRITE(porky_banking_w)
- AM_RANGE(0x1500, 0x1500) AM_MIRROR(0xe000) AM_READ(input_port_0_r)
- AM_RANGE(0x1540, 0x1540) AM_MIRROR(0xe000) AM_READ(input_port_1_r)
- AM_RANGE(0x1580, 0x1580) AM_MIRROR(0xe000) AM_READ(input_port_2_r)
+ AM_RANGE(0x1500, 0x1500) AM_MIRROR(0xe000) AM_READ_PORT("IN0")
+ AM_RANGE(0x1540, 0x1540) AM_MIRROR(0xe000) AM_READ_PORT("IN1")
+ AM_RANGE(0x1580, 0x1580) AM_MIRROR(0xe000) AM_READ_PORT("DSW0")
AM_RANGE(0x1800, 0x1bff) AM_MIRROR(0xe000) AM_WRITE(s2650games_videoram_w) AM_BASE(&videoram)
AM_RANGE(0x1c00, 0x1fef) AM_MIRROR(0xe000) AM_RAM
AM_RANGE(0x1ff0, 0x1fff) AM_MIRROR(0xe000) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size)
@@ -1030,15 +1030,15 @@ static ADDRESS_MAP_START( rocktrv2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x50c0, 0x50c0) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x5fe0, 0x5fe3) AM_WRITE(rocktrv2_prot_data_w) AM_BASE(&rocktrv2_prot_data)
AM_RANGE(0x5ff0, 0x5ff0) AM_WRITE(rocktrv2_question_bank_w)
- AM_RANGE(0x5000, 0x5000) AM_READ(input_port_0_r) /* IN0 */
- AM_RANGE(0x5040, 0x507f) AM_READ(input_port_1_r) /* IN1 */
- AM_RANGE(0x5080, 0x5080) AM_READ(input_port_2_r) /* DSW1 */
- AM_RANGE(0x50c0, 0x50c0) AM_READ(input_port_3_r) /* DSW2 */
+ AM_RANGE(0x5000, 0x5000) AM_READ_PORT("IN0") /* IN0 */
+ AM_RANGE(0x5040, 0x507f) AM_READ_PORT("IN1") /* IN1 */
+ AM_RANGE(0x5080, 0x5080) AM_READ_PORT("DSW1") /* DSW1 */
+ AM_RANGE(0x50c0, 0x50c0) AM_READ_PORT("DSW2") /* DSW2 */
AM_RANGE(0x5fe0, 0x5fe0) AM_READ(rocktrv2_prot1_data_r)
AM_RANGE(0x5fe4, 0x5fe4) AM_READ(rocktrv2_prot2_data_r)
AM_RANGE(0x5fe8, 0x5fe8) AM_READ(rocktrv2_prot3_data_r)
AM_RANGE(0x5fec, 0x5fec) AM_READ(rocktrv2_prot4_data_r)
- AM_RANGE(0x5fff, 0x5fff) AM_READ(input_port_3_r) /* DSW2 mirrored */
+ AM_RANGE(0x5fff, 0x5fff) AM_READ_PORT("DSW2") /* DSW2 mirrored */
AM_RANGE(0x6000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xffff) AM_READ(rocktrv2_question_r)
ADDRESS_MAP_END
@@ -1055,10 +1055,10 @@ static ADDRESS_MAP_START( bigbucks_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x5007, 0x5007) AM_WRITE(SMH_NOP) /*?*/
AM_RANGE(0x5040, 0x505f) AM_WRITE(pacman_sound_w) AM_BASE(&pacman_soundregs)
AM_RANGE(0x50c0, 0x50c0) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0x5000, 0x503f) AM_READ(input_port_0_r) /* IN0 */
- AM_RANGE(0x5040, 0x507f) AM_READ(input_port_1_r) /* IN1 */
- AM_RANGE(0x5080, 0x50bf) AM_READ(input_port_2_r) /* DSW1 */
- AM_RANGE(0x50c0, 0x50ff) AM_READ(input_port_3_r) /* DSW2 */
+ AM_RANGE(0x5000, 0x503f) AM_READ_PORT("IN0") /* IN0 */
+ AM_RANGE(0x5040, 0x507f) AM_READ_PORT("IN1") /* IN1 */
+ AM_RANGE(0x5080, 0x50bf) AM_READ_PORT("DSW1") /* DSW1 */
+ AM_RANGE(0x50c0, 0x50ff) AM_READ_PORT("DSW2") /* DSW2 */
AM_RANGE(0x5100, 0x5100) AM_WRITE(SMH_NOP) /*?*/
AM_RANGE(0x6000, 0x6000) AM_WRITE(bigbucks_bank_w)
AM_RANGE(0x8000, 0x9fff) AM_ROM
@@ -1084,10 +1084,10 @@ static ADDRESS_MAP_START( mschamp_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(SMH_NOP)
AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(SMH_NOP)
AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ(input_port_0_r) /* IN0 */
- AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ(input_port_1_r) /* IN1 */
- AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_READ(input_port_2_r) /* DSW1 */
- AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_READ(input_port_3_r) /* DSW2 */
+ AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ_PORT("IN0") /* IN0 */
+ AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ_PORT("IN1") /* IN1 */
+ AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_READ_PORT("DSW1") /* DSW1 */
+ AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_READ_PORT("DSW2") /* DSW2 */
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(2)
ADDRESS_MAP_END
@@ -1111,8 +1111,8 @@ static ADDRESS_MAP_START( crushs_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITE(SMH_NOP)
AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITE(SMH_NOP)
AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_WRITE(watchdog_reset_w)
- AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ(input_port_0_r)
- AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_READ(input_port_1_r)
+ AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ_PORT("IN0")
+ AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_READ_PORT("IN1")
ADDRESS_MAP_END
@@ -1172,19 +1172,19 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( drivfrcp_readport, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ(SMH_NOP)
AM_RANGE(0x01, 0x01) AM_READ(drivfrcp_port1_r)
- AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ(input_port_3_r)
+ AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("Sense")
ADDRESS_MAP_END
static ADDRESS_MAP_START( _8bpm_readport, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ(SMH_NOP)
AM_RANGE(0x01, 0x01) AM_READ(_8bpm_port1_r)
AM_RANGE(0xe0, 0xe0) AM_READ(SMH_NOP)
- AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ(input_port_3_r)
+ AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("Sense")
ADDRESS_MAP_END
static ADDRESS_MAP_START( porky_readport, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x01, 0x01) AM_READ(porky_port1_r)
- AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ(input_port_3_r)
+ AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("Sense")
ADDRESS_MAP_END
static ADDRESS_MAP_START( s2650games_writeport, ADDRESS_SPACE_IO, 8 )
@@ -1193,8 +1193,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( crushs_readport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x01, 0x01) AM_READ(input_port_3_r)
- AM_RANGE(0x02, 0x02) AM_READ(input_port_2_r)
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("DSW2")
+ AM_RANGE(0x02, 0x02) AM_READ_PORT("DSW1")
ADDRESS_MAP_END
static ADDRESS_MAP_START( crushs_writeport, ADDRESS_SPACE_IO, 8 )
@@ -1236,7 +1236,7 @@ static INPUT_PORTS_START( pacman )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -1259,7 +1259,7 @@ static INPUT_PORTS_START( pacman )
PORT_DIPSETTING( 0x80, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x00, DEF_STR( Alternate ) )
- PORT_START_TAG("DSW 2")
+ PORT_START_TAG("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_START_TAG("FAKE")
@@ -1300,7 +1300,7 @@ static INPUT_PORTS_START( mspacman )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -1321,7 +1321,7 @@ static INPUT_PORTS_START( mspacman )
PORT_DIPSETTING( 0x00, DEF_STR( Hard ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW 2")
+ PORT_START_TAG("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_START_TAG("FAKE")
@@ -1361,7 +1361,7 @@ static INPUT_PORTS_START( mspacpls )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -1382,7 +1382,7 @@ static INPUT_PORTS_START( mspacpls )
PORT_DIPSETTING( 0x00, DEF_STR( Hard ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW 2")
+ PORT_START_TAG("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -1412,7 +1412,7 @@ static INPUT_PORTS_START( mschamp )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -1433,7 +1433,7 @@ static INPUT_PORTS_START( mschamp )
PORT_DIPSETTING( 0x00, DEF_STR( Hard ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW 2")
+ PORT_START_TAG("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_START_TAG("GAME")
@@ -1474,7 +1474,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("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -1493,7 +1493,7 @@ static INPUT_PORTS_START( maketrax )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Protection */
- PORT_START_TAG("DSW 2")
+ PORT_START_TAG("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -1527,7 +1527,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("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -1546,7 +1546,7 @@ static INPUT_PORTS_START( korosuke )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Protection */
- PORT_START_TAG("DSW 2")
+ PORT_START_TAG("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -1573,7 +1573,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("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -1592,7 +1592,7 @@ 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("DSW 2")
+ PORT_START_TAG("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -1620,7 +1620,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("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -1639,7 +1639,7 @@ 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("DSW 2")
+ PORT_START_TAG("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -1667,7 +1667,7 @@ static INPUT_PORTS_START( crushs )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW)
- PORT_START
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1694,7 +1694,7 @@ static INPUT_PORTS_START( crushs )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START
+ PORT_START_TAG("DSW2")
PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x08, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x09, DEF_STR( 2C_2C ) )
@@ -1754,7 +1754,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("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Bonus_Life ) )
PORT_DIPSETTING( 0x01, "10000" )
PORT_DIPSETTING( 0x02, "30000" )
@@ -1777,7 +1777,7 @@ static INPUT_PORTS_START( ponpoko )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW 2")
+ PORT_START_TAG("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" )
@@ -1831,7 +1831,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("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -1854,7 +1854,7 @@ static INPUT_PORTS_START( eyes )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW 2")
+ PORT_START_TAG("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -1880,7 +1880,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("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -1903,7 +1903,7 @@ static INPUT_PORTS_START( mrtnt )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW 2")
+ PORT_START_TAG("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -1929,7 +1929,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("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -1952,7 +1952,7 @@ static INPUT_PORTS_START( lizwiz )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW 2")
+ PORT_START_TAG("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -1980,7 +1980,7 @@ static INPUT_PORTS_START( theglobp )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x03, "3" )
PORT_DIPSETTING( 0x02, "4" )
@@ -2005,7 +2005,7 @@ static INPUT_PORTS_START( theglobp )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW 2")
+ PORT_START_TAG("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -2031,7 +2031,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("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -2055,7 +2055,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("DSW 2")
+ PORT_START_TAG("DSW2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -2104,7 +2104,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("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) )
@@ -2129,7 +2129,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("DSW 2")
+ PORT_START_TAG("DSW2")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -2178,7 +2178,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("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
@@ -2201,7 +2201,7 @@ static INPUT_PORTS_START( dremshpr )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_3C ) )
- PORT_START_TAG("DSW 2")
+ PORT_START_TAG("DSW2")
/* turning this on crashes puts the */
/* emulated machine in an infinite loop once in a while */
#if 0
@@ -2239,7 +2239,7 @@ static INPUT_PORTS_START( alibaba )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -2289,7 +2289,7 @@ static INPUT_PORTS_START( jumpshot )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x03, 0x01, "Time" )
// PORT_DIPSETTING( 0x00, "2 Minutes" )
PORT_DIPSETTING( 0x02, "2 Minutes" )
@@ -2314,7 +2314,7 @@ static INPUT_PORTS_START( jumpshot )
PORT_DIPSETTING( 0x80, DEF_STR( Off) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW 2")
+ PORT_START_TAG("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -2344,7 +2344,7 @@ static INPUT_PORTS_START( jumpshtp )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x03, 0x01, "Time Limit" )
// PORT_DIPSETTING( 0x00, "Short" )
PORT_DIPSETTING( 0x02, "Short" )
@@ -2369,7 +2369,7 @@ static INPUT_PORTS_START( jumpshtp )
PORT_DIPSETTING( 0x80, DEF_STR( Off) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW 2")
+ PORT_START_TAG("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -2390,7 +2390,7 @@ static INPUT_PORTS_START( shootbul )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x07, 0x07, "Time" )
PORT_DIPSETTING( 0x01, "Short")
PORT_DIPSETTING( 0x07, "Average" )
@@ -2411,7 +2411,7 @@ static INPUT_PORTS_START( shootbul )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("DSW 2")
+ PORT_START_TAG("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -2444,7 +2444,7 @@ static INPUT_PORTS_START( bwcasino )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2475,7 +2475,7 @@ static INPUT_PORTS_START( bwcasino )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW 2")
+ PORT_START_TAG("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -2505,7 +2505,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("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2536,7 +2536,7 @@ static INPUT_PORTS_START( acitya )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW 2")
+ PORT_START_TAG("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -2566,7 +2566,7 @@ static INPUT_PORTS_START( nmouse )
PORT_DIPSETTING( 0x80, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_START_TAG("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -2589,7 +2589,7 @@ static INPUT_PORTS_START( nmouse )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW 2")
+ PORT_START_TAG("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -2617,7 +2617,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("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -2638,7 +2638,7 @@ static INPUT_PORTS_START( woodpek )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW 2")
+ PORT_START_TAG("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -2665,7 +2665,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("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x01, 0x00, "Time to bet / answer" )
PORT_DIPSETTING( 0x00, "15 sec. / 10 sec." )
PORT_DIPSETTING( 0x01, "20 sec. / 15 sec." )
@@ -2691,7 +2691,7 @@ static INPUT_PORTS_START( bigbucks )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START_TAG("DSW 2")
+ PORT_START_TAG("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -2873,7 +2873,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("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -2897,7 +2897,7 @@ static INPUT_PORTS_START( rocktrv2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("DSW 2")
+ PORT_START_TAG("DSW2")
PORT_DIPNAME( 0x01, 0x01, "Mode" )
PORT_DIPSETTING( 0x01, "Amusement" )
PORT_DIPSETTING( 0x00, "Credit" )
@@ -2943,7 +2943,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("DSW 1")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x03, 0x03, "Display" )
PORT_DIPSETTING( 0x03, "Scores and Progession Bars" )
PORT_DIPSETTING( 0x01, "Scores only" )
@@ -2961,7 +2961,7 @@ static INPUT_PORTS_START( cannonbp )
PORT_DIPUNUSED( 0x40, IP_ACTIVE_LOW )
PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW )
- PORT_START_TAG("DSW 2")
+ PORT_START_TAG("DSW2")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/paranoia.c b/src/mame/drivers/paranoia.c
index a34b6fe3dbf..5e5d24c1d49 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( "IN" )
+ PORT_START_TAG( "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/pgm.c b/src/mame/drivers/pgm.c
index 3f776f97432..0811531451d 100644
--- a/src/mame/drivers/pgm.c
+++ b/src/mame/drivers/pgm.c
@@ -917,7 +917,7 @@ static INPUT_PORTS_START( orld105k )
INPUT_PORTS_END
static INPUT_PORTS_START( sango )
- PORT_START /* DSW */
+ PORT_START_TAG("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)
@@ -935,7 +935,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 /* DSW */
+ PORT_START_TAG("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,8 @@ static INPUT_PORTS_START( sango )
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
- PORT_START /* DSW */
+
+ PORT_START_TAG("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 +973,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 /* DSW */
+ PORT_START_TAG("DSW") /* DSW */
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0002, 0x0002, "Music" )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -996,7 +997,7 @@ static INPUT_PORTS_START( sango )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START /* Region - supplied by protection device */
+ PORT_START_TAG("Region") /* Region - supplied by protection device */
PORT_DIPNAME( 0x000f, 0x0005, DEF_STR( Region ) )
PORT_DIPSETTING( 0x0000, "China" )
PORT_DIPSETTING( 0x0001, "Taiwan" )
@@ -1007,7 +1008,7 @@ static INPUT_PORTS_START( sango )
INPUT_PORTS_END
static INPUT_PORTS_START( olds )
- PORT_START /* DSW */
+ PORT_START_TAG("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 +1026,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 /* DSW */
+ PORT_START_TAG("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)
@@ -1042,7 +1043,8 @@ static INPUT_PORTS_START( olds )
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
- PORT_START /* DSW */
+
+ PORT_START_TAG("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 )
@@ -1062,7 +1064,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 /* DSW */
+ PORT_START_TAG("DSW") /* DSW */
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0002, 0x0002, "Music" )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -1086,7 +1088,7 @@ static INPUT_PORTS_START( olds )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START /* Region - supplied by protection device */
+ PORT_START_TAG("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" )
@@ -1098,7 +1100,7 @@ static INPUT_PORTS_START( olds )
INPUT_PORTS_END
static INPUT_PORTS_START( killbld )
- PORT_START /* DSW */
+ PORT_START_TAG("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)
@@ -1116,7 +1118,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 /* DSW */
+ PORT_START_TAG("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)
@@ -1134,7 +1136,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 /* DSW */
+ PORT_START_TAG("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 )
@@ -1154,7 +1156,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 /* DSW */
+ PORT_START_TAG("DSW") /* DSW */
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0002, 0x0002, "Music" )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -1178,7 +1180,7 @@ static INPUT_PORTS_START( killbld )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START /* Region - supplied by protection device */
+ PORT_START_TAG("Region") /* Region - supplied by protection device */
PORT_DIPNAME( 0x00ff, 0x0021, DEF_STR( Region ) )
PORT_DIPSETTING( 0x0016, "Taiwan" )
PORT_DIPSETTING( 0x0017, "China" )
@@ -1195,7 +1197,7 @@ static INPUT_PORTS_START( killbld )
INPUT_PORTS_END
static INPUT_PORTS_START( photoy2k )
- PORT_START /* DSW */
+ PORT_START_TAG("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)
@@ -1213,7 +1215,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 /* DSW */
+ PORT_START_TAG("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)
@@ -1230,7 +1232,8 @@ static INPUT_PORTS_START( photoy2k )
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
- PORT_START /* DSW */
+
+ PORT_START_TAG("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 )
@@ -1250,7 +1253,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 /* DSW */
+ PORT_START_TAG("DSW") /* DSW */
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0002, 0x0002, "Music" )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -1274,7 +1277,7 @@ static INPUT_PORTS_START( photoy2k )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START /* Region - supplied by protection device */
+ PORT_START_TAG("Region") /* Region - supplied by protection device */
PORT_DIPNAME( 0x000f, 0x0003, DEF_STR( Region ) )
PORT_DIPSETTING( 0x0000, "Taiwan" )
PORT_DIPSETTING( 0x0001, "China" )
@@ -1285,7 +1288,7 @@ static INPUT_PORTS_START( photoy2k )
INPUT_PORTS_END
static INPUT_PORTS_START( ddp2 )
- PORT_START /* P1 */
+ PORT_START_TAG("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)
@@ -1303,7 +1306,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 /* P2 */
+ PORT_START_TAG("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)
@@ -1321,7 +1324,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 /* DSW */
+ PORT_START_TAG("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 )
@@ -1341,7 +1344,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 /* DSW */
+ PORT_START_TAG("DSW") /* DSW */
PORT_SERVICE( 0x0001, IP_ACTIVE_LOW )
PORT_DIPNAME( 0x0002, 0x0002, "Music" )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
@@ -1366,7 +1369,7 @@ static INPUT_PORTS_START( ddp2 )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
/* probably not dsw related anyway
- PORT_START
+ PORT_START_TAG("UNK0")
PORT_DIPNAME( 0x0001, 0x0001, "4" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1416,7 +1419,7 @@ static INPUT_PORTS_START( ddp2 )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START
+ PORT_START_TAG("UNK1")
PORT_DIPNAME( 0x0001, 0x0001, "5" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -1466,7 +1469,7 @@ static INPUT_PORTS_START( ddp2 )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
*/
- PORT_START /* Region - supplied by protection device */
+ PORT_START_TAG("Region") /* Region - supplied by protection device */
PORT_DIPNAME( 0x000f, 0x0005, DEF_STR( Region ) )
PORT_DIPSETTING( 0x0000, "China" )
PORT_DIPSETTING( 0x0001, "Taiwan" )
@@ -2028,7 +2031,7 @@ static READ16_HANDLER( killbld_prot_r )
else if(kb_cmd==5)
{
UINT32 protvalue;
- protvalue = 0x89911400|input_port_read_indexed(machine, 4); // region
+ protvalue = 0x89911400|input_port_read(machine, "Region");
res=(protvalue>>(8*(ptr-1)))&0xff;
}
@@ -2106,7 +2109,7 @@ static READ16_HANDLER(ddp2_protram_r)
{
if (PGMLOGERROR) logerror("prot_r %04x, %04x\n", offset,ddp2_protram[offset]);
- if (offset == 0x02/2) return input_port_read_indexed(machine, 4);
+ if (offset == 0x02/2) return input_port_read(machine, "Region");
if (offset == 0x1f00/2) return 0;
@@ -2201,22 +2204,22 @@ static UINT16 olds_bs,olds_cmd3;
//UINT16 olds_r16(UINT32 addr)
static READ16_HANDLER( olds_r16 )
{
-// int offset=addr&0xf;
+// int offset = addr&0xf;
UINT16 res ;
- res=0;
+ res = 0;
- if(offset==1)
+ if(offset == 1)
{
- if(kb_cmd==1)
- res=reg&0x7f;
- if(kb_cmd==2)
- res=olds_bs|0x80;
- if(kb_cmd==3)
- res=olds_cmd3;
- else if(kb_cmd==5)
+ if(kb_cmd == 1)
+ res = reg&0x7f;
+ if(kb_cmd == 2)
+ res = olds_bs|0x80;
+ if(kb_cmd == 3)
+ res = olds_cmd3;
+ else if(kb_cmd == 5)
{
- UINT32 protvalue = 0x900000|input_port_read_indexed(machine, 4); // region from protection device.
- res=(protvalue>>(8*(ptr-1)))&0xff; // includes region 1 = taiwan , 2 = china, 3 = japan (title = orlegend special), 4 = korea, 5 = hongkong, 6 = world
+ UINT32 protvalue = 0x900000 | input_port_read(machine, "Region"); // region from protection device.
+ res = (protvalue>>(8 * (ptr-1))) & 0xff; // includes region 1 = taiwan , 2 = china, 3 = japan (title = orlegend special), 4 = korea, 5 = hongkong, 6 = world
}
}
diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c
index 95abb23dbab..ab3f2304658 100644
--- a/src/mame/drivers/pirates.c
+++ b/src/mame/drivers/pirates.c
@@ -170,7 +170,7 @@ static READ16_HANDLER( pirates_in1_r )
bit = 1;
/* bit 4 is EEPROM data, bit 7 is protection */
- return input_port_read_indexed(machine,1) | (eeprom_read_bit() << 4) | (bit << 7);
+ return input_port_read(machine, "IN1") | (eeprom_read_bit() << 4) | (bit << 7);
}
@@ -180,7 +180,7 @@ static READ16_HANDLER( pirates_in1_r )
static ADDRESS_MAP_START( pirates_readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM)
AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM)
- AM_RANGE(0x300000, 0x300001) AM_READ(input_port_0_word_r)
+ AM_RANGE(0x300000, 0x300001) AM_READ_PORT("IN0")
AM_RANGE(0x400000, 0x400001) AM_READ(pirates_in1_r)
// AM_RANGE(0x500000, 0x5007ff) AM_READ(SMH_RAM)
AM_RANGE(0x800000, 0x803fff) AM_READ(SMH_RAM)
@@ -210,7 +210,7 @@ ADDRESS_MAP_END
/* Input Ports */
static INPUT_PORTS_START( pirates )
- PORT_START // IN0 - 0x300000.w
+ PORT_START_TAG("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 // IN1 - 0x400000.w
+ PORT_START_TAG("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/playch10.c b/src/mame/drivers/playch10.c
index d8c4e1885cf..bdbe2b32074 100644
--- a/src/mame/drivers/playch10.c
+++ b/src/mame/drivers/playch10.c
@@ -390,8 +390,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( bios_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READWRITE(pc10_port_0_r, pc10_SDCS_w)
- AM_RANGE(0x01, 0x01) AM_READWRITE(input_port_1_r, pc10_CNTRLMASK_w)
- AM_RANGE(0x02, 0x02) AM_READWRITE(input_port_2_r, pc10_DISPMASK_w)
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("SW1") AM_WRITE(pc10_CNTRLMASK_w)
+ AM_RANGE(0x02, 0x02) AM_READ_PORT("SW2") AM_WRITE(pc10_DISPMASK_w)
AM_RANGE(0x03, 0x03) AM_READWRITE(pc10_detectclr_r, pc10_SOUNDMASK_w)
AM_RANGE(0x04, 0x04) AM_WRITE(pc10_GAMERES_w)
AM_RANGE(0x05, 0x05) AM_WRITE(pc10_GAMESTOP_w)
@@ -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("IN0")
+ PORT_START_TAG("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_START1 ) PORT_NAME("Game Select") PORT_CODE(KEYCODE_1)
@@ -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("IN1")
+ PORT_START_TAG("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 // IN2 - FAKE - Gun X pos
+ PORT_START_TAG("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 // IN3 - FAKE - Gun Y pos
+ PORT_START_TAG("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 92fc5fea38f..2473dd18045 100644
--- a/src/mame/drivers/playmark.c
+++ b/src/mame/drivers/playmark.c
@@ -137,7 +137,7 @@ static READ16_HANDLER( wbeachvl_port0_r )
bit = eeprom_read_bit() << 7;
- return (input_port_read_indexed(machine, 0) & 0x7f) | bit;
+ return (input_port_read(machine, "SYSTEM") & 0x7f) | bit;
}
static READ16_HANDLER( hotmind_port2_r )
@@ -146,7 +146,7 @@ static READ16_HANDLER( hotmind_port2_r )
bit = eeprom_read_bit() << 7;
- return (input_port_read_indexed(machine, 2) & 0x7f) | bit;
+ return (input_port_read(machine, "P2") & 0x7f) | bit;
}
static WRITE16_HANDLER( wbeachvl_coin_eeprom_w )
@@ -284,12 +284,12 @@ static ADDRESS_MAP_START( bigtwin_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x510000, 0x51000b) AM_WRITE(bigtwin_scroll_w)
AM_RANGE(0x51000c, 0x51000d) AM_WRITENOP /* always 3? */
AM_RANGE(0x600000, 0x67ffff) AM_RAM AM_BASE(&bigtwin_bgvideoram)
- AM_RANGE(0x700010, 0x700011) AM_READ(input_port_0_word_r)
- AM_RANGE(0x700012, 0x700013) AM_READ(input_port_1_word_r)
- AM_RANGE(0x700014, 0x700015) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x700010, 0x700011) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0x700012, 0x700013) AM_READ_PORT("P1")
+ AM_RANGE(0x700014, 0x700015) AM_READ_PORT("P2")
AM_RANGE(0x700016, 0x700017) AM_WRITE(coinctrl_w)
- AM_RANGE(0x70001a, 0x70001b) AM_READ(input_port_3_word_r)
- AM_RANGE(0x70001c, 0x70001d) AM_READ(input_port_4_word_r)
+ AM_RANGE(0x70001a, 0x70001b) AM_READ_PORT("DSW1")
+ AM_RANGE(0x70001c, 0x70001d) AM_READ_PORT("DSW2")
AM_RANGE(0x70001e, 0x70001f) AM_WRITE(playmark_snd_command_w)
AM_RANGE(0x780000, 0x7807ff) AM_WRITE(bigtwin_paletteram_w) AM_BASE(&paletteram16)
// AM_RANGE(0xe00000, 0xe00001) ?? written on startup
@@ -307,11 +307,11 @@ static ADDRESS_MAP_START( wbeachvl_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x51000c, 0x51000d) AM_WRITENOP /* 2 and 3 */
// AM_RANGE(0x700000, 0x700001) ?? written on startup
AM_RANGE(0x710010, 0x710011) AM_READ(wbeachvl_port0_r)
- AM_RANGE(0x710012, 0x710013) AM_READ(input_port_1_word_r)
- AM_RANGE(0x710014, 0x710015) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x710012, 0x710013) AM_READ_PORT("P1")
+ AM_RANGE(0x710014, 0x710015) AM_READ_PORT("P2")
AM_RANGE(0x710016, 0x710017) AM_WRITE(wbeachvl_coin_eeprom_w)
- AM_RANGE(0x710018, 0x710019) AM_READ(input_port_3_word_r)
- AM_RANGE(0x71001a, 0x71001b) AM_READ(input_port_4_word_r)
+ AM_RANGE(0x710018, 0x710019) AM_READ_PORT("P3")
+ AM_RANGE(0x71001a, 0x71001b) AM_READ_PORT("P4")
// AM_RANGE(0x71001c, 0x71001d) AM_READ(playmark_snd_status???)
// AM_RANGE(0x71001e, 0x71001f) AM_WRITE(SMH_NOP)//playmark_snd_command_w },
AM_RANGE(0x780000, 0x780fff) AM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_BASE(&paletteram16)
@@ -327,12 +327,12 @@ static ADDRESS_MAP_START( excelsr_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x510000, 0x51000b) AM_WRITE(excelsr_scroll_w)
AM_RANGE(0x51000c, 0x51000d) AM_WRITENOP /* 2 and 3 */
AM_RANGE(0x600000, 0x67ffff) AM_RAM AM_BASE(&bigtwin_bgvideoram)
- AM_RANGE(0x700010, 0x700011) AM_READ(input_port_0_word_r)
- AM_RANGE(0x700012, 0x700013) AM_READ(input_port_1_word_r)
- AM_RANGE(0x700014, 0x700015) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x700010, 0x700011) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0x700012, 0x700013) AM_READ_PORT("P1")
+ AM_RANGE(0x700014, 0x700015) AM_READ_PORT("P2")
AM_RANGE(0x700016, 0x700017) AM_WRITE(coinctrl_w)
- AM_RANGE(0x70001a, 0x70001b) AM_READ(input_port_3_word_r)
- AM_RANGE(0x70001c, 0x70001d) AM_READ(input_port_4_word_r)
+ AM_RANGE(0x70001a, 0x70001b) AM_READ_PORT("DSW1")
+ AM_RANGE(0x70001c, 0x70001d) AM_READ_PORT("DSW2")
AM_RANGE(0x70001e, 0x70001f) AM_WRITE(playmark_snd_command_w)
AM_RANGE(0x780000, 0x7807ff) AM_RAM_WRITE(bigtwin_paletteram_w) AM_BASE(&paletteram16)
AM_RANGE(0xff0000, 0xffffff) AM_RAM
@@ -346,11 +346,11 @@ static ADDRESS_MAP_START( hotmind_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x110000, 0x11000d) AM_WRITE(hrdtimes_scroll_w)
AM_RANGE(0x200000, 0x200fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size)
AM_RANGE(0x280000, 0x2807ff) AM_RAM_WRITE(bigtwin_paletteram_w) AM_BASE(&paletteram16)
- AM_RANGE(0x300010, 0x300011) AM_READ(input_port_0_word_r)
- AM_RANGE(0x300012, 0x300013) AM_READ(input_port_1_word_r)
+ AM_RANGE(0x300010, 0x300011) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0x300012, 0x300013) AM_READ_PORT("P1")
AM_RANGE(0x300014, 0x300015) AM_WRITE(hotmind_coin_eeprom_w) AM_READ(hotmind_port2_r)
- AM_RANGE(0x30001a, 0x30001b) AM_READ(input_port_3_word_r)
- AM_RANGE(0x30001c, 0x30001d) AM_READ(input_port_4_word_r)
+ AM_RANGE(0x30001a, 0x30001b) AM_READ_PORT("DSW1")
+ AM_RANGE(0x30001c, 0x30001d) AM_READ_PORT("DSW2")
AM_RANGE(0x30001e, 0x30001f) AM_WRITE(playmark_snd_command_w)
AM_RANGE(0x304000, 0x304001) AM_WRITENOP /* watchdog? irq ack? */
AM_RANGE(0xff0000, 0xffffff) AM_RAM
@@ -367,12 +367,12 @@ static ADDRESS_MAP_START( hrdtimes_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x200000, 0x200fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size)
AM_RANGE(0x280000, 0x2807ff) AM_RAM_WRITE(bigtwin_paletteram_w) AM_BASE(&paletteram16)
AM_RANGE(0x280800, 0x280fff) AM_RAM // unused
- AM_RANGE(0x300010, 0x300011) AM_READ(input_port_0_word_r)
- AM_RANGE(0x300012, 0x300013) AM_READ(input_port_1_word_r)
- AM_RANGE(0x300014, 0x300015) AM_READ(input_port_2_word_r)
+ AM_RANGE(0x300010, 0x300011) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0x300012, 0x300013) AM_READ_PORT("P1")
+ AM_RANGE(0x300014, 0x300015) AM_READ_PORT("P2")
AM_RANGE(0x300016, 0x300017) AM_WRITE(hrdtimes_coin_w)
- AM_RANGE(0x30001a, 0x30001b) AM_READ(input_port_3_word_r)
- AM_RANGE(0x30001c, 0x30001d) AM_READ(input_port_4_word_r)
+ AM_RANGE(0x30001a, 0x30001b) AM_READ_PORT("DSW1")
+ AM_RANGE(0x30001c, 0x30001d) AM_READ_PORT("DSW2")
AM_RANGE(0x30001e, 0x30001f) AM_WRITENOP //(playmark_snd_command_w)
AM_RANGE(0x304000, 0x304001) AM_WRITENOP /* watchdog? irq ack? */
ADDRESS_MAP_END
@@ -395,7 +395,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( bigtwin )
- PORT_START_TAG("IN0")
+ PORT_START_TAG("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("IN1")
+ PORT_START_TAG("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("IN2")
+ PORT_START_TAG("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)
@@ -494,7 +494,7 @@ static INPUT_PORTS_START( bigtwin )
INPUT_PORTS_END
static INPUT_PORTS_START( wbeachvl )
- PORT_START_TAG("IN0")
+ PORT_START_TAG("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("IN1")
+ PORT_START_TAG("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("IN2")
+ PORT_START_TAG("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("IN3")
+ PORT_START_TAG("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("IN4")
+ PORT_START_TAG("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("IN0")
+ PORT_START_TAG("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("IN1")
+ PORT_START_TAG("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("IN2")
+ PORT_START_TAG("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)
@@ -640,7 +640,7 @@ static INPUT_PORTS_START( excelsr )
INPUT_PORTS_END
static INPUT_PORTS_START( hotmind )
- PORT_START_TAG("IN0")
+ PORT_START_TAG("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("IN1")
+ PORT_START_TAG("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("IN2")
+ PORT_START_TAG("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 )
@@ -737,7 +737,7 @@ static INPUT_PORTS_START( hotmind )
INPUT_PORTS_END
static INPUT_PORTS_START( hrdtimes )
- PORT_START_TAG("IN0")
+ PORT_START_TAG("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("IN1")
+ PORT_START_TAG("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("IN2")
+ PORT_START_TAG("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)
diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c
index 5ab48728a2c..71de74228ff 100644
--- a/src/mame/drivers/plygonet.c
+++ b/src/mame/drivers/plygonet.c
@@ -107,7 +107,7 @@ static READ32_HANDLER( polygonet_eeprom_r )
}
else
{
- return (input_port_read_indexed(machine, 0)<<24);
+ return (input_port_read(machine, "IN0")<<24);
}
/* FIXME: code will never execute */
@@ -729,8 +729,7 @@ static MACHINE_DRIVER_START( plygonet )
MACHINE_DRIVER_END
static INPUT_PORTS_START( polygonet )
- PORT_START
-
+ PORT_START_TAG("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)
@@ -740,7 +739,7 @@ static INPUT_PORTS_START( polygonet )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4)
- PORT_START
+ PORT_START_TAG("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 )
@@ -750,7 +749,7 @@ static INPUT_PORTS_START( polygonet )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START_TAG("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 )
@@ -762,7 +761,7 @@ static INPUT_PORTS_START( polygonet )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START
+ PORT_START_TAG("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)
@@ -772,7 +771,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
+ PORT_START_TAG("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 34513080d04..9acc00b9614 100644
--- a/src/mame/drivers/pmpoker.c
+++ b/src/mame/drivers/pmpoker.c
@@ -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("DSW0")
+ PORT_START_TAG("SW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -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("DSW0")
+ PORT_START_TAG("SW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -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("DSW0")
+ PORT_START_TAG("SW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -885,10 +885,10 @@ static READ8_HANDLER( mux_port_r )
{
switch( mux_data&0xf0 ) /* bits 4-7 */
{
- case 0x10: return input_port_read_indexed(machine, 0);
- case 0x20: return input_port_read_indexed(machine, 1);
- case 0x40: return input_port_read_indexed(machine, 2);
- case 0x80: return input_port_read_indexed(machine, 3);
+ case 0x10: return input_port_read(machine, "IN0-0");
+ case 0x20: return input_port_read(machine, "IN0-1");
+ case 0x40: return input_port_read(machine, "IN0-2");
+ case 0x80: return input_port_read(machine, "IN0-3");
}
return 0xff;
}
diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c
index afb580716fc..d7daf3a7226 100644
--- a/src/mame/drivers/pntnpuzl.c
+++ b/src/mame/drivers/pntnpuzl.c
@@ -161,7 +161,7 @@ static UINT16 pntnpuzl_eeprom;
static READ16_HANDLER( pntnpuzl_eeprom_r )
{
/* bit 11 is EEPROM data */
- return (pntnpuzl_eeprom & 0xf4ff) | (eeprom_read_bit()<<11) | (input_port_read_indexed(machine, 3) & 0x0300);
+ return (pntnpuzl_eeprom & 0xf4ff) | (eeprom_read_bit()<<11) | (input_port_read(machine, "IN1") & 0x0300);
}
static WRITE16_HANDLER( pntnpuzl_eeprom_w )
@@ -292,7 +292,7 @@ static WRITE16_HANDLER( pntnpuzl_vid_w )
static READ16_HANDLER( pntnpuzl_vblank_r )
{
- return (input_port_read_indexed(machine, 0) & 1) << 11;
+ return (input_port_read(machine, "IN0") & 1) << 11;
}
@@ -350,11 +350,11 @@ static READ16_HANDLER( pntnpuzl_280014_r )
if (serial_out == 0x11)
{
static int touchscr[5];
- if (input_port_read_indexed(machine, 0) & 0x10)
+ if (input_port_read(machine, "IN0") & 0x10)
{
touchscr[0] = 0x1b;
- touchscr[2] = BITSWAP8(input_port_read_indexed(machine, 1),0,1,2,3,4,5,6,7);
- touchscr[4] = BITSWAP8(input_port_read_indexed(machine, 2),0,1,2,3,4,5,6,7);
+ touchscr[2] = BITSWAP8(input_port_read(machine, "TOUCHX"),0,1,2,3,4,5,6,7);
+ touchscr[4] = BITSWAP8(input_port_read(machine, "TOUCHY"),0,1,2,3,4,5,6,7);
}
else
touchscr[0] = 0;
@@ -387,7 +387,7 @@ static ADDRESS_MAP_START( pntnpuzl_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x180000, 0x180001) AM_READ(SMH_NOP) //|
AM_RANGE(0x200000, 0x200001) AM_WRITE(pntnpuzl_200000_w)
AM_RANGE(0x280000, 0x280001) AM_READ(pntnpuzl_eeprom_r)
- AM_RANGE(0x280002, 0x280003) AM_READ(input_port_4_word_r)
+ AM_RANGE(0x280002, 0x280003) AM_READ_PORT("IN2")
AM_RANGE(0x280000, 0x280001) AM_WRITE(pntnpuzl_eeprom_w)
AM_RANGE(0x280008, 0x280009) AM_WRITE(SMH_NOP)
AM_RANGE(0x28000a, 0x28000b) AM_WRITE(SMH_NOP)
@@ -411,16 +411,16 @@ ADDRESS_MAP_END
static INTERRUPT_GEN( pntnpuzl_irq )
{
- if (input_port_read_indexed(machine, 0) & 0x02) /* coin */
+ if (input_port_read(machine, "IN0") & 0x02) /* coin */
cpunum_set_input_line(machine, 0, 1, PULSE_LINE);
- else if (input_port_read_indexed(machine, 0) & 0x04) /* service */
+ else if (input_port_read(machine, "IN0") & 0x04) /* service */
cpunum_set_input_line(machine, 0, 2, PULSE_LINE);
- else if (input_port_read_indexed(machine, 0) & 0x08) /* coin */
+ else if (input_port_read(machine, "IN0") & 0x08) /* coin */
cpunum_set_input_line(machine, 0, 4, PULSE_LINE);
}
static INPUT_PORTS_START( pntnpuzl )
- PORT_START /* fake inputs */
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("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/polepos.c b/src/mame/drivers/polepos.c
index 3ed5f5efe4e..1727b8d5568 100644
--- a/src/mame/drivers/polepos.c
+++ b/src/mame/drivers/polepos.c
@@ -263,7 +263,7 @@ static int auto_start_mask;
static READ8_HANDLER( polepos_adc_r )
{
- return input_port_read_indexed(machine, 3 + adc_input);
+ return input_port_read(machine, adc_input ? "ACCEL" : "BRAKE");
}
static READ8_HANDLER( polepos_ready_r )
@@ -338,14 +338,14 @@ static WRITE16_HANDLER( polepos_z8002_nvi_enable_w )
}
-static READ8_HANDLER( in0_l ) { return input_port_read_indexed(machine, 0) & auto_start_mask; } // fire and start buttons
-static READ8_HANDLER( in0_h ) { return input_port_read_indexed(machine, 0) >> 4; } // coins
-static READ8_HANDLER( dipA_l ) { return input_port_read_indexed(machine, 1); } // dips A
-static READ8_HANDLER( dipA_h ) { return input_port_read_indexed(machine, 1) >> 4; } // dips A
-static READ8_HANDLER( dipB_l ) { return input_port_read_indexed(machine, 2); } // dips B
-static READ8_HANDLER( dipB_h ) { return input_port_read_indexed(machine, 2) >> 4; } // dips B
-static READ8_HANDLER( in1_l ) { return input_port_read_indexed(machine, 5); } // wheel
-static READ8_HANDLER( in1_h ) { return input_port_read_indexed(machine, 5) >> 4; } // wheel
+static READ8_HANDLER( in0_l ) { return input_port_read(machine, "IN0") & auto_start_mask; } // fire and start buttons
+static READ8_HANDLER( in0_h ) { return input_port_read(machine, "IN0") >> 4; } // coins
+static READ8_HANDLER( dipA_l ) { return input_port_read(machine, "DSWA"); } // dips A
+static READ8_HANDLER( dipA_h ) { return input_port_read(machine, "DSWA") >> 4; } // dips A
+static READ8_HANDLER( dipB_l ) { return input_port_read(machine, "DSWB"); } // dips B
+static READ8_HANDLER( dipB_h ) { return input_port_read(machine, "DSWB") >> 4; } // dips B
+static READ8_HANDLER( in1_l ) { return input_port_read(machine, "STEER"); } // wheel
+static READ8_HANDLER( in1_h ) { return input_port_read(machine, "STEER") >> 4; } // wheel
static WRITE8_HANDLER( out_0 )
{
// no start lamps in pole position
@@ -443,9 +443,9 @@ ADDRESS_MAP_END
*********************************************************************/
static INPUT_PORTS_START( polepos )
- PORT_START
+ PORT_START_TAG("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( 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
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -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 /* DSW A */
+ PORT_START_TAG("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 /* DSW B */
+ PORT_START_TAG("DSWB") /* DSW B */
PORT_DIPNAME( 0x07, 0x07, "Extended Rank" )
PORT_DIPSETTING( 0x07, "A" )
PORT_DIPSETTING( 0x03, "B" )
@@ -503,21 +503,21 @@ static INPUT_PORTS_START( polepos )
PORT_DIPSETTING( 0x80, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* IN1 - Brake */
+ PORT_START_TAG("BRAKE") /* IN1 - Brake */
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0,0x90) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
- PORT_START /* IN2 - Accel */
+ PORT_START_TAG("ACCEL") /* IN2 - Accel */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0,0x90) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
- PORT_START /* IN3 - Steering */
- PORT_BIT ( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(4)
+ PORT_START_TAG("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
+ PORT_START_TAG("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( 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
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -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 /* DSW A */
+ PORT_START_TAG("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 /* DSW B */
+ PORT_START_TAG("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 /* IN1 - Brake */
+ PORT_START_TAG("BRAKE") /* IN1 - Brake */
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0,0x90) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
- PORT_START /* IN2 - Accel */
+ PORT_START_TAG("ACCEL") /* IN2 - Accel */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0,0x90) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
- PORT_START /* IN3 - Steering */
- PORT_BIT ( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(4)
+ PORT_START_TAG("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
+ PORT_START_TAG("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 /* DSW A */
+ PORT_START_TAG("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 /* DSW B */
+ PORT_START_TAG("DSWB") /* DSW B */
PORT_DIPNAME( 0x07, 0x07, "Extended Rank" )
PORT_DIPSETTING( 0x07, "A" )
PORT_DIPSETTING( 0x03, "B" )
@@ -647,21 +647,21 @@ static INPUT_PORTS_START( topracra )
PORT_DIPSETTING( 0x80, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* IN1 - Brake */
+ PORT_START_TAG("BRAKE") /* IN1 - Brake */
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0,0x90) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
- PORT_START /* IN2 - Accel */
+ PORT_START_TAG("ACCEL") /* IN2 - Accel */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0,0x90) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
- PORT_START /* IN3 - Steering */
- PORT_BIT ( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(4)
+ PORT_START_TAG("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
+ PORT_START_TAG("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( 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
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -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 /* DSW A */
+ PORT_START_TAG("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 /* DSW B */
+ PORT_START_TAG("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 /* IN1 - Brake */
+ PORT_START_TAG("BRAKE") /* IN1 - Brake */
PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0,0x90) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
- PORT_START /* IN2 - Accel */
+ PORT_START_TAG("ACCEL") /* IN2 - Accel */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0,0x90) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
- PORT_START /* IN3 - Steering */
+ PORT_START_TAG("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 33a73468b79..f04cf270aab 100644
--- a/src/mame/drivers/policetr.c
+++ b/src/mame/drivers/policetr.c
@@ -141,19 +141,19 @@ static INTERRUPT_GEN( irq4_gen )
static READ32_HANDLER( port0_r )
{
- return input_port_read_indexed(machine, 0) << 16;
+ return input_port_read(machine, "IN0") << 16;
}
static READ32_HANDLER( port1_r )
{
- return (input_port_read_indexed(machine, 1) << 16) | (eeprom_read_bit() << 29);
+ return (input_port_read(machine, "IN1") << 16) | (eeprom_read_bit() << 29);
}
static READ32_HANDLER( port2_r )
{
- return input_port_read_indexed(machine, 2) << 16;
+ return input_port_read(machine, "DSW1") << 16;
}
@@ -346,7 +346,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( policetr )
- PORT_START
+ PORT_START_TAG("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
+ PORT_START_TAG("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
+ PORT_START_TAG("DSW1")
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW1:1" )
PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "SW1:2" )
PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "SW1:3" )
diff --git a/src/mame/drivers/polyplay.c b/src/mame/drivers/polyplay.c
index 1918a5554c6..6f95fa6d742 100644
--- a/src/mame/drivers/polyplay.c
+++ b/src/mame/drivers/polyplay.c
@@ -147,7 +147,7 @@ static INTERRUPT_GEN( coin_interrupt )
{
static int last = 0;
- if (input_port_read_indexed(machine, 0) & 0x80)
+ if (input_port_read(machine, "INPUT") & 0x80)
last = 0;
else
{
@@ -176,19 +176,19 @@ static ADDRESS_MAP_START( polyplay_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x80, 0x81) AM_WRITE(polyplay_sound_channel)
AM_RANGE(0x82, 0x82) AM_WRITE(polyplay_start_timer2)
AM_RANGE(0x83, 0x83) AM_READ(polyplay_random_read)
- AM_RANGE(0x84, 0x84) AM_READ(input_port_0_r)
+ AM_RANGE(0x84, 0x84) AM_READ_PORT("INPUT")
ADDRESS_MAP_END
static INPUT_PORTS_START( polyplay )
- PORT_START /* IN0 */
+ PORT_START_TAG("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
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bookkeeping Info") PORT_CODE(KEYCODE_F2)
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bookkeeping Info") PORT_CODE(KEYCODE_F2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
INPUT_PORTS_END
diff --git a/src/mame/drivers/poolshrk.c b/src/mame/drivers/poolshrk.c
index b987f6429dd..57ea4e8dae2 100644
--- a/src/mame/drivers/poolshrk.c
+++ b/src/mame/drivers/poolshrk.c
@@ -71,10 +71,11 @@ static WRITE8_HANDLER( poolshrk_watchdog_w )
static READ8_HANDLER( poolshrk_input_r )
{
- UINT8 val = input_port_read_indexed(machine, offset & 3);
+ static const char *portnames[] = { "IN0", "IN1", "IN2", "IN3" };
+ UINT8 val = input_port_read(machine, portnames[offset & 3]);
- int x = input_port_read_indexed(machine, 4 + (offset & 1));
- int y = input_port_read_indexed(machine, 6 + (offset & 1));
+ int x = input_port_read(machine, (offset & 1) ? "AN1" : "AN0");
+ int y = input_port_read(machine, (offset & 1) ? "AN3" : "AN2");
if (x >= poolshrk_da_latch) val |= 8;
if (y >= poolshrk_da_latch) val |= 4;
@@ -116,16 +117,16 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( poolshrk )
- PORT_START
+ PORT_START_TAG("IN0")
PORT_BIT( 0x0C, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START
+ PORT_START_TAG("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
+ PORT_START_TAG("IN2")
PORT_DIPNAME( 0x03, 0x02, "Racks Per Game" )
PORT_DIPSETTING( 0x03, "2" )
PORT_DIPSETTING( 0x02, "3" )
@@ -135,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
+ PORT_START_TAG("IN3")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ))
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ))
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ))
@@ -146,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
+ PORT_START_TAG("AN0")
PORT_BIT( 15, 8, IPT_AD_STICK_X ) PORT_MINMAX(0,15) PORT_SENSITIVITY(25) PORT_KEYDELTA(1) PORT_PLAYER(1)
- PORT_START
+ PORT_START_TAG("AN1")
PORT_BIT( 15, 8, IPT_AD_STICK_X ) PORT_MINMAX(0,15) PORT_SENSITIVITY(25) PORT_KEYDELTA(1) PORT_PLAYER(2)
- PORT_START
+ PORT_START_TAG("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
+ PORT_START_TAG("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/popeye.c b/src/mame/drivers/popeye.c
index 39a54297e79..11d3fcc2f2d 100644
--- a/src/mame/drivers/popeye.c
+++ b/src/mame/drivers/popeye.c
@@ -148,9 +148,9 @@ 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(0x00, 0x00) AM_READ_PORT("P1")
+ AM_RANGE(0x01, 0x01) AM_READ_PORT("P2")
+ AM_RANGE(0x02, 0x02) AM_READ_PORT("IN0")
AM_RANGE(0x03, 0x03) AM_READ(AY8910_read_port_0_r)
ADDRESS_MAP_END
@@ -163,7 +163,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( skyskipr )
- PORT_START /* IN0 */
+ PORT_START_TAG("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 /* IN1 */
+ PORT_START_TAG("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 /* IN2 */
+ PORT_START_TAG("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 /* DSW0 */
+ PORT_START_TAG("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 /* DSW1 (FAKE - appears as bit 7 of DSW0, see code below) */
+ PORT_START_TAG("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 /* IN0 */
+ PORT_START_TAG("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 /* IN1 */
+ PORT_START_TAG("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 /* IN2 */
+ PORT_START_TAG("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 /* DSW0 */
+ PORT_START_TAG("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 /* DSW1 (FAKE - appears as bit 7 of DSW0, see code below) */
+ PORT_START_TAG("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 /* IN0 */
+ PORT_START_TAG("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 /* IN1 */
+ PORT_START_TAG("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 /* IN2 */
+ PORT_START_TAG("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 /* DSW0 */
+ PORT_START_TAG("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 /* DSW1 (FAKE - appears as bit 7 of DSW0, see code below) */
+ PORT_START_TAG("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" )
@@ -463,8 +463,8 @@ static READ8_HANDLER( popeye_portA_r )
int res;
- res = input_port_read_indexed(machine,3);
- res |= (input_port_read_indexed(machine,4) << (7-dswbit)) & 0x80;
+ res = input_port_read(machine, "DSW0");
+ res |= (input_port_read(machine, "DSW1") << (7-dswbit)) & 0x80;
return res;
}
diff --git a/src/mame/drivers/popper.c b/src/mame/drivers/popper.c
index 8e095af5c48..345ab239406 100644
--- a/src/mame/drivers/popper.c
+++ b/src/mame/drivers/popper.c
@@ -136,14 +136,14 @@ static READ8_HANDLER( popper_input_ports_r )
switch (offset)
{
// player inputs dsw1 dsw2
- case 0: data=input_port_read_indexed(machine, 0) | ((input_port_read_indexed(machine, 4)&0x02)<<5) | ((input_port_read_indexed(machine, 5)&0x01)<<4); break;
- case 1: data=input_port_read_indexed(machine, 1) | ((input_port_read_indexed(machine, 4)&0x01)<<6) | ((input_port_read_indexed(machine, 5)&0x02)<<3); break;
- case 2: data=input_port_read_indexed(machine, 2) | ((input_port_read_indexed(machine, 4)&0x08)<<3) | ((input_port_read_indexed(machine, 5)&0x04)<<2); break;
- case 3: data=input_port_read_indexed(machine, 3) | ((input_port_read_indexed(machine, 4)&0x04)<<4) | ((input_port_read_indexed(machine, 5)&0x08)<<1); break;
- case 4: data= ((input_port_read_indexed(machine, 4)&0x20)<<2) | ((input_port_read_indexed(machine, 5)&0x10)<<1); break;
- case 5: data= ((input_port_read_indexed(machine, 4)&0x10)<<3) | ((input_port_read_indexed(machine, 5)&0x20)<<0); break;
- case 6: data= ((input_port_read_indexed(machine, 4)&0x80)<<0) | ((input_port_read_indexed(machine, 5)&0x40)>>1); break;
- case 7: data= ((input_port_read_indexed(machine, 4)&0x40)<<1) | ((input_port_read_indexed(machine, 5)&0x80)>>2); break;
+ case 0: data=input_port_read(machine, "IN0") | ((input_port_read(machine, "DSW1") & 0x02)<<5) | ((input_port_read(machine, "DSW2") & 0x01)<<4); break;
+ case 1: data=input_port_read(machine, "IN1") | ((input_port_read(machine, "DSW1") & 0x01)<<6) | ((input_port_read(machine, "DSW2") & 0x02)<<3); break;
+ case 2: data=input_port_read(machine, "IN2") | ((input_port_read(machine, "DSW1") & 0x08)<<3) | ((input_port_read(machine, "DSW2") & 0x04)<<2); break;
+ case 3: data=input_port_read(machine, "IN3") | ((input_port_read(machine, "DSW1") & 0x04)<<4) | ((input_port_read(machine, "DSW2") & 0x08)<<1); break;
+ case 4: data= ((input_port_read(machine, "DSW1") & 0x20)<<2) | ((input_port_read(machine, "DSW2") & 0x10)<<1); break;
+ case 5: data= ((input_port_read(machine, "DSW1") & 0x10)<<3) | ((input_port_read(machine, "DSW2") & 0x20)<<0); break;
+ case 6: data= ((input_port_read(machine, "DSW1") & 0x80)<<0) | ((input_port_read(machine, "DSW2") & 0x40)>>1); break;
+ case 7: data= ((input_port_read(machine, "DSW1") & 0x40)<<1) | ((input_port_read(machine, "DSW2") & 0x80)>>2); break;
}
return data;
}
@@ -231,7 +231,7 @@ static INPUT_PORTS_START( popper )
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("IN4") /* FAKE DSW1 */
+ PORT_START_TAG("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("IN5") /* FAKE DSW2 */
+ PORT_START_TAG("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/powerbal.c b/src/mame/drivers/powerbal.c
index f2e54ec784a..79989dc154a 100644
--- a/src/mame/drivers/powerbal.c
+++ b/src/mame/drivers/powerbal.c
@@ -63,7 +63,7 @@ static NVRAM_HANDLER( magicstk )
static READ16_HANDLER( magicstk_port2_r )
{
- return (input_port_read_indexed(machine, 2) & 0xfe) | eeprom_read_bit();
+ return (input_port_read(machine, "IN2") & 0xfe) | eeprom_read_bit();
}
static WRITE16_HANDLER( magicstk_coin_eeprom_w )
@@ -111,11 +111,11 @@ static ADDRESS_MAP_START( magicstk_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x094002, 0x094003) AM_WRITENOP
AM_RANGE(0x094004, 0x094005) AM_WRITE(tile_banking_w)
AM_RANGE(0x098180, 0x09917f) AM_RAM_WRITE(magicstk_bgvideoram_w) AM_BASE(&magicstk_videoram)
- AM_RANGE(0x0c2010, 0x0c2011) AM_READ(input_port_0_word_r)
- AM_RANGE(0x0c2012, 0x0c2013) AM_READ(input_port_1_word_r)
+ AM_RANGE(0x0c2010, 0x0c2011) AM_READ_PORT("IN0")
+ AM_RANGE(0x0c2012, 0x0c2013) AM_READ_PORT("IN1")
AM_RANGE(0x0c2014, 0x0c2015) AM_READWRITE(magicstk_port2_r, magicstk_coin_eeprom_w)
- AM_RANGE(0x0c2016, 0x0c2017) AM_READ(input_port_3_word_r)
- AM_RANGE(0x0c2018, 0x0c2019) AM_READ(input_port_4_word_r)
+ AM_RANGE(0x0c2016, 0x0c2017) AM_READ_PORT("DSW1")
+ AM_RANGE(0x0c2018, 0x0c2019) AM_READ_PORT("DSW2")
AM_RANGE(0x0c201c, 0x0c201d) AM_WRITE(oki_banking)
AM_RANGE(0x0c201e, 0x0c201f) AM_READWRITE(OKIM6295_status_0_lsb_r, OKIM6295_data_0_lsb_w)
AM_RANGE(0x0c4000, 0x0c4001) AM_WRITENOP
@@ -131,11 +131,11 @@ static ADDRESS_MAP_START( powerbal_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x094004, 0x094005) AM_WRITE(tile_banking_w)
AM_RANGE(0x098000, 0x098fff) AM_RAM_WRITE(magicstk_bgvideoram_w) AM_BASE(&magicstk_videoram)
AM_RANGE(0x099000, 0x09bfff) AM_RAM // not used
- AM_RANGE(0x0c2010, 0x0c2011) AM_READ(input_port_0_word_r)
- AM_RANGE(0x0c2012, 0x0c2013) AM_READ(input_port_1_word_r)
- AM_RANGE(0x0c2014, 0x0c2015) AM_READ(input_port_2_word_r)
- AM_RANGE(0x0c2016, 0x0c2017) AM_READ(input_port_3_word_r)
- AM_RANGE(0x0c2018, 0x0c2019) AM_READ(input_port_4_word_r)
+ AM_RANGE(0x0c2010, 0x0c2011) AM_READ_PORT("IN0")
+ AM_RANGE(0x0c2012, 0x0c2013) AM_READ_PORT("IN1")
+ AM_RANGE(0x0c2014, 0x0c2015) AM_READ_PORT("IN2")
+ AM_RANGE(0x0c2016, 0x0c2017) AM_READ_PORT("DSW1")
+ AM_RANGE(0x0c2018, 0x0c2019) AM_READ_PORT("DSW2")
AM_RANGE(0x0c201c, 0x0c201d) AM_WRITE(oki_banking)
AM_RANGE(0x0c201e, 0x0c201f) AM_READWRITE(OKIM6295_status_0_lsb_r, OKIM6295_data_0_lsb_w)
AM_RANGE(0x0c4000, 0x0c4001) AM_WRITENOP
diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c
index 801cfe9876a..f5447bf6f59 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 /* Player 1 controls */
+ 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
@@ -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 /* Player 2 controls */
+ 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)
@@ -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 /* coin */
+ PORT_START_TAG("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 /* Dip switches */
+ PORT_START_TAG("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
+ PORT_START_TAG("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 e4b1847fd56..133d21dcdfe 100644
--- a/src/mame/drivers/progolf.c
+++ b/src/mame/drivers/progolf.c
@@ -53,7 +53,7 @@ static ADDRESS_MAP_START( main_cpu, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x9200, 0x9200) AM_WRITENOP
AM_RANGE(0x9400, 0x9400) AM_WRITENOP
AM_RANGE(0x9600, 0x9600) AM_WRITENOP
- AM_RANGE(0x9600, 0x9600) AM_READ(input_port_0_r) /* VBLANK */
+ AM_RANGE(0x9600, 0x9600) AM_READ_PORT("IN0") /* VBLANK */
AM_RANGE(0x9800, 0x9800) AM_READNOP
AM_RANGE(0x9800, 0x9801) AM_WRITENOP
AM_RANGE(0x9a00, 0x9a00) AM_WRITENOP
@@ -85,7 +85,7 @@ ADDRESS_MAP_END
#endif
static INPUT_PORTS_START( progolf )
- PORT_START
+ PORT_START_TAG("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,7 +95,7 @@ static INPUT_PORTS_START( progolf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK )
- PORT_START
+ PORT_START_TAG("IN1")
/* */
PORT_START_TAG("IN2")
@@ -182,7 +182,7 @@ GFXDECODE_END
#ifdef UNUSED_FUNCTION
static INTERRUPT_GEN( progolf_interrupt )
{
- //if (input_port_read_indexed(machine, 2) & 0xc0)
+ //if (input_port_read(machine, "IN2") & 0xc0)
cpunum_set_input_line(machine, 0, /*0*/INPUT_LINE_NMI, /*HOLD_LINE*/PULSE_LINE);
}
#endif
diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c
index d489c1e88aa..34ebcd2bca1 100644
--- a/src/mame/drivers/psikyo.c
+++ b/src/mame/drivers/psikyo.c
@@ -102,7 +102,7 @@ static MACHINE_RESET( psikyo )
static int psikyo_readcoinport(running_machine *machine, int has_mcu)
{
- int ret = input_port_read_indexed(machine, 1) & ~0x84;
+ int ret = input_port_read(machine, "COIN") & ~0x84;
if (has_mcu)
{
@@ -141,10 +141,10 @@ static READ32_HANDLER( sngkace_input_r )
{
switch(offset)
{
- case 0x0: return (input_port_read_indexed(machine, 0) << 16) | 0xffff;
- case 0x1: return (input_port_read_indexed(machine, 2) << 16) | input_port_read_indexed(machine, 4);
- case 0x2: return (psikyo_readcoinport(machine, 0) << 16) | input_port_read_indexed(machine, 3);
- default: logerror("PC %06X - Read input %02X !\n", activecpu_get_pc(), offset*2);
+ case 0x0: return (input_port_read(machine, "IN0") << 16) | 0xffff;
+ case 0x1: return (input_port_read(machine, "DSW1") << 16) | input_port_read(machine, "DSW3");
+ case 0x2: return (psikyo_readcoinport(machine, 0) << 16) | input_port_read(machine, "DSW2");
+ default: logerror("PC %06X - Read input %02X !\n", activecpu_get_pc(), offset * 2);
return 0;
}
}
@@ -153,8 +153,8 @@ static READ32_HANDLER( gunbird_input_r )
{
switch(offset)
{
- case 0x0: return (input_port_read_indexed(machine, 0) << 16) | psikyo_readcoinport(machine, 0);
- case 0x1: return (input_port_read_indexed(machine, 2) << 16) | input_port_read_indexed(machine, 3);
+ case 0x0: return (input_port_read(machine, "IN0") << 16) | psikyo_readcoinport(machine, 0);
+ case 0x1: return (input_port_read(machine, "DSW1") << 16) | input_port_read(machine, "DSW2");
default: logerror("PC %06X - Read input %02X !\n", activecpu_get_pc(), offset*2);
return 0;
}
@@ -309,8 +309,8 @@ static READ32_HANDLER( s1945_input_r )
{
switch(offset)
{
- case 0x0: return (input_port_read_indexed(machine, 0) << 16) | psikyo_readcoinport(machine, 1);
- case 0x1: return (((input_port_read_indexed(machine, 2) << 16) | input_port_read_indexed(machine, 3)) & 0xffff000f) | s1945_mcu_r(machine, offset-1, mem_mask);
+ case 0x0: return (input_port_read(machine, "IN0") << 16) | psikyo_readcoinport(machine, 1);
+ case 0x1: return (((input_port_read(machine, "DSW1") << 16) | input_port_read(machine, "DSW2")) & 0xffff000f) | s1945_mcu_r(machine, offset-1, mem_mask);
case 0x2: return s1945_mcu_r(machine, offset-1, mem_mask);
default: logerror("PC %06X - Read input %02X !\n", activecpu_get_pc(), offset*2);
return 0;
@@ -542,12 +542,12 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( samuraia )
- PORT_START // IN0 - c00000&1
+ PORT_START_TAG("IN0") // IN0 - c00000&1
PSIKYO_PORT_PLAYER2
PSIKYO_PORT_PLAYER1
- PORT_START // IN1 - c00008&9
+ PORT_START_TAG("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 // IN2 - c00004&5
+ PORT_START_TAG("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 // IN3 - c00002&3
+ PORT_START_TAG("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 // IN4 - c00006&7
+ PORT_START_TAG("DSW3") // IN4 - c00006&7
/***********************************************
@@ -661,12 +661,12 @@ INPUT_PORTS_END
static INPUT_PORTS_START( sngkace )
- PORT_START // IN0 - c00000&1
+ PORT_START_TAG("IN0") // IN0 - c00000&1
PSIKYO_PORT_PLAYER2
PSIKYO_PORT_PLAYER1
- PORT_START // IN1 - c00008&9
+ PORT_START_TAG("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 // IN2 - c00004&5
+ PORT_START_TAG("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 // IN3 - c00002&3
+ PORT_START_TAG("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 // IN4 - c00006&7
+ PORT_START_TAG("DSW3") // IN4 - c00006&7
/***********************************************
@@ -786,12 +786,12 @@ INPUT_PORTS_END
static INPUT_PORTS_START( btlkroad )
- PORT_START // IN0 - c00000&1
+ PORT_START_TAG("IN0") // IN0 - c00000&1
PSIKYO_PORT_PLAYER2
PSIKYO_PORT_PLAYER1
- PORT_START // IN1 - c00002&3
+ PORT_START_TAG("COIN") // IN1 - c00002&3
PSIKYO_PORT_