diff options
Diffstat (limited to 'src/mame/drivers/oneshot.c')
-rw-r--r-- | src/mame/drivers/oneshot.c | 38 |
1 files changed, 19 insertions, 19 deletions
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) |