diff options
Diffstat (limited to 'src/mame/drivers/raiden2.c')
-rw-r--r-- | src/mame/drivers/raiden2.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c index d559e30a9d3..b48599b7436 100644 --- a/src/mame/drivers/raiden2.c +++ b/src/mame/drivers/raiden2.c @@ -770,7 +770,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( raiden2 ) SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */ - PORT_START /* IN0 */ + PORT_START_TAG("P1") /* IN0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -780,7 +780,7 @@ static INPUT_PORTS_START( raiden2 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN1 */ + PORT_START_TAG("P2") /* IN1 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -790,7 +790,7 @@ static INPUT_PORTS_START( raiden2 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* Dip switch A */ + PORT_START_TAG("DSWA") /* Dip switch A */ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A )) PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C )) PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C )) @@ -816,7 +816,7 @@ static INPUT_PORTS_START( raiden2 ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* Dip switch B */ + PORT_START_TAG("DSWB") /* Dip switch B */ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty )) PORT_DIPSETTING( 0x03, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) @@ -839,7 +839,7 @@ static INPUT_PORTS_START( raiden2 ) PORT_DIPSETTING( 0x80, DEF_STR( Off )) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* START BUTTONS */ + PORT_START_TAG("SYSTEM") /* START BUTTONS */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -850,7 +850,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( raidendx ) SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */ - PORT_START /* IN0 */ + PORT_START_TAG("P1") /* IN0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -860,7 +860,7 @@ static INPUT_PORTS_START( raidendx ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN1 */ + PORT_START_TAG("P2") /* IN1 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -870,7 +870,7 @@ static INPUT_PORTS_START( raidendx ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* Dip switch A */ + PORT_START_TAG("DSWA") /* Dip switch A */ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A )) PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C )) PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C )) @@ -896,7 +896,7 @@ static INPUT_PORTS_START( raidendx ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* Dip switch B */ + PORT_START_TAG("DSWB") /* Dip switch B */ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty )) PORT_DIPSETTING( 0x03, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) @@ -920,7 +920,7 @@ static INPUT_PORTS_START( raidendx ) PORT_DIPSETTING( 0x80, DEF_STR( Off )) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* START BUTTONS */ + PORT_START_TAG("SYSTEM") /* START BUTTONS */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -1950,7 +1950,7 @@ static WRITE16_HANDLER( rdx_v33_eeprom_w ) static READ16_HANDLER( rdx_v33_eeprom_r ) { - return input_port_read_indexed(machine, 0) | (eeprom_read_bit()<<4); + return input_port_read(machine, "SYSTEM") | (eeprom_read_bit()<<4); } @@ -1984,7 +1984,7 @@ static WRITE16_HANDLER( mcu_prog_offs_w ) static READ16_HANDLER( r2_playerin_r ) { - return input_port_read_indexed(machine, 1); + return input_port_read(machine, "INPUT"); } static READ16_HANDLER( rdx_v33_oki_r ) { @@ -2081,7 +2081,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( rdx_v33 ) - PORT_START + PORT_START_TAG("SYSTEM") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -2093,7 +2093,7 @@ static INPUT_PORTS_START( rdx_v33 ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_BIT( 0xff80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + PORT_START_TAG("INPUT") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) |