From ed88246e48a43e915096b9827558b270adaa2af4 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Tue, 17 Jun 2008 14:22:32 +0000 Subject: [PATCH] More input_port_read_indexed() -> input_port_read() From: Fabio Priuli [mailto:doge.fabio@gmail.com] Subject: 3 more Hi, "thanks" to a sleepless night (due to jet lag) a few more patches. Let me know if something fails to apply, as usual. Regards, Fabio --- src/mame/drivers/hal21.c | 26 +-- src/mame/drivers/halleys.c | 51 ++--- src/mame/drivers/hanaawas.c | 18 +- src/mame/drivers/hitme.c | 42 ++-- src/mame/drivers/hnayayoi.c | 205 ++++++++---------- src/mame/drivers/homedata.c | 256 ++++++++++------------- src/mame/drivers/homerun.c | 61 +++--- src/mame/drivers/hornet.c | 25 ++- src/mame/drivers/igs_blit.c | 188 +++++++++-------- src/mame/drivers/imolagp.c | 12 +- src/mame/drivers/inufuku.c | 14 +- src/mame/drivers/irobot.c | 65 +++--- src/mame/drivers/itech8.c | 263 ++++++++++++----------- src/mame/drivers/jack.c | 96 ++++----- src/mame/drivers/jackal.c | 6 +- src/mame/drivers/jalmah.c | 403 ++++++++++-------------------------- src/mame/drivers/jchan.c | 8 +- src/mame/drivers/jcross.c | 12 +- src/mame/drivers/jedi.c | 12 +- src/mame/machine/irobot.c | 4 +- src/mame/video/itech8.c | 5 +- 21 files changed, 753 insertions(+), 1019 deletions(-) diff --git a/src/mame/drivers/hal21.c b/src/mame/drivers/hal21.c index f905b538dad..14b5c0e182a 100644 --- a/src/mame/drivers/hal21.c +++ b/src/mame/drivers/hal21.c @@ -450,7 +450,7 @@ static INPUT_PORTS_START( aso ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("DSW0") + PORT_START_TAG("DSW1") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Allow_Continue ) ) PORT_DIPSETTING( 0x01, DEF_STR( No ) ) PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) @@ -475,7 +475,7 @@ static INPUT_PORTS_START( aso ) PORT_DIPSETTING( 0x40, "100k 200k" ) PORT_DIPSETTING( 0x00, DEF_STR( None ) ) - PORT_START_TAG("DSW1") + PORT_START_TAG("DSW2") PORT_DIPNAME( 0x01, 0x01, "Bonus Occurrence" ) PORT_DIPSETTING( 0x01, "1st & every 2nd" ) PORT_DIPSETTING( 0x00, "1st & 2nd only" ) @@ -550,7 +550,7 @@ GFXDECODE_END static READ8_HANDLER( CPUC_ready_r ) { snk_sound_busy_bit = 0; return 0; } -static READ8_HANDLER( hal21_input_port_0_r ) { return input_port_read_indexed(machine, 0) | snk_sound_busy_bit; } +static READ8_HANDLER( hal21_input_port_0_r ) { return input_port_read(machine, "IN0") | snk_sound_busy_bit; } static WRITE8_HANDLER( hal21_soundcommand_w ) { hal21_sound_scheduler(machine, 1, data); } static WRITE8_HANDLER( hal21_soundack_w ) { hal21_sound_scheduler(machine,2, data); } @@ -611,12 +611,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( aso_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_ROM - AM_RANGE(0xc000, 0xc000) AM_READ(hal21_input_port_0_r) /* coin, start */ - AM_RANGE(0xc100, 0xc100) AM_READ(input_port_1_r) /* P1 */ - AM_RANGE(0xc200, 0xc200) AM_READ(input_port_2_r) /* P2 */ + AM_RANGE(0xc000, 0xc000) AM_READ(hal21_input_port_0_r) /* coin, start */ + AM_RANGE(0xc100, 0xc100) AM_READ_PORT("IN1") /* P1 */ + AM_RANGE(0xc200, 0xc200) AM_READ_PORT("IN2") /* P2 */ AM_RANGE(0xc400, 0xc400) AM_WRITE(aso_soundcommand_w) - AM_RANGE(0xc500, 0xc500) AM_READ(input_port_3_r) /* DSW1 */ - AM_RANGE(0xc600, 0xc600) AM_READ(input_port_4_r) /* DSW2 */ + AM_RANGE(0xc500, 0xc500) AM_READ_PORT("DSW1") /* DSW1 */ + AM_RANGE(0xc600, 0xc600) AM_READ_PORT("DSW2") /* DSW2 */ AM_RANGE(0xc700, 0xc700) AM_READWRITE(snk_cpuB_nmi_trigger_r, snk_cpuA_nmi_ack_w) AM_RANGE(0xc800, 0xc800) AM_WRITE(hal21_vreg1_w) AM_RANGE(0xc900, 0xc900) AM_WRITE(hal21_vreg2_w) @@ -646,12 +646,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hal21_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0xc000, 0xc000) AM_READ(hal21_input_port_0_r) /* coin, start */ - AM_RANGE(0xc100, 0xc100) AM_READ(input_port_1_r) /* P1 */ - AM_RANGE(0xc200, 0xc200) AM_READ(input_port_2_r) /* P2 */ + AM_RANGE(0xc000, 0xc000) AM_READ(hal21_input_port_0_r) /* coin, start */ + AM_RANGE(0xc100, 0xc100) AM_READ_PORT("IN1") /* P1 */ + AM_RANGE(0xc200, 0xc200) AM_READ_PORT("IN2") /* P2 */ AM_RANGE(0xc300, 0xc300) AM_WRITE(hal21_soundcommand_w) - AM_RANGE(0xc400, 0xc400) AM_READ(input_port_3_r) /* DSW1 */ - AM_RANGE(0xc500, 0xc500) AM_READ(input_port_4_r) /* DSW2 */ + AM_RANGE(0xc400, 0xc400) AM_READ_PORT("DSW1") /* DSW1 */ + AM_RANGE(0xc500, 0xc500) AM_READ_PORT("DSW2") /* DSW2 */ AM_RANGE(0xc600, 0xc600) AM_WRITE(hal21_vreg0_w) AM_RANGE(0xc700, 0xc700) AM_READWRITE(snk_cpuB_nmi_trigger_r, snk_cpuA_nmi_ack_w) AM_RANGE(0xd300, 0xd300) AM_WRITE(hal21_vreg1_w) diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c index dc0c595c42d..cc9aa69bf11 100644 --- a/src/mame/drivers/halleys.c +++ b/src/mame/drivers/halleys.c @@ -1605,7 +1605,9 @@ static READ8_HANDLER( coin_lockout_r ) static READ8_HANDLER( io_mirror_r ) { - return(input_port_read_indexed(machine, offset + 3)); + static const char *portnames[] = { "IN0", "IN1", "IN2", "IN3" }; + + return input_port_read(machine, portnames[offset]); } @@ -1620,15 +1622,15 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xff66, 0xff66) AM_READ(collision_id_r) // HACK: collision detection bypass(Halley's Comet only) AM_RANGE(0xff71, 0xff71) AM_READ(blitter_status_r) AM_RANGE(0xff80, 0xff83) AM_READ(io_mirror_r) - AM_RANGE(0xff90, 0xff90) AM_READ(input_port_3_r) // coin/start - AM_RANGE(0xff91, 0xff91) AM_READ(input_port_4_r) // player 1 - AM_RANGE(0xff92, 0xff92) AM_READ(input_port_5_r) // player 2 - AM_RANGE(0xff93, 0xff93) AM_READ(input_port_6_r) // unused? + AM_RANGE(0xff90, 0xff90) AM_READ_PORT("IN0") // coin/start + AM_RANGE(0xff91, 0xff91) AM_READ_PORT("IN1") // player 1 + AM_RANGE(0xff92, 0xff92) AM_READ_PORT("IN2") // player 2 + AM_RANGE(0xff93, 0xff93) AM_READ_PORT("IN3") // unused? AM_RANGE(0xff94, 0xff94) AM_READ(coin_lockout_r) - AM_RANGE(0xff95, 0xff95) AM_READ(input_port_0_r) // dipswitch 4 - AM_RANGE(0xff96, 0xff96) AM_READ(input_port_1_r) // dipswitch 3 - AM_RANGE(0xff97, 0xff97) AM_READ(input_port_2_r) // dipswitch 2 - AM_RANGE(0xff00, 0xffbf) AM_READ(SMH_RAM) // I/O read fall-through + AM_RANGE(0xff95, 0xff95) AM_READ_PORT("DSW1") // dipswitch 4 + AM_RANGE(0xff96, 0xff96) AM_READ_PORT("DSW2") // dipswitch 3 + AM_RANGE(0xff97, 0xff97) AM_READ_PORT("DSW3") // dipswitch 2 + AM_RANGE(0xff00, 0xffbf) AM_READ(SMH_RAM) // I/O read fall-through AM_RANGE(0xffc0, 0xffdf) AM_READ(SMH_RAM) // palette read AM_RANGE(0xffe0, 0xffff) AM_READ(vector_r) @@ -1687,7 +1689,7 @@ ADDRESS_MAP_END */ static INPUT_PORTS_START( halleys ) - PORT_START_TAG("DSW1") // 0xff95 + PORT_START_TAG("DSW1") /* 0xff95 */ PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) ) @@ -1711,7 +1713,7 @@ static INPUT_PORTS_START( halleys ) PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) ) - PORT_START_TAG("DSW2") // 0xff96 + PORT_START_TAG("DSW2") /* 0xff96 */ PORT_DIPNAME( 0x03, 0x01, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x02, DEF_STR( Easiest ) ) PORT_DIPSETTING( 0x03, DEF_STR( Easy ) ) @@ -1734,7 +1736,7 @@ static INPUT_PORTS_START( halleys ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START_TAG("DSW3") // 0xff97 + PORT_START_TAG("DSW3") /* 0xff97 */ PORT_DIPNAME( 0x01, 0x01, "Unknown(3-1)" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1760,7 +1762,7 @@ static INPUT_PORTS_START( halleys ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START_TAG("IN0") // 0xff90 + PORT_START_TAG("IN0") /* 0xff90 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 ) @@ -1770,7 +1772,7 @@ static INPUT_PORTS_START( halleys ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 ) - PORT_START_TAG("IN1") // 0xff91 + PORT_START_TAG("IN1") /* 0xff91 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY @@ -1780,7 +1782,7 @@ static INPUT_PORTS_START( halleys ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Hyperspace") PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Fire") - PORT_START_TAG("IN2") // 0xff92 + PORT_START_TAG("IN2") /* 0xff92 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) @@ -1790,9 +1792,9 @@ static INPUT_PORTS_START( halleys ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 Hyperspace") PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 Fire") - PORT_START_TAG("IN3") // 0xff93 + PORT_START_TAG("IN3") /* 0xff93 */ - PORT_START_TAG("FAKE") // just to be safe + PORT_START_TAG("FAKE") /* just to be safe */ PORT_DIPNAME( 0x01, 0x00, "Show Unused Layer" ) PORT_DIPSETTING( 0x00, DEF_STR( No ) ) PORT_DIPSETTING( 0x01, DEF_STR( Yes ) ) @@ -1800,7 +1802,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( benberob ) - PORT_START_TAG("DSW1") // 0xff95 + PORT_START_TAG("DSW1") /* 0xff95 */ PORT_DIPNAME( 0x03, 0x01, DEF_STR( Bonus_Life ) ) PORT_DIPSETTING( 0x02, "Every 100K" ) PORT_DIPSETTING( 0x00, "100K & Every 200K" ) @@ -1824,8 +1826,7 @@ static INPUT_PORTS_START( benberob ) PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) ) - // 0xff96 - PORT_START_TAG("DSW2") + PORT_START_TAG("DSW2") /* 0xff96 */ PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x0f, DEF_STR( 9C_1C ) ) PORT_DIPSETTING( 0x0e, DEF_STR( 8C_1C ) ) @@ -1861,7 +1862,7 @@ static INPUT_PORTS_START( benberob ) PORT_DIPSETTING( 0x60, DEF_STR( 1C_7C ) ) PORT_DIPSETTING( 0x70, DEF_STR( 1C_8C ) ) - PORT_START_TAG("DSW3") // 0xff97 + PORT_START_TAG("DSW3") /* 0xff97 */ PORT_DIPNAME( 0x01, 0x01, "Starting Round" ) PORT_DIPSETTING( 0x01, "1st Round" ) PORT_DIPSETTING( 0x00, "2nd Round" ) @@ -1886,7 +1887,7 @@ static INPUT_PORTS_START( benberob ) PORT_DIPSETTING( 0x80, "9" ) PORT_DIPSETTING( 0x00, "16" ) - PORT_START_TAG("IN0") // 0xff90 + PORT_START_TAG("IN0") /* 0xff90 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 ) @@ -1896,7 +1897,7 @@ static INPUT_PORTS_START( benberob ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 ) - PORT_START_TAG("IN1") // 0xff91 + PORT_START_TAG("IN1") /* 0xff91 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY @@ -1906,7 +1907,7 @@ static INPUT_PORTS_START( benberob ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Jump") PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Extinguisher") - PORT_START_TAG("IN2") // 0xff92 + PORT_START_TAG("IN2") /* 0xff92 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) @@ -1916,7 +1917,7 @@ static INPUT_PORTS_START( benberob ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 Jump") PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 Extinguisher") - PORT_START_TAG("IN3") // 0xff93 + PORT_START_TAG("IN3") /* 0xff93 */ INPUT_PORTS_END diff --git a/src/mame/drivers/hanaawas.c b/src/mame/drivers/hanaawas.c index cdc3d3a30ce..ea85de24efe 100644 --- a/src/mame/drivers/hanaawas.c +++ b/src/mame/drivers/hanaawas.c @@ -47,13 +47,13 @@ static READ8_HANDLER( hanaawas_input_port_0_r ) switch( mux ) { case 1: /* start buttons */ - buttons = input_port_read_indexed(machine, 4); + buttons = input_port_read(machine, "START"); break; case 2: /* player 1 buttons */ - buttons = input_port_read_indexed(machine, 2); + buttons = input_port_read(machine, "P1"); break; case 4: /* player 2 buttons */ - buttons = input_port_read_indexed(machine, 3); + buttons = input_port_read(machine, "P2"); break; } @@ -69,7 +69,7 @@ static READ8_HANDLER( hanaawas_input_port_0_r ) } } - return (input_port_read_indexed(machine, 0) & 0xf0) | ordinal; + return (input_port_read(machine, "IN0") & 0xf0) | ordinal; } static WRITE8_HANDLER( hanaawas_inputs_mux_w ) @@ -109,14 +109,14 @@ ADDRESS_MAP_END static INPUT_PORTS_START( hanaawas ) - PORT_START /* IN0 */ + PORT_START_TAG("IN0") /* IN0 */ PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1) - PORT_START /* DSW0 */ + PORT_START_TAG("DSW") /* DSW0 */ PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x01, DEF_STR( On ) ) @@ -141,7 +141,7 @@ static INPUT_PORTS_START( hanaawas ) PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) ) /* fake port. The button depressed gets converted to an integer in the 1-10 range */ - PORT_START /* IN2 */ + PORT_START_TAG("P1") /* IN2 */ PORT_BIT( 0x001, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x002, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x004, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) @@ -154,7 +154,7 @@ static INPUT_PORTS_START( hanaawas ) PORT_BIT( 0x200, IP_ACTIVE_HIGH, IPT_BUTTON10 ) PORT_PLAYER(1) /* fake port. The button depressed gets converted to an integer in the 1-10 range */ - PORT_START /* IN3 */ + PORT_START_TAG("P2") /* IN3 */ PORT_BIT( 0x001, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x002, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x004, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) @@ -166,7 +166,7 @@ static INPUT_PORTS_START( hanaawas ) PORT_BIT( 0x100, IP_ACTIVE_HIGH, IPT_BUTTON9 ) PORT_PLAYER(2) PORT_BIT( 0x200, IP_ACTIVE_HIGH, IPT_BUTTON10 ) PORT_PLAYER(2) - PORT_START /* IN4 */ + PORT_START_TAG("START") /* IN4 */ PORT_BIT( 0x001, IP_ACTIVE_HIGH, IPT_START1 ) PORT_BIT( 0x002, IP_ACTIVE_HIGH, IPT_START2 ) INPUT_PORTS_END diff --git a/src/mame/drivers/hitme.c b/src/mame/drivers/hitme.c index 9950b93bb3a..60dcaca4a7e 100644 --- a/src/mame/drivers/hitme.c +++ b/src/mame/drivers/hitme.c @@ -68,7 +68,7 @@ static VIDEO_START(barricad) static VIDEO_UPDATE(hitme) { /* the card width resistor comes from an input port, scaled to the range 0-25 kOhms */ - double width_resist = input_port_read_indexed(screen->machine, 7) * 25000 / 100; + double width_resist = input_port_read(screen->machine, "WIDTH") * 25000 / 100; /* this triggers a oneshot for the following length of time */ double width_duration = 0.45 * 1000e-12 * width_resist; /* the dot clock runs at the standard horizontal frequency * 320+16 clocks per scanline */ @@ -128,7 +128,9 @@ static VIDEO_UPDATE(barricad) static UINT8 read_port_and_t0(running_machine *machine, int port) { - UINT8 val = input_port_read_indexed(machine, port); + static const char *portnames[] = { "IN0", "IN1", "IN2", "IN3" }; + + UINT8 val = input_port_read(machine, portnames[port]); if (attotime_compare(timer_get_time(), timeout_time) > 0) val ^= 0x80; return val; @@ -183,7 +185,7 @@ static WRITE8_HANDLER( output_port_0_w ) In fact, it is very important that our timing calculation timeout AFTER the sound system's equivalent computation, or else we will hang notes. */ - UINT8 raw_game_speed = input_port_read_indexed(machine, 6); + UINT8 raw_game_speed = input_port_read(machine, "R3"); double resistance = raw_game_speed * 25000 / 100; attotime duration = attotime_make(0, ATTOSECONDS_PER_SECOND * 0.45 * 6.8e-6 * resistance * (data+1)); timeout_time = attotime_add(timer_get_time(), duration); @@ -223,8 +225,8 @@ static ADDRESS_MAP_START( hitme_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1500, 0x15ff) AM_READ(hitme_port_1_r) AM_RANGE(0x1600, 0x16ff) AM_READ(hitme_port_2_r) AM_RANGE(0x1700, 0x17ff) AM_READ(hitme_port_3_r) - AM_RANGE(0x1800, 0x18ff) AM_READ(input_port_4_r) - AM_RANGE(0x1900, 0x19ff) AM_READ(input_port_5_r) + AM_RANGE(0x1800, 0x18ff) AM_READ_PORT("IN4") + AM_RANGE(0x1900, 0x19ff) AM_READ_PORT("IN5") AM_RANGE(0x1d00, 0x1dff) AM_WRITE(output_port_0_w) AM_RANGE(0x1e00, 0x1fff) AM_WRITE(output_port_1_w) ADDRESS_MAP_END @@ -235,8 +237,8 @@ static ADDRESS_MAP_START( hitme_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x15, 0x15) AM_READ(hitme_port_1_r) AM_RANGE(0x16, 0x16) AM_READ(hitme_port_2_r) AM_RANGE(0x17, 0x17) AM_READ(hitme_port_3_r) - AM_RANGE(0x18, 0x18) AM_READ(input_port_4_r) - AM_RANGE(0x19, 0x19) AM_READ(input_port_5_r) + AM_RANGE(0x18, 0x18) AM_READ_PORT("IN4") + AM_RANGE(0x19, 0x19) AM_READ_PORT("IN5") AM_RANGE(0x1d, 0x1d) AM_WRITE(output_port_0_w) AM_RANGE(0x1e, 0x1f) AM_WRITE(output_port_1_w) ADDRESS_MAP_END @@ -356,7 +358,7 @@ MACHINE_DRIVER_END *************************************/ static INPUT_PORTS_START( hitme ) - PORT_START + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) /* Start button */ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) /* Always high */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) /* Hblank */ @@ -366,7 +368,7 @@ static INPUT_PORTS_START( hitme ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) /* P1 Bet button */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) /* Time out counter (*TO) */ - PORT_START + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) /* Always high */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) /* Aux 2 dipswitch - Unused */ @@ -376,7 +378,7 @@ static INPUT_PORTS_START( hitme ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) /* P2 Bet button */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) /* Time out counter (*TO) */ - PORT_START + PORT_START_TAG("IN2") PORT_DIPNAME( 0x01, 0x00, "Extra Hand On Natural" ) /* Aux 1 dipswitch */ PORT_DIPSETTING( 0x00, DEF_STR ( Off ) ) PORT_DIPSETTING( 0x01, DEF_STR ( On ) ) @@ -388,7 +390,7 @@ static INPUT_PORTS_START( hitme ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3) /* P3 Bet button */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) /* Time out counter (*TO) */ - PORT_START + PORT_START_TAG("IN3") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Time out counter (TOC1) */ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) /* Always high */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) /* Aux 2 dipswitch - Unused*/ @@ -398,7 +400,7 @@ static INPUT_PORTS_START( hitme ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4) /* P4 Bet button */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) /* Time out counter (*TO) */ - PORT_START + PORT_START_TAG("IN4") PORT_DIPNAME( 0x07, 0x07, "Number of Chips" ) PORT_DIPSETTING( 0x00, "5 Chips" ) PORT_DIPSETTING( 0x01, "10 Chips" ) @@ -410,7 +412,7 @@ static INPUT_PORTS_START( hitme ) PORT_DIPSETTING( 0x07, "40 Chips" ) PORT_BIT( 0xf8, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START + PORT_START_TAG("IN5") PORT_DIPNAME( 0x07, 0x00, "Number of Hands" ) PORT_DIPSETTING( 0x00, "5 Hands" ) PORT_DIPSETTING( 0x01, "10 Hands" ) @@ -427,13 +429,13 @@ static INPUT_PORTS_START( hitme ) PORT_ADJUSTER(30, "Game Speed") /* this is actually a variable resistor */ - PORT_START + PORT_START_TAG("WIDTH") PORT_ADJUSTER(50, "Card Width") INPUT_PORTS_END static INPUT_PORTS_START( barricad ) - PORT_START + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) /* Start button */ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) /* Always high */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) /* Hblank */ @@ -443,7 +445,7 @@ static INPUT_PORTS_START( barricad ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) /* Time out counter (*TO) */ - PORT_START + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) /* Always high */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) /* Aux 2 dipswitch - Unused */ @@ -453,7 +455,7 @@ static INPUT_PORTS_START( barricad ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) /* Time out counter (*TO) */ - PORT_START + PORT_START_TAG("IN2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* ??? */ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) /* Always high */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) /* Hblank */ @@ -463,7 +465,7 @@ static INPUT_PORTS_START( barricad ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(4) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) /* Time out counter (*TO) */ - PORT_START + PORT_START_TAG("IN3") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Time out counter (TOC1) */ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Always high */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Aux 2 dipswitch - Unused*/ @@ -478,7 +480,7 @@ static INPUT_PORTS_START( barricad ) same dipswitch as hitme's chips, and speed is hitme's hands. The flyer says 1-7 points per games, but it really can go to 8. */ - PORT_START + PORT_START_TAG("IN4") PORT_DIPNAME( 0x07, 0x07, "Points Per Game" ) PORT_DIPSETTING( 0x00, "1 Point" ) PORT_DIPSETTING( 0x01, "2 Points" ) @@ -492,7 +494,7 @@ static INPUT_PORTS_START( barricad ) /* These are like lives, you lose a point if you crash. The last person with points wins the game. */ - PORT_START + PORT_START_TAG("IN5") PORT_DIPNAME( 0x07, 0x00, "Game Speed" ) PORT_DIPSETTING( 0x00, "Fast Fast" ) PORT_DIPSETTING( 0x01, "7" ) diff --git a/src/mame/drivers/hnayayoi.c b/src/mame/drivers/hnayayoi.c index 4a68a432503..88c51ebaf76 100644 --- a/src/mame/drivers/hnayayoi.c +++ b/src/mame/drivers/hnayayoi.c @@ -54,9 +54,10 @@ static READ8_HANDLER( keyboard_0_r ) { int res = 0x3f; int i; + static const char *keynames[] = { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4" }; for (i = 0;i < 5;i++) - if (~keyb & (1 << i)) res &= input_port_read_indexed(machine, 4+i); + if (~keyb & (1 << i)) res &= input_port_read(machine, keynames[i]); return res; } @@ -118,10 +119,10 @@ static ADDRESS_MAP_START( hnayayoi_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x02, 0x02) AM_READ(YM2203_status_port_0_r) AM_RANGE(0x03, 0x03) AM_READ(YM2203_read_port_0_r) - AM_RANGE(0x04, 0x04) AM_READ(input_port_2_r) + AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW3") AM_RANGE(0x41, 0x41) AM_READ(keyboard_0_r) AM_RANGE(0x42, 0x42) AM_READ(keyboard_1_r) - AM_RANGE(0x43, 0x43) AM_READ(input_port_3_r) + AM_RANGE(0x43, 0x43) AM_READ_PORT("COIN") ADDRESS_MAP_END static ADDRESS_MAP_START( hnayayoi_writeport, ADDRESS_SPACE_IO, 8 ) @@ -147,10 +148,10 @@ static ADDRESS_MAP_START( hnfubuki_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0xfeff) AM_READ(SMH_ROM) AM_RANGE(0xff02, 0xff02) AM_READ(YM2203_status_port_0_r) AM_RANGE(0xff03, 0xff03) AM_READ(YM2203_read_port_0_r) - AM_RANGE(0xff04, 0xff04) AM_READ(input_port_2_r) + AM_RANGE(0xff04, 0xff04) AM_READ_PORT("DSW3") AM_RANGE(0xff41, 0xff41) AM_READ(keyboard_0_r) AM_RANGE(0xff42, 0xff42) AM_READ(keyboard_1_r) - AM_RANGE(0xff43, 0xff43) AM_READ(input_port_3_r) + AM_RANGE(0xff43, 0xff43) AM_READ_PORT("COIN") ADDRESS_MAP_END static ADDRESS_MAP_START( hnfubuki_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -200,7 +201,7 @@ static ADDRESS_MAP_START( untoucha_readport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x51, 0x51) AM_READ(YM2203_read_port_0_r) AM_RANGE(0x16, 0x16) AM_READ(keyboard_0_r) // bit 7 = blitter busy flag AM_RANGE(0x15, 0x15) AM_READ(keyboard_1_r) - AM_RANGE(0x14, 0x14) AM_READ(input_port_3_r) + AM_RANGE(0x14, 0x14) AM_READ_PORT("COIN") ADDRESS_MAP_END static ADDRESS_MAP_START( untoucha_writeport, ADDRESS_SPACE_IO, 8 ) @@ -220,9 +221,53 @@ static ADDRESS_MAP_START( untoucha_writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END +static INPUT_PORTS_START( mj_keyboard ) + PORT_START_TAG("KEY0") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) + 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( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("KEY1") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) + 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( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("KEY2") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) + PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("KEY3") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) + PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("KEY4") + PORT_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( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) +INPUT_PORTS_END + static INPUT_PORTS_START( hnayayoi ) - PORT_START /* DSW1 */ + PORT_START_TAG("DSW1") /* DSW1 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -248,7 +293,7 @@ static INPUT_PORTS_START( hnayayoi ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* DSW2 */ + PORT_START_TAG("DSW2") /* DSW2 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -274,7 +319,7 @@ static INPUT_PORTS_START( hnayayoi ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* DSW3 */ + PORT_START_TAG("DSW3") /* DSW3 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) // blitter busy flag PORT_SERVICE( 0x02, IP_ACTIVE_LOW ) PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) @@ -296,62 +341,21 @@ static INPUT_PORTS_START( hnayayoi ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* COIN */ + PORT_START_TAG("COIN") /* COIN */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) /* Test */ + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) /* Test */ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE2 ) /* Analizer (Statistics) */ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 ) /* "Note" ("Paper Money") = 10 Credits */ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_START /* P1 keyboard */ - 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( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START - 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( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START - 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( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) - PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START - 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( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_INCLUDE( mj_keyboard ) INPUT_PORTS_END - static INPUT_PORTS_START( hnfubuki ) - PORT_START /* DSW1 */ + PORT_START_TAG("DSW1") /* DSW1 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -377,7 +381,7 @@ static INPUT_PORTS_START( hnfubuki ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* DSW2 */ + PORT_START_TAG("DSW2") /* DSW2 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -403,7 +407,7 @@ static INPUT_PORTS_START( hnfubuki ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* DSW3 */ + PORT_START_TAG("DSW3") /* DSW3 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) // blitter busy flag PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) @@ -427,62 +431,22 @@ static INPUT_PORTS_START( hnfubuki ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* COIN */ + PORT_START_TAG("COIN") /* COIN */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) /* Test */ + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) /* Test */ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE2 ) /* Analizer (Statistics) */ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 ) /* "Note" ("Paper Money") = 10 Credits */ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_START /* P1 keyboard */ - 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( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START - 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( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START - 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( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) - PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START - 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( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_INCLUDE( mj_keyboard ) INPUT_PORTS_END static INPUT_PORTS_START( untoucha ) - PORT_START /* DSW1 */ + PORT_START_TAG("DSW1") /* DSW1 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -508,7 +472,7 @@ static INPUT_PORTS_START( untoucha ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* DSW2 */ + PORT_START_TAG("DSW2") /* DSW2 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -534,60 +498,57 @@ static INPUT_PORTS_START( untoucha ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* not used */ - PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START /* COIN */ + PORT_START_TAG("COIN") /* COIN */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) /* Test */ + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) /* Test */ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE2 ) /* Analizer (Statistics) */ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 ) /* "Note" ("Paper Money") = 10 Credits */ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_START /* P1 keyboard */ - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Hold 1") PORT_CODE(KEYCODE_Z) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Hold 3") PORT_CODE(KEYCODE_C) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Hold 5") PORT_CODE(KEYCODE_B) + PORT_START_TAG("KEY0") /* P1 keyboard */ + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Hold 1") PORT_CODE(KEYCODE_Z) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Hold 3") PORT_CODE(KEYCODE_C) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Hold 5") PORT_CODE(KEYCODE_B) 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( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + PORT_START_TAG("KEY1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet") PORT_CODE(KEYCODE_3) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet") PORT_CODE(KEYCODE_3) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Take Score") PORT_CODE(KEYCODE_RCONTROL) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Take Score") PORT_CODE(KEYCODE_RCONTROL) PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Hold 2") PORT_CODE(KEYCODE_X) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Hold 4") PORT_CODE(KEYCODE_V) + PORT_START_TAG("KEY2") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Hold 2") PORT_CODE(KEYCODE_X) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Hold 4") PORT_CODE(KEYCODE_V) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Cancel") PORT_CODE(KEYCODE_N) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Cancel") PORT_CODE(KEYCODE_N) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + PORT_START_TAG("KEY3") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Deal") PORT_CODE(KEYCODE_1) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Deal") PORT_CODE(KEYCODE_1) 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( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("KEY4") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Double Up") PORT_CODE(KEYCODE_RSHIFT) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Double Up") PORT_CODE(KEYCODE_RSHIFT) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Flip Flop") PORT_CODE(KEYCODE_F) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Flip Flop") PORT_CODE(KEYCODE_F) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c index 3b857eb509e..a565c1eefcc 100644 --- a/src/mame/drivers/homedata.c +++ b/src/mame/drivers/homedata.c @@ -255,6 +255,7 @@ static int keyb; static READ8_HANDLER( mrokumei_keyboard_r ) { int res = 0x3f,i; + static const char *keynames[] = { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4" }; /* offset 0 is player 1, offset 1 player 2 (not supported) */ if (offset == 0) @@ -263,7 +264,7 @@ static READ8_HANDLER( mrokumei_keyboard_r ) { if (keyb & (1 << i)) { - res = input_port_read_indexed(machine, 3+i) & 0x3f; + res = input_port_read(machine, keynames[i]) & 0x3f; break; } } @@ -397,7 +398,7 @@ static MACHINE_RESET( reikaids_upd7807 ) static READ8_HANDLER( reikaids_io_r ) { - int res = input_port_read_indexed(machine, 2); // bit 4 = coin, bit 5 = service + int res = input_port_read(machine, "IN2"); // bit 4 = coin, bit 5 = service res |= BIT(upd7807_portc,2) * 0x01; // bit 0 = upd7807 status res |= BIT(upd7807_portc,6) * 0x02; // bit 1 = upd7807 data @@ -467,7 +468,8 @@ static READ8_HANDLER( pteacher_io_r ) static READ8_HANDLER( pteacher_keyboard_r ) { - int dips = input_port_read_indexed(machine, 0); + static const char *keynames[] = { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4", "KEY5" }; + int dips = input_port_read(machine, "DSW"); // logerror("%04x: keyboard_r with port A = %02x\n",activecpu_get_pc(),upd7807_porta); @@ -475,7 +477,7 @@ static READ8_HANDLER( pteacher_keyboard_r ) { /* player 1 + dip switches */ int row = (upd7807_porta & 0x07); - return input_port_read_indexed(machine, 2 + row) | (((dips >> row) & 1) << 5); // 0-5 + return input_port_read(machine, keynames[row]) | (((dips >> row) & 1) << 5); // 0-5 } if (upd7807_porta & 0x08) { @@ -571,9 +573,9 @@ static ADDRESS_MAP_START( mrokumei_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x7000, 0x77ff) AM_READ(SMH_RAM) /* hourouki expects this to act as RAM */ AM_RANGE(0x7800, 0x7800) AM_READ(SMH_RAM) /* only used to store the result of the ROM check */ AM_RANGE(0x7801, 0x7802) AM_READ(mrokumei_keyboard_r) // also vblank and active page - AM_RANGE(0x7803, 0x7803) AM_READ(input_port_2_r) // coin, service - AM_RANGE(0x7804, 0x7804) AM_READ(input_port_0_r) // DSW1 - AM_RANGE(0x7805, 0x7805) AM_READ(input_port_1_r) // DSW2 + AM_RANGE(0x7803, 0x7803) AM_READ_PORT("IN0") // coin, service + AM_RANGE(0x7804, 0x7804) AM_READ_PORT("DSW1") // DSW1 + AM_RANGE(0x7805, 0x7805) AM_READ_PORT("DSW2") // DSW2 AM_RANGE(0x7ffe, 0x7ffe) AM_READ(SMH_NOP) // ??? read every vblank, value discarded AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END @@ -619,8 +621,8 @@ static ADDRESS_MAP_START( reikaids_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_RAM) AM_RANGE(0x6000, 0x6fff) AM_READ(SMH_RAM) /* work ram */ AM_RANGE(0x7800, 0x7800) AM_READ(SMH_RAM) - AM_RANGE(0x7801, 0x7801) AM_READ(input_port_0_r) - AM_RANGE(0x7802, 0x7802) AM_READ(input_port_1_r) + AM_RANGE(0x7801, 0x7801) AM_READ_PORT("IN0") + AM_RANGE(0x7802, 0x7802) AM_READ_PORT("IN1") AM_RANGE(0x7803, 0x7803) AM_READ(reikaids_io_r) // coin, blitter, upd7807 AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) AM_RANGE(0xc000, 0xffff) AM_READ(SMH_ROM) @@ -707,7 +709,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( pteacher_upd7807_readport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(UPD7807_PORTA, UPD7807_PORTA) AM_READ(pteacher_upd7807_porta_r) AM_RANGE(UPD7807_PORTT, UPD7807_PORTT) AM_READ(pteacher_keyboard_r) - AM_RANGE(UPD7807_PORTC, UPD7807_PORTC) AM_READ(input_port_1_r) + AM_RANGE(UPD7807_PORTC, UPD7807_PORTC) AM_READ_PORT("COIN") ADDRESS_MAP_END static ADDRESS_MAP_START( pteacher_upd7807_writeport, ADDRESS_SPACE_IO, 8 ) @@ -721,7 +723,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( mjhokite ) - PORT_START + PORT_START_TAG("DSW1") PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -746,7 +748,7 @@ static INPUT_PORTS_START( mjhokite ) PORT_DIPSETTING( 0x20, "7" ) PORT_DIPSETTING( 0x00, "8 (hardest)" ) - PORT_START + PORT_START_TAG("DSW2") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -772,7 +774,7 @@ static INPUT_PORTS_START( mjhokite ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_DIPNAME( 0x02, 0x02, "Freeze?" ) PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) @@ -784,49 +786,49 @@ static INPUT_PORTS_START( mjhokite ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_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_START_TAG("KEY0") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) + 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_START - 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_START_TAG("KEY1") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) + 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_START - 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_START_TAG("KEY2") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) + 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_START - 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_START_TAG("KEY3") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("KEY4") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) INPUT_PORTS_END static INPUT_PORTS_START( reikaids ) - PORT_START // IN0 - 0x7801 + PORT_START_TAG("IN0") // IN0 - 0x7801 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1) @@ -836,7 +838,7 @@ static INPUT_PORTS_START( reikaids ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) /* jump */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START // IN1 - 0x7802 + PORT_START_TAG("IN1") // IN1 - 0x7802 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2) @@ -846,7 +848,7 @@ static INPUT_PORTS_START( reikaids ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) /* jump */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START // IN2 - 0x7803 + PORT_START_TAG("IN2") // IN2 - 0x7803 PORT_BIT( 0x01, IP_ACTIVE_HIGH,IPT_SPECIAL ) /* coprocessor status */ PORT_BIT( 0x02, IP_ACTIVE_HIGH,IPT_SPECIAL ) /* coprocessor data */ PORT_BIT( 0x04, IP_ACTIVE_HIGH,IPT_SPECIAL ) /* vblank */ @@ -856,7 +858,7 @@ static INPUT_PORTS_START( reikaids ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // DSW1 + PORT_START_TAG("DSW1") // DSW1 PORT_DIPNAME( 0x01, 0x01, DEF_STR( Allow_Continue ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x01, DEF_STR( On ) ) @@ -880,7 +882,7 @@ static INPUT_PORTS_START( reikaids ) 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( Difficulty ) ) PORT_DIPSETTING( 0x03, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x02, DEF_STR( Normal ) ) @@ -907,37 +909,9 @@ static INPUT_PORTS_START( reikaids ) INPUT_PORTS_END static INPUT_PORTS_START( battlcry ) - PORT_START // IN0 - 0x7801 - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(1) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) /* punch */ - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) /* kick */ - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) /* jump */ - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) + PORT_INCLUDE( reikaids ) - PORT_START // IN1 - 0x7802 - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) /* punch */ - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) /* kick */ - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) /* jump */ - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - - PORT_START // IN2 - 0x7803 - PORT_BIT( 0x01, IP_ACTIVE_HIGH,IPT_SPECIAL ) /* coprocessor status */ - PORT_BIT( 0x02, IP_ACTIVE_HIGH,IPT_SPECIAL ) /* coprocessor data */ - PORT_BIT( 0x04, IP_ACTIVE_HIGH,IPT_SPECIAL ) /* vblank */ - PORT_BIT( 0x08, IP_ACTIVE_HIGH,IPT_SPECIAL ) /* visible page */ - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START // DSW1 + PORT_MODIFY("DSW1") PORT_DIPNAME( 0x07, 0x07, DEF_STR( Allow_Continue ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x02, "Up To Stage 1" ) @@ -958,12 +932,7 @@ static INPUT_PORTS_START( battlcry ) PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START // DSW2 - PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) - PORT_DIPSETTING( 0x03, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Normal ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Hard ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) + PORT_MODIFY("DSW2") PORT_DIPNAME( 0x04, 0x04, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x04, DEF_STR( On ) ) @@ -982,70 +951,67 @@ static INPUT_PORTS_START( battlcry ) PORT_DIPSETTING( 0xa0, DEF_STR( 1C_3C ) ) PORT_DIPSETTING( 0x20, DEF_STR( 1C_4C ) ) PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) ) - INPUT_PORTS_END - - -#define MJ_KEYBOARD \ - PORT_START \ - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) \ - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_B ) \ - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_C ) \ - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_D ) \ - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* dip switch (handled separately */ \ - PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) \ - \ - PORT_START \ - 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( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* dip switch (handled separately */ \ - PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) \ - \ - PORT_START \ - 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( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* dip switch (handled separately */ \ - PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) \ - \ - PORT_START \ - 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(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP ) \ - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* dip switch (handled separately */ \ - PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) \ - \ - PORT_START \ - 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( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* dip switch (handled separately */ \ - PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) \ - \ - PORT_START \ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) \ - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) \ - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* dip switch (handled separately */ \ +static INPUT_PORTS_START( mj_keyboard ) + PORT_START_TAG("KEY0") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_B ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_C ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_D ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* dip switch (handled separately) */ PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_START_TAG("KEY1") + PORT_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( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* dip switch (handled separately) */ + PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("KEY2") + PORT_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( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* dip switch (handled separately) */ + PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("KEY3") + PORT_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( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP ) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* dip switch (handled separately) */ + PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("KEY4") + PORT_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( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* dip switch (handled separately) */ + PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("KEY5") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) + 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_HIGH, IPT_SPECIAL ) /* dip switch (handled separately) */ + PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) +INPUT_PORTS_END static INPUT_PORTS_START( pteacher ) - PORT_START /* dip switches (handled by pteacher_keyboard_r) */ + PORT_START_TAG("DSW") /* dip switches (handled by pteacher_keyboard_r) */ PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -1082,16 +1048,16 @@ static INPUT_PORTS_START( pteacher ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + PORT_START_TAG("COIN") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) - MJ_KEYBOARD + PORT_INCLUDE( mj_keyboard ) INPUT_PORTS_END static INPUT_PORTS_START( jogakuen ) - PORT_START /* dip switches (handled by pteacher_keyboard_r) */ + PORT_START_TAG("DSW") /* dip switches (handled by pteacher_keyboard_r) */ PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -1128,16 +1094,16 @@ static INPUT_PORTS_START( jogakuen ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + PORT_START_TAG("COIN") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) - MJ_KEYBOARD + PORT_INCLUDE( mj_keyboard ) INPUT_PORTS_END static INPUT_PORTS_START( mjikaga ) - PORT_START /* dip switches (handled by pteacher_keyboard_r) */ + PORT_START_TAG("DSW") /* dip switches (handled by pteacher_keyboard_r) */ PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -1174,12 +1140,12 @@ static INPUT_PORTS_START( mjikaga ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + PORT_START_TAG("COIN") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) - MJ_KEYBOARD + PORT_INCLUDE( mj_keyboard ) INPUT_PORTS_END diff --git a/src/mame/drivers/homerun.c b/src/mame/drivers/homerun.c index 682c3a97970..7d2a55c9b4c 100644 --- a/src/mame/drivers/homerun.c +++ b/src/mame/drivers/homerun.c @@ -90,9 +90,9 @@ ADDRESS_MAP_END static READ8_HANDLER(homerun_40_r) { if(video_screen_get_vpos(machine->primary_screen)>116) - return input_port_read_indexed(machine, 0)|0x40; + return input_port_read(machine, "IN0") | 0x40; else - return input_port_read_indexed(machine, 0); + return input_port_read(machine, "IN0"); } static ADDRESS_MAP_START( homerun_iomap, ADDRESS_SPACE_IO, 8 ) @@ -101,8 +101,8 @@ static ADDRESS_MAP_START( homerun_iomap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x20, 0x20) AM_WRITE(SMH_NOP) /* ?? */ AM_RANGE(0x30, 0x33) AM_DEVREADWRITE(PPI8255, "ppi8255", ppi8255_r, ppi8255_w) AM_RANGE(0x40, 0x40) AM_READ(homerun_40_r) - AM_RANGE(0x50, 0x50) AM_READ(input_port_2_r) - AM_RANGE(0x60, 0x60) AM_READ(input_port_1_r) + AM_RANGE(0x50, 0x50) AM_READ_PORT("IN2") + AM_RANGE(0x60, 0x60) AM_READ_PORT("IN1") AM_RANGE(0x70, 0x70) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w) AM_RANGE(0x71, 0x71) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w) ADDRESS_MAP_END @@ -122,13 +122,13 @@ static const struct YM2203interface ym2203_interface = static INPUT_PORTS_START( homerun ) - PORT_START + PORT_START_TAG("IN0") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x80, DEF_STR( On ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x80, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) @@ -136,27 +136,26 @@ static INPUT_PORTS_START( homerun ) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START1 ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) - PORT_START + PORT_START_TAG("IN2") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_START + PORT_START_TAG("DSW") PORT_DIPNAME( 0x03, 0x02, DEF_STR( Coin_B ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) ) - PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) ) - PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x03, DEF_STR( Free_Play ) ) + PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) ) + PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x03, DEF_STR( Free_Play ) ) PORT_DIPNAME( 0x80, 0x80, DEF_STR( Coin_A ) ) - PORT_DIPSETTING( 0x80, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 1C_2C ) ) - + PORT_DIPSETTING( 0x80, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x00, DEF_STR( 1C_2C ) ) INPUT_PORTS_END static INPUT_PORTS_START( dynashot ) - PORT_START + PORT_START_TAG("IN0") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0xf7, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) @@ -166,25 +165,23 @@ static INPUT_PORTS_START( dynashot ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) - PORT_START + PORT_START_TAG("IN2") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0xdf, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START + PORT_START_TAG("DSW") PORT_DIPNAME( 0x03, 0x02, DEF_STR( Coin_B ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) ) - PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) ) - PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x03, DEF_STR( Free_Play ) ) + PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) ) + PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x02, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x03, DEF_STR( Free_Play ) ) PORT_DIPNAME( 0x80, 0x80, DEF_STR( Coin_A ) ) - PORT_DIPSETTING( 0x80, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 1C_2C ) ) - + PORT_DIPSETTING( 0x80, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x00, DEF_STR( 1C_2C ) ) PORT_DIPNAME( 0x7c, 0x7c, "Collisions ?" ) //not all bits - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x7c, DEF_STR( On ) ) - + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x7c, DEF_STR( On ) ) INPUT_PORTS_END @@ -256,5 +253,3 @@ ROM_END GAME( 1988, homerun, 0, homerun, homerun, 0, ROT0, "Jaleco", "Moero Pro Yakyuu Homerun",GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND) GAME( 1988, dynashot, 0, homerun, dynashot, 0, ROT0, "Jaleco", "Dynamic Shooting",GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND) - - diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c index 652290fa9e0..e05ecc2fc7d 100644 --- a/src/mame/drivers/hornet.c +++ b/src/mame/drivers/hornet.c @@ -687,13 +687,14 @@ static UINT32 *workram; static READ8_HANDLER( sysreg_r ) { UINT8 r = 0; - + static const char *portnames[] = { "IN0", "IN1", "IN2" }; + switch (offset) { case 0: case 1: case 2: - r = input_port_read_indexed(machine, offset); + r = input_port_read(machine, portnames[offset]); break; case 3: @@ -701,7 +702,7 @@ static READ8_HANDLER( sysreg_r ) break; case 4: - r = input_port_read_indexed(machine, 3); + r = input_port_read(machine, "DSW"); break; } return r; @@ -836,7 +837,7 @@ ADDRESS_MAP_END /*****************************************************************************/ static INPUT_PORTS_START( hornet ) - 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) @@ -846,7 +847,7 @@ static INPUT_PORTS_START( hornet ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) - PORT_START + PORT_START_TAG("IN1") PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) @@ -856,14 +857,14 @@ static INPUT_PORTS_START( hornet ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_START + 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_HIGH, IPT_UNUSED ) - PORT_START + PORT_START_TAG("DSW") PORT_DIPNAME( 0x80, 0x00, "Test Mode" ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x80, DEF_STR( On ) ) @@ -888,11 +889,10 @@ static INPUT_PORTS_START( hornet ) PORT_DIPNAME( 0x01, 0x01, "Monitor Type" ) PORT_DIPSETTING( 0x01, "24KHz" ) PORT_DIPSETTING( 0x00, "15KHz" ) - INPUT_PORTS_END static INPUT_PORTS_START( sscope ) - 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) @@ -901,17 +901,17 @@ static INPUT_PORTS_START( sscope ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) // Gun trigger PORT_BIT( 0x03, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + PORT_START_TAG("IN1") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - 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_HIGH, IPT_UNUSED ) - PORT_START + PORT_START_TAG("DSW") PORT_DIPNAME( 0x80, 0x00, "Test Mode" ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x80, DEF_STR( On ) ) @@ -936,7 +936,6 @@ static INPUT_PORTS_START( sscope ) PORT_DIPNAME( 0x01, 0x01, "Monitor Type" ) PORT_DIPSETTING( 0x01, "24KHz" ) PORT_DIPSETTING( 0x00, "15KHz" ) - INPUT_PORTS_END static const struct RF5C400interface rf5c400_interface = diff --git a/src/mame/drivers/igs_blit.c b/src/mame/drivers/igs_blit.c index 40a0ba411c9..8f1b5ab61fe 100644 --- a/src/mame/drivers/igs_blit.c +++ b/src/mame/drivers/igs_blit.c @@ -323,7 +323,7 @@ static WRITE16_HANDLER( igs_##NUM##_input_w ) \ { \ COMBINE_DATA(&igs_input_sel); \ \ - if ( (igs_input_sel & 0xff00) || ((~igs_input_sel) & ((1 << NUM)-1)) ) \ + if ( (igs_input_sel & 0xff00) || ((~igs_input_sel) & ((1 << NUM)-1)) ) \ logerror("%06x: warning, unknown bits written in igs_input_sel = %02x\n", activecpu_get_pc(), igs_input_sel); \ } \ \ @@ -331,10 +331,11 @@ static READ16_HANDLER( igs_##NUM##_input_r ) \ { \ int i; \ UINT16 ret=0; \ + static const char *dipnames[] = { "DSW1", "DSW2", "DSW3", "DSW4", "DSW5" }; \ \ for (i = 0; i < NUM; i++) \ if ((~igs_input_sel) & (1 << i) ) \ - ret = input_port_read_indexed(machine, i); \ + ret = input_port_read(machine, dipnames[i]); \ \ /* 0x0100 is blitter busy */ \ return (ret & 0xff) | 0x0000; \ @@ -663,11 +664,11 @@ static READ16_HANDLER( chmplst2_magic_r ) switch(igs_magic[0]) { case 0x01: - if (~igs_input_sel2 & 0x01) return input_port_read_indexed(machine, 4); - if (~igs_input_sel2 & 0x02) return input_port_read_indexed(machine, 5); - if (~igs_input_sel2 & 0x04) return input_port_read_indexed(machine, 6); - if (~igs_input_sel2 & 0x08) return input_port_read_indexed(machine, 7); - if (~igs_input_sel2 & 0x10) return input_port_read_indexed(machine, 8); + if (~igs_input_sel2 & 0x01) return input_port_read(machine, "KEY0"); + if (~igs_input_sel2 & 0x02) return input_port_read(machine, "KEY1"); + if (~igs_input_sel2 & 0x04) return input_port_read(machine, "KEY2"); + if (~igs_input_sel2 & 0x08) return input_port_read(machine, "KEY3"); + if (~igs_input_sel2 & 0x10) return input_port_read(machine, "KEY4"); /* fall through */ default: logerror("%06x: warning, reading with igs_magic = %02x\n", activecpu_get_pc(), igs_magic[0]); @@ -736,9 +737,9 @@ static READ16_HANDLER( chindrag_magic_r ) { switch(igs_magic[0]) { - case 0x00: return input_port_read_indexed(machine, 4); - case 0x01: return input_port_read_indexed(machine, 5); - case 0x02: return input_port_read_indexed(machine, 6); + case 0x00: return input_port_read(machine, "IN0"); + case 0x01: return input_port_read(machine, "IN1"); + case 0x02: return input_port_read(machine, "IN2"); case 0x20: return 0x49; case 0x21: return 0x47; @@ -803,7 +804,7 @@ static READ16_HANDLER( grtwall_magic_r ) { switch(igs_magic[0]) { - case 0x00: return input_port_read_indexed(machine, 5); + case 0x00: return input_port_read(machine, "IN0"); case 0x20: return 0x49; case 0x21: return 0x47; @@ -873,11 +874,11 @@ static READ16_HANDLER( lhb_input2_r ) case 0: return igs_input_sel2; case 1: - if (~igs_input_sel2 & 0x01) return input_port_read_indexed(machine, 6); - if (~igs_input_sel2 & 0x02) return input_port_read_indexed(machine, 7); - if (~igs_input_sel2 & 0x04) return input_port_read_indexed(machine, 8); - if (~igs_input_sel2 & 0x08) return input_port_read_indexed(machine, 9); - if (~igs_input_sel2 & 0x10) return input_port_read_indexed(machine, 10); + if (~igs_input_sel2 & 0x01) return input_port_read(machine, "KEY0"); + if (~igs_input_sel2 & 0x02) return input_port_read(machine, "KEY1"); + if (~igs_input_sel2 & 0x04) return input_port_read(machine, "KEY2"); + if (~igs_input_sel2 & 0x08) return input_port_read(machine, "KEY3"); + if (~igs_input_sel2 & 0x10) return input_port_read(machine, "KEY4"); logerror("%06x: warning, reading with igs_input_sel2 = %02x\n", activecpu_get_pc(), igs_input_sel2); break; @@ -918,8 +919,8 @@ static READ16_HANDLER( vbowl_magic_r ) { switch(igs_magic[0]) { - case 0x00: return input_port_read_indexed(machine, 5); - case 0x01: return input_port_read_indexed(machine, 6); + case 0x00: return input_port_read(machine, "IN0"); + case 0x01: return input_port_read(machine, "IN1"); case 0x20: return 0x49; case 0x21: return 0x47; @@ -985,14 +986,14 @@ static READ16_HANDLER( xymg_magic_r ) { switch(igs_magic[0]) { - case 0x00: return input_port_read_indexed(machine, 3); + case 0x00: return input_port_read(machine, "COIN"); case 0x02: - if (~igs_input_sel2 & 0x01) return input_port_read_indexed(machine, 4); - if (~igs_input_sel2 & 0x02) return input_port_read_indexed(machine, 5); - if (~igs_input_sel2 & 0x04) return input_port_read_indexed(machine, 6); - if (~igs_input_sel2 & 0x08) return input_port_read_indexed(machine, 7); - if (~igs_input_sel2 & 0x10) return input_port_read_indexed(machine, 8); + if (~igs_input_sel2 & 0x01) return input_port_read(machine, "KEY0"); + if (~igs_input_sel2 & 0x02) return input_port_read(machine, "KEY1"); + if (~igs_input_sel2 & 0x04) return input_port_read(machine, "KEY2"); + if (~igs_input_sel2 & 0x08) return input_port_read(machine, "KEY3"); + if (~igs_input_sel2 & 0x10) return input_port_read(machine, "KEY4"); /* fall through */ default: logerror("%06x: warning, reading with igs_magic = %02x\n", activecpu_get_pc(), igs_magic[0]); @@ -1194,7 +1195,7 @@ static UINT16 *vbowl_trackball; static VIDEO_EOF( vbowl ) { vbowl_trackball[0] = vbowl_trackball[1]; - vbowl_trackball[1] = (input_port_read_indexed(machine, 8) << 8) | input_port_read_indexed(machine, 7); + vbowl_trackball[1] = (input_port_read(machine, "AN1") << 8) | input_port_read(machine, "AN0"); } static WRITE16_HANDLER( vbowl_pen_hi_w ) @@ -1300,7 +1301,7 @@ ADDRESS_MAP_END ***************************************************************************/ static INPUT_PORTS_START( chindrag ) - PORT_START // IN0 - DSW1 + PORT_START_TAG("DSW1") // IN0 - DSW1 PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) ) @@ -1325,7 +1326,7 @@ static INPUT_PORTS_START( chindrag ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START // IN1 - DSW2 + PORT_START_TAG("DSW2") // IN1 - DSW2 PORT_DIPNAME( 0x01, 0x01, "Background" ) PORT_DIPSETTING( 0x01, "Girl" ) PORT_DIPSETTING( 0x00, "Landscape" ) @@ -1351,12 +1352,12 @@ static INPUT_PORTS_START( chindrag ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START // IN2 - DSW3 + PORT_START_TAG("DSW3") // IN2 - DSW3 PORT_DIPNAME( 0xff, 0xff, DEF_STR( Unused ) ) PORT_DIPSETTING( 0xff, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START // IN3 + PORT_START_TAG("COIN") // IN3 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) // keep pressed while booting @@ -1366,7 +1367,7 @@ static INPUT_PORTS_START( chindrag ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN4 + PORT_START_TAG("IN0") // IN4 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) @@ -1376,7 +1377,7 @@ static INPUT_PORTS_START( chindrag ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) // press in girl test to pause, button 3 advances PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN5 + PORT_START_TAG("IN1") // IN5 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1386,7 +1387,7 @@ static INPUT_PORTS_START( chindrag ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_START // IN6 + PORT_START_TAG("IN2") // IN6 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) @@ -1398,9 +1399,8 @@ static INPUT_PORTS_START( chindrag ) INPUT_PORTS_END - static INPUT_PORTS_START( chmplst2 ) - PORT_START // IN0 - DSW1 + PORT_START_TAG("DSW1") // IN0 - DSW1 PORT_DIPNAME( 0x07, 0x02, "Pay Out (%)" ) PORT_DIPSETTING( 0x07, "50" ) PORT_DIPSETTING( 0x06, "54" ) @@ -1425,7 +1425,7 @@ static INPUT_PORTS_START( chmplst2 ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START // IN1 - DSW2 + PORT_START_TAG("DSW2") // IN1 - DSW2 PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) ) // Only when bit 4 = 1 PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) ) @@ -1450,7 +1450,7 @@ static INPUT_PORTS_START( chmplst2 ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x80, DEF_STR( On ) ) - PORT_START // IN2 - DSW3 + PORT_START_TAG("DSW3") // IN2 - DSW3 PORT_DIPNAME( 0x03, 0x03, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x03, "500" ) PORT_DIPSETTING( 0x02, "1000" ) @@ -1474,7 +1474,7 @@ static INPUT_PORTS_START( chmplst2 ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START // IN3 + PORT_START_TAG("COIN") // IN3 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) // data clear PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) // keep pressed while booting @@ -1484,7 +1484,7 @@ static INPUT_PORTS_START( chmplst2 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN4 + PORT_START_TAG("KEY0") // IN4 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) @@ -1494,7 +1494,7 @@ static INPUT_PORTS_START( chmplst2 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ? set to 0 both PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ? and you can't start a game - PORT_START // IN5 + PORT_START_TAG("KEY1") // IN5 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) @@ -1504,7 +1504,7 @@ static INPUT_PORTS_START( chmplst2 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN6 + PORT_START_TAG("KEY2") // IN6 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) @@ -1514,7 +1514,7 @@ static INPUT_PORTS_START( chmplst2 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN7 + PORT_START_TAG("KEY3") // IN7 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) @@ -1524,7 +1524,7 @@ static INPUT_PORTS_START( chmplst2 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN8 + PORT_START_TAG("KEY4") // IN8 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1536,9 +1536,8 @@ static INPUT_PORTS_START( chmplst2 ) INPUT_PORTS_END - static INPUT_PORTS_START( drgnwrld ) - PORT_START // IN0 - DSW1 + PORT_START_TAG("DSW1") // IN0 - DSW1 PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) ) @@ -1563,7 +1562,7 @@ static INPUT_PORTS_START( drgnwrld ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START // IN1 - DSW2 + PORT_START_TAG("DSW2") // IN1 - DSW2 PORT_DIPNAME( 0x01, 0x01, "Open Girl?" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1589,12 +1588,12 @@ static INPUT_PORTS_START( drgnwrld ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START // IN2 - DSW3 + PORT_START_TAG("DSW3") // IN2 - DSW3 PORT_DIPNAME( 0xff, 0xff, DEF_STR( Unused ) ) PORT_DIPSETTING( 0xff, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START // IN3 + PORT_START_TAG("COIN") // IN3 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) // keep pressed while booting @@ -1604,7 +1603,7 @@ static INPUT_PORTS_START( drgnwrld ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN4 + PORT_START_TAG("IN0") // IN4 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) @@ -1614,7 +1613,7 @@ static INPUT_PORTS_START( drgnwrld ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) // press in girl test to pause, button 3 advances PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN5 + PORT_START_TAG("IN1") // IN5 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1624,7 +1623,7 @@ static INPUT_PORTS_START( drgnwrld ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_START // IN6 + PORT_START_TAG("IN2") // IN6 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) @@ -1636,14 +1635,13 @@ static INPUT_PORTS_START( drgnwrld ) INPUT_PORTS_END - static INPUT_PORTS_START( grtwall ) - PORT_START // IN0 - DSW3 + PORT_START_TAG("DSW1") // IN0 - DSW3 PORT_DIPNAME( 0xff, 0xff, "3" ) PORT_DIPSETTING( 0xff, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START // IN1 - DSW2 + PORT_START_TAG("DSW2") // IN1 - DSW2 PORT_DIPNAME( 0x03, 0x03, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x03, "1000" ) PORT_DIPSETTING( 0x02, "1500" ) @@ -1667,7 +1665,7 @@ static INPUT_PORTS_START( grtwall ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START // IN2 - DSW1 + PORT_START_TAG("DSW3") // IN2 - DSW1 PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) ) @@ -1691,12 +1689,12 @@ static INPUT_PORTS_START( grtwall ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x80, DEF_STR( On ) ) - PORT_START // IN3 - DSW4 + PORT_START_TAG("DSW4") // IN3 - DSW4 PORT_DIPNAME( 0xff, 0xff, "4" ) PORT_DIPSETTING( 0xff, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START // IN4 + PORT_START_TAG("COIN") // IN4 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) // keep pressed while booting @@ -1706,7 +1704,7 @@ static INPUT_PORTS_START( grtwall ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN5 + PORT_START_TAG("IN0") // IN5 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) @@ -1719,7 +1717,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( lhb ) - PORT_START // IN0 - DSW1 + PORT_START_TAG("DSW1") // IN0 - DSW1 PORT_DIPNAME( 0x0f, 0x07, "Pay Out (%)" ) PORT_DIPSETTING( 0x0f, "96" ) PORT_DIPSETTING( 0x0e, "93" ) @@ -1748,7 +1746,7 @@ static INPUT_PORTS_START( lhb ) PORT_DIPSETTING( 0x40, "10" ) PORT_DIPSETTING( 0x00, "20" ) - PORT_START // IN1 - DSW2 + PORT_START_TAG("DSW2") // IN1 - DSW2 PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) ) @@ -1772,7 +1770,7 @@ static INPUT_PORTS_START( lhb ) PORT_DIPSETTING( 0x80, "2" ) // PORT_DIPSETTING( 0x00, "2" ) - PORT_START // IN2 - DSW3 + PORT_START_TAG("DSW3") // IN2 - DSW3 PORT_DIPNAME( 0x03, 0x03, "Max Credit" ) PORT_DIPSETTING( 0x03, "1000" ) PORT_DIPSETTING( 0x02, "2000" ) @@ -1795,7 +1793,7 @@ static INPUT_PORTS_START( lhb ) PORT_DIPSETTING( 0x40, "5" ) PORT_DIPSETTING( 0x00, "8" ) - PORT_START // IN3 - DSW4 + PORT_START_TAG("DSW4") // IN3 - DSW4 PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1820,12 +1818,12 @@ static INPUT_PORTS_START( lhb ) PORT_DIPSETTING( 0x00, DEF_STR( No ) ) PORT_DIPSETTING( 0x80, DEF_STR( Yes ) ) - PORT_START // IN4 - DSW5 + PORT_START_TAG("DSW5") // IN4 - DSW5 PORT_DIPNAME( 0xff, 0xff, "5" ) PORT_DIPSETTING( 0xff, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START // IN5 + PORT_START_TAG("COIN") // IN5 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) // keep pressed while booting @@ -1835,7 +1833,7 @@ static INPUT_PORTS_START( lhb ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN6 + PORT_START_TAG("KEY0") // IN6 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) @@ -1845,7 +1843,7 @@ static INPUT_PORTS_START( lhb ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN7 + PORT_START_TAG("KEY1") // IN7 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) @@ -1855,7 +1853,7 @@ static INPUT_PORTS_START( lhb ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN8 + PORT_START_TAG("KEY2") // IN8 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) @@ -1865,7 +1863,7 @@ static INPUT_PORTS_START( lhb ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN9 + PORT_START_TAG("KEY3") // IN9 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) @@ -1875,7 +1873,7 @@ static INPUT_PORTS_START( lhb ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN10 + PORT_START_TAG("KEY4") // IN10 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1888,7 +1886,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( vbowl ) - PORT_START // IN0 - DSW1 + PORT_START_TAG("DSW1") // IN0 - DSW1 PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) ) @@ -1914,7 +1912,7 @@ static INPUT_PORTS_START( vbowl ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START // IN1 - DSW2 + PORT_START_TAG("DSW2") // IN1 - DSW2 PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x03, DEF_STR( Easy ) ) // 5 PORT_DIPSETTING( 0x02, DEF_STR( Normal ) ) // 7 @@ -1938,7 +1936,7 @@ static INPUT_PORTS_START( vbowl ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START // IN2 - DSW3 + PORT_START_TAG("DSW3") // IN2 - DSW3 PORT_DIPNAME( 0x03, 0x03, "Cabinet ID" ) PORT_DIPSETTING( 0x03, "1" ) PORT_DIPSETTING( 0x02, "2" ) @@ -1961,7 +1959,7 @@ static INPUT_PORTS_START( vbowl ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) - PORT_START // IN3 - DSW4 + PORT_START_TAG("DSW4") // IN3 - DSW4 PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1987,7 +1985,7 @@ static INPUT_PORTS_START( vbowl ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START // IN4 + PORT_START_TAG("COIN") // IN4 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1997,7 +1995,7 @@ static INPUT_PORTS_START( vbowl ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN5 + PORT_START_TAG("IN0") // IN5 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) @@ -2007,7 +2005,7 @@ static INPUT_PORTS_START( vbowl ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) - PORT_START // IN6 + PORT_START_TAG("IN1") // IN6 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) @@ -2017,16 +2015,16 @@ static INPUT_PORTS_START( vbowl ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_START // IN7 + PORT_START_TAG("AN0") // IN7 PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_PLAYER(1) - PORT_START // IN8 + PORT_START_TAG("AN1") // IN8 PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_PLAYER(1) INPUT_PORTS_END static INPUT_PORTS_START( vbowlj ) - PORT_START // IN0 - DSW1 + PORT_START_TAG("DSW1") // IN0 - DSW1 PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) ) @@ -2052,7 +2050,7 @@ static INPUT_PORTS_START( vbowlj ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START // IN1 - DSW2 + PORT_START_TAG("DSW2") // IN1 - DSW2 PORT_DIPNAME( 0x03, 0x02, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x03, DEF_STR( Easy ) ) // 5 PORT_DIPSETTING( 0x02, DEF_STR( Normal ) ) // 7 @@ -2076,7 +2074,7 @@ static INPUT_PORTS_START( vbowlj ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START // IN2 - DSW3 + PORT_START_TAG("DSW3") // IN2 - DSW3 PORT_DIPNAME( 0x03, 0x03, "Cabinet ID" ) PORT_DIPSETTING( 0x03, "1" ) PORT_DIPSETTING( 0x02, "2" ) @@ -2099,7 +2097,7 @@ static INPUT_PORTS_START( vbowlj ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) - PORT_START // IN3 - DSW4 + PORT_START_TAG("DSW4") // IN3 - DSW4 PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2125,7 +2123,7 @@ static INPUT_PORTS_START( vbowlj ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START // IN4 + PORT_START_TAG("COIN") // IN4 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -2135,7 +2133,7 @@ static INPUT_PORTS_START( vbowlj ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN5 + PORT_START_TAG("IN0") // IN5 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) @@ -2145,7 +2143,7 @@ static INPUT_PORTS_START( vbowlj ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) - PORT_START // IN6 + PORT_START_TAG("IN1") // IN6 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) @@ -2155,16 +2153,16 @@ static INPUT_PORTS_START( vbowlj ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_START // IN7 + PORT_START_TAG("AN0") // IN7 PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_PLAYER(1) - PORT_START // IN8 + PORT_START_TAG("AN1") // IN8 PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_PLAYER(1) INPUT_PORTS_END static INPUT_PORTS_START( xymg ) - PORT_START // IN0 - DSW1 + PORT_START_TAG("DSW1") // IN0 - DSW1 PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) ) @@ -2188,7 +2186,7 @@ static INPUT_PORTS_START( xymg ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x80, DEF_STR( On ) ) - PORT_START // IN1 - DSW2 + PORT_START_TAG("DSW2") // IN1 - DSW2 PORT_DIPNAME( 0x03, 0x03, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x03, "1000" ) PORT_DIPSETTING( 0x02, "1500" ) @@ -2212,12 +2210,12 @@ static INPUT_PORTS_START( xymg ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START // IN2 - DSW3 + PORT_START_TAG("DSW3") // IN2 - DSW3 PORT_DIPNAME( 0xff, 0xff, DEF_STR( Unused ) ) PORT_DIPSETTING( 0xff, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START // IN3 + PORT_START_TAG("COIN") // IN3 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1) // keep pressed while booting @@ -2227,7 +2225,7 @@ static INPUT_PORTS_START( xymg ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN4 + PORT_START_TAG("KEY0") // IN4 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) @@ -2237,7 +2235,7 @@ static INPUT_PORTS_START( xymg ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN5 + PORT_START_TAG("KEY1") // IN5 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) @@ -2247,7 +2245,7 @@ static INPUT_PORTS_START( xymg ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN6 + PORT_START_TAG("KEY2") // IN6 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) @@ -2257,7 +2255,7 @@ static INPUT_PORTS_START( xymg ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN7 + PORT_START_TAG("KEY3") // IN7 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) @@ -2267,7 +2265,7 @@ static INPUT_PORTS_START( xymg ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN8 + PORT_START_TAG("KEY4") // IN8 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) diff --git a/src/mame/drivers/imolagp.c b/src/mame/drivers/imolagp.c index 0dec747be38..1c3fd3aadc1 100644 --- a/src/mame/drivers/imolagp.c +++ b/src/mame/drivers/imolagp.c @@ -323,7 +323,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( imolagp_master, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM) AM_RANGE(0x2000, 0x23ff) AM_READ(SMH_RAM) AM_WRITE(SMH_RAM) - AM_RANGE(0x2800, 0x2800) AM_READ(input_port_2_r) /* gas */ + AM_RANGE(0x2800, 0x2800) AM_READ_PORT("2800") /* gas */ AM_RANGE(0x2802, 0x2802) AM_READ(steerlatch_r) AM_WRITE(SMH_NOP) /* AM_RANGE(0x2803, 0x2803) ? */ AM_RANGE(0x3000, 0x3000) AM_WRITE(vreg_control_w) @@ -331,10 +331,10 @@ static ADDRESS_MAP_START( imolagp_master, ADDRESS_SPACE_PROGRAM, 8 ) /* AM_RANGE(0x37f7, 0x37f7) ? */ AM_RANGE(0x3800, 0x3800) AM_WRITE(vreg_data_w) AM_RANGE(0x3810, 0x3810) AM_WRITE(AY8910_write_port_0_w) - AM_RANGE(0x4000, 0x4000) AM_READ( input_port_0_r ) /* DSWA */ + AM_RANGE(0x4000, 0x4000) AM_READ_PORT("DSWA") /* DSWA */ AM_RANGE(0x5000, 0x50ff) AM_WRITE(imola_ledram_w) AM_RANGE(0x47ff, 0x4800) AM_WRITE(transmit_data_w) - AM_RANGE(0x6000, 0x6000) AM_READ( input_port_1_r ) /* DSWB */ + AM_RANGE(0x6000, 0x6000) AM_READ_PORT("DSWB") /* DSWB */ ADDRESS_MAP_END static ADDRESS_MAP_START( readport_slave, ADDRESS_SPACE_IO, 8 ) @@ -371,7 +371,7 @@ static INTERRUPT_GEN( master_interrupt ) else { static int oldsteer; - int newsteer = input_port_read_indexed(machine, 3)&0xf; + int newsteer = input_port_read(machine, "2802") & 0xf; if( newsteer!=oldsteer ) { if( imola_steerlatch==0 ) @@ -486,7 +486,7 @@ static INPUT_PORTS_START( imolagp ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x80, DEF_STR( On ) ) - PORT_START /* 2800 */ /* speed: 08 00 0F 1C 0F 00 1E 3D */ + PORT_START_TAG("2800") /* 2800 */ /* speed: 08 00 0F 1C 0F 00 1E 3D */ // PORT_DIPNAME( 0x03, 0x03, "Pedal" ) // PORT_DIPSETTING( 0x01, "STOPPED" ) // PORT_DIPSETTING( 0x00, "SLOW" ) @@ -502,7 +502,7 @@ static INPUT_PORTS_START( imolagp ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* 2802 */ + PORT_START_TAG("2802") /* 2802 */ PORT_BIT( 0x0f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(1) PORT_PLAYER(1) INPUT_PORTS_END diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c index 5d0b94f77c4..8a48ed8f399 100644 --- a/src/mame/drivers/inufuku.c +++ b/src/mame/drivers/inufuku.c @@ -158,7 +158,7 @@ static READ16_HANDLER( inufuku_eeprom_r ) soundflag = pending_command ? 0x0000 : 0x0080; // bit7 eeprom = (eeprom_read_bit() & 1) << 6; // bit6 - inputport = input_port_read_indexed(machine, 4) & 0xff3f; // bit5-0 + inputport = input_port_read(machine, "IN1") & 0xff3f; // bit5-0 return (soundflag | eeprom | inputport); } @@ -269,7 +269,7 @@ ADDRESS_MAP_END ******************************************************************************/ static INPUT_PORTS_START( inufuku ) - PORT_START // 0 + PORT_START_TAG("P1") // 0 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) @@ -279,7 +279,7 @@ static INPUT_PORTS_START( inufuku ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) - PORT_START // 1 + PORT_START_TAG("P2") // 1 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) @@ -289,7 +289,7 @@ static INPUT_PORTS_START( inufuku ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) - PORT_START // 2 + PORT_START_TAG("IN0") // 2 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 ) @@ -299,7 +299,7 @@ static INPUT_PORTS_START( inufuku ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // 3 + PORT_START_TAG("P4") // 3 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(4) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(4) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(4) @@ -309,7 +309,7 @@ static INPUT_PORTS_START( inufuku ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(4) - PORT_START // 4 + PORT_START_TAG("IN1") // 4 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START3 ) @@ -321,7 +321,7 @@ static INPUT_PORTS_START( inufuku ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) // pending sound command - PORT_START // 5 + PORT_START_TAG("P3") // 5 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(3) diff --git a/src/mame/drivers/irobot.c b/src/mame/drivers/irobot.c index 93401b70018..6e7a3db775f 100644 --- a/src/mame/drivers/irobot.c +++ b/src/mame/drivers/irobot.c @@ -122,10 +122,10 @@ static WRITE8_HANDLER( irobot_clearfirq_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM) AM_RANGE(0x0800, 0x0fff) AM_READ(SMH_BANK2) - AM_RANGE(0x1000, 0x103f) AM_READ(input_port_0_r) - AM_RANGE(0x1040, 0x1040) AM_READ(input_port_1_r) + AM_RANGE(0x1000, 0x103f) AM_READ_PORT("IN0") + AM_RANGE(0x1040, 0x1040) AM_READ_PORT("IN1") AM_RANGE(0x1080, 0x1080) AM_READ(irobot_status_r) - AM_RANGE(0x10c0, 0x10c0) AM_READ(input_port_3_r) + AM_RANGE(0x10c0, 0x10c0) AM_READ_PORT("DSW1") AM_RANGE(0x1200, 0x12ff) AM_READ(SMH_RAM) AM_RANGE(0x1300, 0x13ff) AM_READ(irobot_control_r) AM_RANGE(0x1400, 0x143f) AM_READ(quad_pokey_r) @@ -163,7 +163,7 @@ ADDRESS_MAP_END *************************************/ static INPUT_PORTS_START( irobot ) - 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 ) @@ -173,7 +173,7 @@ static INPUT_PORTS_START( irobot ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_START /* 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 ) @@ -183,7 +183,7 @@ static INPUT_PORTS_START( irobot ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START /* 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 ) @@ -193,7 +193,7 @@ static INPUT_PORTS_START( irobot ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* EXT DONE */ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK ) - PORT_START /* DSW1 */ + PORT_START_TAG("DSW1") /* DSW1 */ PORT_DIPNAME( 0x03, 0x00, "Coins Per Credit" ) PORT_DIPSETTING( 0x00, "1 Coin 1 Credit" ) PORT_DIPSETTING( 0x01, "2 Coins 1 Credit" ) @@ -216,36 +216,35 @@ static INPUT_PORTS_START( irobot ) PORT_DIPSETTING( 0x60, "2 Credits for 4 Coin Units" ) PORT_DIPSETTING( 0xe0, DEF_STR( Free_Play ) ) - PORT_START /* DSW2 */ - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Language ) ) - PORT_DIPSETTING( 0x01, DEF_STR( English ) ) - PORT_DIPSETTING( 0x00, DEF_STR( German ) ) - PORT_DIPNAME( 0x02, 0x02, "Min Game Time" ) - PORT_DIPSETTING( 0x00, "90 Sec" ) - PORT_DIPSETTING( 0x02, "3 Lives" ) - PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) - PORT_DIPSETTING( 0x08, DEF_STR( None ) ) - PORT_DIPSETTING( 0x0c, "20000" ) - PORT_DIPSETTING( 0x00, "30000" ) - PORT_DIPSETTING( 0x04, "50000" ) - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Lives ) ) - PORT_DIPSETTING( 0x20, "2" ) - PORT_DIPSETTING( 0x30, "3" ) - PORT_DIPSETTING( 0x00, "4" ) - PORT_DIPSETTING( 0x10, "5" ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Difficulty ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Medium ) ) - PORT_DIPNAME( 0x80, 0x80, "Demo Mode" ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_START_TAG("DSW2") /* DSW2 */ + PORT_DIPNAME( 0x01, 0x01, DEF_STR( Language ) ) + PORT_DIPSETTING( 0x01, DEF_STR( English ) ) + PORT_DIPSETTING( 0x00, DEF_STR( German ) ) + PORT_DIPNAME( 0x02, 0x02, "Min Game Time" ) + PORT_DIPSETTING( 0x00, "90 Sec" ) + PORT_DIPSETTING( 0x02, "3 Lives" ) + PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) + PORT_DIPSETTING( 0x08, DEF_STR( None ) ) + PORT_DIPSETTING( 0x0c, "20000" ) + PORT_DIPSETTING( 0x00, "30000" ) + PORT_DIPSETTING( 0x04, "50000" ) + PORT_DIPNAME( 0x30, 0x30, DEF_STR( Lives ) ) + PORT_DIPSETTING( 0x20, "2" ) + PORT_DIPSETTING( 0x30, "3" ) + PORT_DIPSETTING( 0x00, "4" ) + PORT_DIPSETTING( 0x10, "5" ) + PORT_DIPNAME( 0x40, 0x40, DEF_STR( Difficulty ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Easy ) ) + PORT_DIPSETTING( 0x40, DEF_STR( Medium ) ) + PORT_DIPNAME( 0x80, 0x80, "Demo Mode" ) + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* IN4 */ + PORT_START_TAG("AN0") /* IN4 */ PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(96,163) PORT_SENSITIVITY(70) PORT_KEYDELTA(50) - PORT_START /* IN5 */ + PORT_START_TAG("AN1") /* IN5 */ PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(96,159) PORT_SENSITIVITY(50) PORT_KEYDELTA(50) PORT_REVERSE - INPUT_PORTS_END diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c index e13bfa44a06..4798d701a56 100644 --- a/src/mame/drivers/itech8.c +++ b/src/mame/drivers/itech8.c @@ -712,7 +712,7 @@ static WRITE8_HANDLER( rimrockn_bank_w ) /* used by most games */ static READ8_HANDLER( special_port0_r ) { - UINT8 result = input_port_read_indexed(machine, 0); + UINT8 result = input_port_read(machine, "40"); result = (result & 0xfe) | (pia_portb_data & 0x01); return result; } @@ -721,7 +721,7 @@ static READ8_HANDLER( special_port0_r ) /* used by Rim Rockin' Basketball */ static READ8_HANDLER( special_port1_r ) { - UINT8 result = input_port_read_indexed(machine, 1); + UINT8 result = input_port_read(machine, "60"); result = (result & 0x7f) | ((pia_portb_data & 0x01) << 7); return result; } @@ -1013,13 +1013,13 @@ ADDRESS_MAP_END * *************************************/ -#define UNUSED_ANALOG \ - PORT_START \ +#define UNUSED_ANALOG(TAG) \ + PORT_START_TAG(TAG) \ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) static INPUT_PORTS_START( wfortune ) - PORT_START /* 40 */ + PORT_START_TAG("40") /* 40 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */ PORT_BIT( 0x06, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Cabinet )) @@ -1028,7 +1028,7 @@ static INPUT_PORTS_START( wfortune ) PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) - PORT_START /* 60 */ + PORT_START_TAG("60") /* 60 */ PORT_BIT( 0x07, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Blue Player") PORT_PLAYER(3) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Yellow Player") PORT_PLAYER(2) @@ -1036,23 +1036,23 @@ static INPUT_PORTS_START( wfortune ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_START /* 80 */ + PORT_START_TAG("80") /* 80 */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - UNUSED_ANALOG /* analog C */ + UNUSED_ANALOG("AN_C") /* analog C */ - PORT_START /* analog D */ + PORT_START_TAG("AN_D") /* analog D */ PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(75) PORT_KEYDELTA(10) PORT_PLAYER(1) - UNUSED_ANALOG /* analog E */ + UNUSED_ANALOG("AN_E") /* analog E */ - PORT_START /* analog F */ + PORT_START_TAG("AN_F") /* analog F */ PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(75) PORT_KEYDELTA(10) PORT_COCKTAIL PORT_PLAYER(2) INPUT_PORTS_END static INPUT_PORTS_START( stratab ) - PORT_START /* 40 */ + PORT_START_TAG("40") /* 40 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */ PORT_BIT( 0x06, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Cabinet )) @@ -1061,7 +1061,7 @@ static INPUT_PORTS_START( stratab ) PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) - PORT_START /* 60 */ + PORT_START_TAG("60") /* 60 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P2 Right Hook") PORT_COCKTAIL PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P2 Left Hook") PORT_COCKTAIL PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Right Hook") PORT_PLAYER(1) @@ -1071,19 +1071,19 @@ static INPUT_PORTS_START( stratab ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_START /* 80 */ + PORT_START_TAG("80") /* 80 */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* analog C */ + PORT_START_TAG("AN_C") /* analog C */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_PLAYER(1) - PORT_START /* analog D */ + PORT_START_TAG("AN_D") /* analog D */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_REVERSE PORT_PLAYER(1) - PORT_START /* analog E */ + PORT_START_TAG("AN_E") /* analog E */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_COCKTAIL PORT_PLAYER(2) - PORT_START /* analog F */ + PORT_START_TAG("AN_F") /* analog F */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_REVERSE PORT_COCKTAIL PORT_PLAYER(2) INPUT_PORTS_END @@ -1096,7 +1096,7 @@ static CUSTOM_INPUT( gtg_mux ) } static INPUT_PORTS_START( gtg ) - PORT_START /* 40 */ + PORT_START_TAG("40") /* 40 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */ PORT_BIT( 0x06, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Cabinet )) @@ -1105,7 +1105,7 @@ static INPUT_PORTS_START( gtg ) PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) - PORT_START /* 60 */ + PORT_START_TAG("60") /* 60 */ /* it is still unknown how the second player inputs are muxed in */ /* currently we map both sets of controls to the same inputs */ PORT_BIT( 0x1f, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(gtg_mux, "P1\0P2") @@ -1113,13 +1113,13 @@ static INPUT_PORTS_START( gtg ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_START /* 80 */ + PORT_START_TAG("80") /* 80 */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - UNUSED_ANALOG /* analog C */ - UNUSED_ANALOG /* analog D */ - UNUSED_ANALOG /* analog E */ - UNUSED_ANALOG /* analog F */ + UNUSED_ANALOG("AN_C") /* analog C */ + UNUSED_ANALOG("AN_D") /* analog D */ + UNUSED_ANALOG("AN_E") /* analog E */ + UNUSED_ANALOG("AN_F") /* analog F */ PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) @@ -1138,12 +1138,12 @@ INPUT_PORTS_END static INPUT_PORTS_START( gtgt ) - PORT_START /* 40 */ + PORT_START_TAG("40") /* 40 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */ PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) - PORT_START /* 60 */ + PORT_START_TAG("60") /* 60 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Face Right") PORT_PLAYER(1) @@ -1153,22 +1153,22 @@ static INPUT_PORTS_START( gtgt ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_START /* 80 */ + PORT_START_TAG("80") /* 80 */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* analog C */ + PORT_START_TAG("AN_C") /* analog C */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_PLAYER(1) - PORT_START /* analog D */ + PORT_START_TAG("AN_D") /* analog D */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_REVERSE PORT_PLAYER(1) - UNUSED_ANALOG /* analog E */ - UNUSED_ANALOG /* analog F */ + UNUSED_ANALOG("AN_E") /* analog E */ + UNUSED_ANALOG("AN_F") /* analog F */ INPUT_PORTS_END static INPUT_PORTS_START( gtg2t ) - PORT_START /* 40 */ + PORT_START_TAG("40") /* 40 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */ PORT_BIT( 0x06, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Cabinet )) @@ -1177,7 +1177,7 @@ static INPUT_PORTS_START( gtg2t ) PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) - PORT_START /* 60 */ + PORT_START_TAG("60") /* 60 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P2 Face Right") PORT_COCKTAIL PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P2 Face Left") PORT_COCKTAIL PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Face Right") PORT_PLAYER(1) @@ -1187,30 +1187,30 @@ static INPUT_PORTS_START( gtg2t ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_START /* 80 */ + PORT_START_TAG("80") /* 80 */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* analog C */ + PORT_START_TAG("AN_C") /* analog C */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_PLAYER(1) - PORT_START /* analog D */ + PORT_START_TAG("AN_D") /* analog D */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_REVERSE PORT_PLAYER(1) - PORT_START /* analog E */ + PORT_START_TAG("AN_E") /* analog E */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_COCKTAIL PORT_PLAYER(2) - PORT_START /* analog F */ + PORT_START_TAG("AN_F") /* analog F */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_REVERSE PORT_COCKTAIL PORT_PLAYER(2) INPUT_PORTS_END static INPUT_PORTS_START( slikshot ) - PORT_START /* 40 */ + PORT_START_TAG("40") /* 40 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */ PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) - PORT_START /* 60 */ + PORT_START_TAG("60") /* 60 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) @@ -1220,13 +1220,13 @@ static INPUT_PORTS_START( slikshot ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Green") PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_START /* 80 */ + PORT_START_TAG("80") /* 80 */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) - UNUSED_ANALOG /* analog C */ - UNUSED_ANALOG /* analog D */ - UNUSED_ANALOG /* analog E */ - UNUSED_ANALOG /* analog F */ + UNUSED_ANALOG("AN_C") /* analog C */ + UNUSED_ANALOG("AN_D") /* analog D */ + UNUSED_ANALOG("AN_E") /* analog E */ + UNUSED_ANALOG("AN_F") /* analog F */ PORT_START_TAG("FAKEX") /* fake */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_RESET PORT_PLAYER(1) @@ -1237,12 +1237,12 @@ INPUT_PORTS_END static INPUT_PORTS_START( dynobop ) - PORT_START /* 40 */ + PORT_START_TAG("40") /* 40 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */ PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) - PORT_START /* 60 */ + PORT_START_TAG("60") /* 60 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* ball gate */ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* ball detect */ @@ -1252,13 +1252,13 @@ static INPUT_PORTS_START( dynobop ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_START /* 80 */ + PORT_START_TAG("80") /* 80 */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) - UNUSED_ANALOG /* analog C */ - UNUSED_ANALOG /* analog D */ - UNUSED_ANALOG /* analog E */ - UNUSED_ANALOG /* analog F */ + UNUSED_ANALOG("AN_C") /* analog C */ + UNUSED_ANALOG("AN_D") /* analog D */ + UNUSED_ANALOG("AN_E") /* analog E */ + UNUSED_ANALOG("AN_F") /* analog F */ PORT_START_TAG("FAKEX") /* fake */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_RESET PORT_PLAYER(1) @@ -1269,12 +1269,12 @@ INPUT_PORTS_END static INPUT_PORTS_START( sstrike ) - PORT_START /* 40 */ + PORT_START_TAG("40") /* 40 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */ PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) - PORT_START /* 60 */ + PORT_START_TAG("60") /* 60 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) @@ -1284,13 +1284,13 @@ static INPUT_PORTS_START( sstrike ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_START /* 80 */ + PORT_START_TAG("80") /* 80 */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) - UNUSED_ANALOG /* analog C */ - UNUSED_ANALOG /* analog D */ - UNUSED_ANALOG /* analog E */ - UNUSED_ANALOG /* analog F */ + UNUSED_ANALOG("AN_C") /* analog C */ + UNUSED_ANALOG("AN_D") /* analog D */ + UNUSED_ANALOG("AN_E") /* analog E */ + UNUSED_ANALOG("AN_F") /* analog F */ PORT_START_TAG("FAKEX") /* fake */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_RESET PORT_PLAYER(1) @@ -1301,7 +1301,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( pokrdice ) - PORT_START /* 40 */ + PORT_START_TAG("40") /* 40 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Lower Right") PORT_CODE(KEYCODE_3_PAD) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -1314,7 +1314,7 @@ static INPUT_PORTS_START( pokrdice ) PORT_BIT( 0x60, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) - PORT_START /* 60 */ + PORT_START_TAG("60") /* 60 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Upper Right") PORT_CODE(KEYCODE_9_PAD) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Middle") PORT_CODE(KEYCODE_5_PAD) @@ -1324,18 +1324,18 @@ static INPUT_PORTS_START( pokrdice ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Play") PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_START /* 80 */ + PORT_START_TAG("80") /* 80 */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - UNUSED_ANALOG /* analog C */ - UNUSED_ANALOG /* analog D */ - UNUSED_ANALOG /* analog E */ - UNUSED_ANALOG /* analog F */ + UNUSED_ANALOG("AN_C") /* analog C */ + UNUSED_ANALOG("AN_D") /* analog D */ + UNUSED_ANALOG("AN_E") /* analog E */ + UNUSED_ANALOG("AN_F") /* analog F */ INPUT_PORTS_END static INPUT_PORTS_START( hstennis ) - PORT_START /* 40 */ + PORT_START_TAG("40") /* 40 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */ PORT_BIT( 0x06, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Cabinet )) @@ -1347,7 +1347,7 @@ static INPUT_PORTS_START( hstennis ) PORT_BIT( 0x60, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) - PORT_START /* 60 */ + PORT_START_TAG("60") /* 60 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Soft") PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) @@ -1357,7 +1357,7 @@ static INPUT_PORTS_START( hstennis ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Hard") PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_START /* 80 */ + PORT_START_TAG("80") /* 80 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P2 Soft") PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) @@ -1367,15 +1367,15 @@ static INPUT_PORTS_START( hstennis ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P2 Hard") PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) - UNUSED_ANALOG /* analog C */ - UNUSED_ANALOG /* analog D */ - UNUSED_ANALOG /* analog E */ - UNUSED_ANALOG /* analog F */ + UNUSED_ANALOG("AN_C") /* analog C */ + UNUSED_ANALOG("AN_D") /* analog D */ + UNUSED_ANALOG("AN_E") /* analog E */ + UNUSED_ANALOG("AN_F") /* analog F */ INPUT_PORTS_END static INPUT_PORTS_START( arlingtn ) - PORT_START /* 40 */ + PORT_START_TAG("40") /* 40 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */ PORT_BIT( 0x06, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown )) /* see code at e23c */ @@ -1384,7 +1384,7 @@ static INPUT_PORTS_START( arlingtn ) PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) - PORT_START /* 60 */ + PORT_START_TAG("60") /* 60 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Place") @@ -1394,7 +1394,7 @@ static INPUT_PORTS_START( arlingtn ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_START /* 80 */ + PORT_START_TAG("80") /* 80 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_BIT( 0x06, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Show") @@ -1403,20 +1403,20 @@ static INPUT_PORTS_START( arlingtn ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) - UNUSED_ANALOG /* analog C */ - UNUSED_ANALOG /* analog D */ - UNUSED_ANALOG /* analog E */ - UNUSED_ANALOG /* analog F */ + UNUSED_ANALOG("AN_C") /* analog C */ + UNUSED_ANALOG("AN_D") /* analog D */ + UNUSED_ANALOG("AN_E") /* analog E */ + UNUSED_ANALOG("AN_F") /* analog F */ INPUT_PORTS_END static INPUT_PORTS_START( peggle ) - PORT_START /* 40 */ + PORT_START_TAG("40") /* 40 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */ PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) - PORT_START /* 60 */ + PORT_START_TAG("60") /* 60 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) @@ -1425,47 +1425,47 @@ static INPUT_PORTS_START( peggle ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_START /* 80 */ + PORT_START_TAG("80") /* 80 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) - UNUSED_ANALOG /* analog C */ - UNUSED_ANALOG /* analog D */ - UNUSED_ANALOG /* analog E */ - UNUSED_ANALOG /* analog F */ + UNUSED_ANALOG("AN_C") /* analog C */ + UNUSED_ANALOG("AN_D") /* analog D */ + UNUSED_ANALOG("AN_E") /* analog E */ + UNUSED_ANALOG("AN_F") /* analog F */ INPUT_PORTS_END static INPUT_PORTS_START( pegglet ) - PORT_START /* 40 */ + PORT_START_TAG("40") /* 40 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */ PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) - PORT_START /* 60 */ + PORT_START_TAG("60") /* 60 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_BIT( 0x3e, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_START /* 80 */ + PORT_START_TAG("80") /* 80 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_BIT( 0x7e, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) - UNUSED_ANALOG /* analog C */ + UNUSED_ANALOG("AN_C") /* analog C */ - PORT_START /* analog D */ + PORT_START_TAG("AN_D") /* analog D */ PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_RESET PORT_PLAYER(1) - UNUSED_ANALOG /* analog E */ - UNUSED_ANALOG /* analog F */ + UNUSED_ANALOG("AN_E") /* analog E */ + UNUSED_ANALOG("AN_F") /* analog F */ INPUT_PORTS_END static INPUT_PORTS_START( neckneck ) - PORT_START /* 40 */ + PORT_START_TAG("40") /* 40 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */ PORT_BIT( 0x06, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_DIPNAME( 0x08, 0x00, DEF_STR( Unknown )) /* see code at e23c */ @@ -1474,7 +1474,7 @@ static INPUT_PORTS_START( neckneck ) PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) - PORT_START /* 60 */ + PORT_START_TAG("60") /* 60 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Horse 3") @@ -1484,7 +1484,7 @@ static INPUT_PORTS_START( neckneck ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_START /* 80 */ + PORT_START_TAG("80") /* 80 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_BIT( 0x06, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Horse 4") @@ -1493,18 +1493,18 @@ static INPUT_PORTS_START( neckneck ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) - UNUSED_ANALOG /* analog C */ - UNUSED_ANALOG /* analog D */ - UNUSED_ANALOG /* analog E */ - UNUSED_ANALOG /* analog F */ + UNUSED_ANALOG("AN_C") /* analog C */ + UNUSED_ANALOG("AN_D") /* analog D */ + UNUSED_ANALOG("AN_E") /* analog E */ + UNUSED_ANALOG("AN_F") /* analog F */ INPUT_PORTS_END static INPUT_PORTS_START( rimrockn ) - PORT_START /* 40 */ + PORT_START_TAG("40") /* 40 */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* 60 */ + PORT_START_TAG("60") /* 60 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) @@ -1514,10 +1514,10 @@ static INPUT_PORTS_START( rimrockn ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* input from sound board */ - PORT_START /* 80 */ + PORT_START_TAG("80") /* 80 */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* special 161 */ + PORT_START_TAG("161") /* special 161 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Pass") PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Shoot") PORT_PLAYER(1) @@ -1527,7 +1527,7 @@ static INPUT_PORTS_START( rimrockn ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START /* special 162 */ + PORT_START_TAG("162") /* special 162 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P2 Pass") PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P2 Shoot") PORT_PLAYER(2) @@ -1537,7 +1537,7 @@ static INPUT_PORTS_START( rimrockn ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START /* special 163 */ + PORT_START_TAG("163") /* special 163 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P3 Shoot") PORT_PLAYER(3) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P3 Pass") PORT_PLAYER(3) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1547,7 +1547,7 @@ static INPUT_PORTS_START( rimrockn ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 ) - PORT_START /* special 164 */ + PORT_START_TAG("164") /* special 164 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P4 Shoot") PORT_PLAYER(4) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P4 Pass") PORT_PLAYER(4) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1557,7 +1557,7 @@ static INPUT_PORTS_START( rimrockn ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(4) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4 ) - PORT_START /* special 165 */ + PORT_START_TAG("165") /* special 165 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE4 ) @@ -1577,7 +1577,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( ninclown ) - PORT_START /* 40 */ + PORT_START_TAG("40") /* 40 */ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_SERVICE_NO_TOGGLE( 0x0200, IP_ACTIVE_LOW ) PORT_BIT( 0x0c00, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1585,7 +1585,7 @@ static INPUT_PORTS_START( ninclown ) PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0xc000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* 60 */ + PORT_START_TAG("60") /* 60 */ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("P1 Throw") PORT_PLAYER(1) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) @@ -1595,7 +1595,7 @@ static INPUT_PORTS_START( ninclown ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Kick") PORT_PLAYER(1) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Punch") PORT_PLAYER(1) - PORT_START /* 80 */ + PORT_START_TAG("80") /* 80 */ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("P2 Throw") PORT_PLAYER(2) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) @@ -1605,15 +1605,15 @@ static INPUT_PORTS_START( ninclown ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P2 Kick") PORT_PLAYER(2) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P2 Punch") PORT_PLAYER(2) - UNUSED_ANALOG /* analog C */ - UNUSED_ANALOG /* analog D */ - UNUSED_ANALOG /* analog E */ - UNUSED_ANALOG /* analog F */ + UNUSED_ANALOG("AN_C") /* analog C */ + UNUSED_ANALOG("AN_D") /* analog D */ + UNUSED_ANALOG("AN_E") /* analog E */ + UNUSED_ANALOG("AN_F") /* analog F */ INPUT_PORTS_END static INPUT_PORTS_START( gtg2 ) - PORT_START /* 40 */ + PORT_START_TAG("40") /* 40 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) @@ -1624,36 +1624,36 @@ static INPUT_PORTS_START( gtg2 ) PORT_DIPSETTING( 0x00, DEF_STR( Cocktail )) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* 60 */ + PORT_START_TAG("60") /* 60 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Face Right") PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Face Left") PORT_PLAYER(1) PORT_BIT( 0x78, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START /* 80 */ + PORT_START_TAG("80") /* 80 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P2 Face Right") PORT_COCKTAIL PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P2 Face Left") PORT_COCKTAIL PORT_PLAYER(2) PORT_BIT( 0x78, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START /* analog C */ + PORT_START_TAG("AN_C") /* analog C */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_PLAYER(1) - PORT_START /* analog D */ + PORT_START_TAG("AN_D") /* analog D */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_REVERSE PORT_PLAYER(1) - PORT_START /* analog E */ + PORT_START_TAG("AN_E") /* analog E */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_COCKTAIL PORT_PLAYER(2) - PORT_START /* analog F */ + PORT_START_TAG("AN_F") /* analog F */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_RESET PORT_REVERSE PORT_COCKTAIL PORT_PLAYER(2) INPUT_PORTS_END static INPUT_PORTS_START( gpgolf ) - PORT_START /* 40 */ + PORT_START_TAG("40") /* 40 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) @@ -1664,8 +1664,7 @@ static INPUT_PORTS_START( gpgolf ) PORT_DIPSETTING( 0x00, DEF_STR( Cocktail )) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* 60 */ - + PORT_START_TAG("60") /* 60 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Swing") PORT_PLAYER(1) @@ -1675,13 +1674,13 @@ static INPUT_PORTS_START( gpgolf ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START /* 80 */ + PORT_START_TAG("80") /* 80 */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - UNUSED_ANALOG /* analog C */ - UNUSED_ANALOG /* analog D */ - UNUSED_ANALOG /* analog E */ - UNUSED_ANALOG /* analog F */ + UNUSED_ANALOG("AN_C") /* analog C */ + UNUSED_ANALOG("AN_D") /* analog D */ + UNUSED_ANALOG("AN_E") /* analog E */ + UNUSED_ANALOG("AN_F") /* analog F */ INPUT_PORTS_END diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c index 0ccbedf21b6..e575f7df1a3 100644 --- a/src/mame/drivers/jack.c +++ b/src/mame/drivers/jack.c @@ -89,9 +89,9 @@ static WRITE8_HANDLER( joinem_misc_w ) static READ8_HANDLER( joinem_input1_r ) { - UINT8 ret = input_port_read_indexed(machine, 1) & ~0x20; + UINT8 ret = input_port_read(machine, "DSW2") & ~0x20; - if((input_port_read_indexed(machine, 4) & 0x80) && !joinem_snd_bit) + if((input_port_read(machine, "IN2") & 0x80) && !joinem_snd_bit) ret |= 0x20; return ret; @@ -142,12 +142,12 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) AM_RANGE(0x4000, 0x5fff) AM_READ(SMH_RAM) AM_RANGE(0xb000, 0xb07f) AM_READ(SMH_RAM) - AM_RANGE(0xb500, 0xb500) AM_READ(input_port_0_r) - AM_RANGE(0xb501, 0xb501) AM_READ(input_port_1_r) - AM_RANGE(0xb502, 0xb502) AM_READ(input_port_2_r) - AM_RANGE(0xb503, 0xb503) AM_READ(input_port_3_r) - AM_RANGE(0xb504, 0xb504) AM_READ(input_port_4_r) - AM_RANGE(0xb505, 0xb505) AM_READ(input_port_5_r) + AM_RANGE(0xb500, 0xb500) AM_READ_PORT("DSW1") + AM_RANGE(0xb501, 0xb501) AM_READ_PORT("DSW2") + AM_RANGE(0xb502, 0xb502) AM_READ_PORT("IN0") + AM_RANGE(0xb503, 0xb503) AM_READ_PORT("IN1") + AM_RANGE(0xb504, 0xb504) AM_READ_PORT("IN2") + AM_RANGE(0xb505, 0xb505) AM_READ_PORT("IN3") AM_RANGE(0xb506, 0xb507) AM_READ(jack_flipscreen_r) AM_RANGE(0xb800, 0xbfff) AM_READ(SMH_RAM) AM_RANGE(0xc000, 0xffff) AM_READ(SMH_ROM) @@ -170,11 +170,11 @@ static ADDRESS_MAP_START( joinem_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0xb000, 0xb0ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xb400, 0xb400) AM_WRITE(jack_sh_command_w) - AM_RANGE(0xb500, 0xb500) AM_READ(input_port_0_r) + AM_RANGE(0xb500, 0xb500) AM_READ_PORT("DSW1") AM_RANGE(0xb501, 0xb501) AM_READ(joinem_input1_r) - AM_RANGE(0xb502, 0xb502) AM_READ(input_port_2_r) - AM_RANGE(0xb503, 0xb503) AM_READ(input_port_3_r) - AM_RANGE(0xb504, 0xb504) AM_READ(input_port_4_r) + AM_RANGE(0xb502, 0xb502) AM_READ_PORT("IN0") + AM_RANGE(0xb503, 0xb503) AM_READ_PORT("IN1") + AM_RANGE(0xb504, 0xb504) AM_READ_PORT("IN2") AM_RANGE(0xb506, 0xb507) AM_READWRITE(jack_flipscreen_r, jack_flipscreen_w) AM_RANGE(0xb700, 0xb700) AM_WRITE(joinem_misc_w) AM_RANGE(0xb800, 0xbbff) AM_RAM_WRITE(jack_videoram_w) AM_BASE(&videoram) @@ -232,14 +232,14 @@ ADDRESS_MAP_END PORT_DIPNAME( 0x80, 0x00, "255 Lives (Cheat)")\ PORT_DIPSETTING( 0x00, DEF_STR( Off ) )\ PORT_DIPSETTING( 0x80, DEF_STR( On ) )\ - PORT_START_TAG("IN2")\ + PORT_START_TAG("IN0")\ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )\ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 )\ PORT_BIT( 0x1c, IP_ACTIVE_HIGH, IPT_UNUSED )\ PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN2 )\ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 )\ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )\ - PORT_START_TAG("IN3")\ + PORT_START_TAG("IN1")\ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY\ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY\ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY\ @@ -248,11 +248,11 @@ ADDRESS_MAP_END PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL\ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL\ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL\ - PORT_START_TAG("IN4")\ + PORT_START_TAG("IN2")\ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )\ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 )\ PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNUSED )\ - PORT_START_TAG("IN5")\ + PORT_START_TAG("IN3")\ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL\ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL\ PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNUSED ) @@ -292,7 +292,7 @@ INPUT_PORTS_END /* Same as 'jack', but another different coinage */ static INPUT_PORTS_START( jack3 ) - PORT_START /* DSW1 */ + PORT_START_TAG("DSW1") PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_B ) ) PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) ) @@ -383,14 +383,14 @@ static INPUT_PORTS_START( zzyzzyxx ) PORT_DIPSETTING( 0x40, DEF_STR( None ) ) // 3 under 0 pts // PORT_DIPSETTING( 0xc0, DEF_STR( None ) ) // 5 under 0 pts - PORT_START_TAG("IN2") + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 ) PORT_BIT( 0x1c, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START_TAG("IN3") + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_2WAY PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_2WAY PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED ) @@ -398,11 +398,11 @@ static INPUT_PORTS_START( zzyzzyxx ) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_2WAY PORT_COCKTAIL PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START_TAG("IN4") + PORT_START_TAG("IN2") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START_TAG("IN5") + PORT_START_TAG("IN3") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END @@ -434,7 +434,7 @@ static INPUT_PORTS_START( freeze ) /* probably unused */ PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_START_TAG("IN2") + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) @@ -444,7 +444,7 @@ static INPUT_PORTS_START( freeze ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_START_TAG("IN3") + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) @@ -454,7 +454,7 @@ static INPUT_PORTS_START( freeze ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_START_TAG("IN4") + PORT_START_TAG("IN2") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) @@ -464,7 +464,7 @@ static INPUT_PORTS_START( freeze ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_START_TAG("IN5") + 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 ) @@ -502,14 +502,14 @@ static INPUT_PORTS_START( sucasino ) PORT_START_TAG("DSW2") PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START_TAG("IN2") + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 ) PORT_BIT( 0x3c, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START_TAG("IN3") + PORT_START_TAG("IN1") PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY @@ -517,11 +517,11 @@ static INPUT_PORTS_START( sucasino ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL - PORT_START_TAG("IN4") + PORT_START_TAG("IN2") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START_TAG("IN5") + PORT_START_TAG("IN3") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END @@ -579,7 +579,7 @@ static INPUT_PORTS_START( tripool ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START_TAG("IN2") + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME ("Select Game 1") @@ -589,7 +589,7 @@ static INPUT_PORTS_START( tripool ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START_TAG("IN3") + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY @@ -599,19 +599,19 @@ static INPUT_PORTS_START( tripool ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL - PORT_START_TAG("IN4") + PORT_START_TAG("IN2") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) // not needed? PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START_TAG("IN5") + PORT_START_TAG("IN3") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL // not needed? PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END static INPUT_PORTS_START( joinem ) - PORT_START + PORT_START_TAG("DSW1") PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x03, DEF_STR( 4C_3C ) ) @@ -635,7 +635,7 @@ static INPUT_PORTS_START( joinem ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x80, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("DSW2") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) ) PORT_DIPSETTING( 0x01, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) ) @@ -659,21 +659,21 @@ static INPUT_PORTS_START( joinem ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x80, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("IN2") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 ) @@ -685,7 +685,7 @@ static INPUT_PORTS_START( joinem ) INPUT_PORTS_END static INPUT_PORTS_START( loverboy ) - PORT_START + PORT_START_TAG("DSW1") PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x0c, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) ) @@ -716,7 +716,7 @@ static INPUT_PORTS_START( loverboy ) PORT_DIPSETTING( 0x80, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) ) - PORT_START + PORT_START_TAG("DSW2") PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x01, DEF_STR( On ) ) @@ -742,7 +742,7 @@ static INPUT_PORTS_START( loverboy ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x80, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY @@ -752,7 +752,7 @@ static INPUT_PORTS_START( loverboy ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL @@ -762,7 +762,7 @@ static INPUT_PORTS_START( loverboy ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("IN2") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 ) @@ -804,7 +804,7 @@ static INPUT_PORTS_START( striv ) PORT_START_TAG("DSW2") PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) //? - PORT_START_TAG("IN2") + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) @@ -814,7 +814,7 @@ static INPUT_PORTS_START( striv ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START_TAG("IN3") + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) @@ -824,11 +824,11 @@ static INPUT_PORTS_START( striv ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START_TAG("IN4") + PORT_START_TAG("IN2") PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(2) PORT_BIT( 0xfd, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START_TAG("IN5") + PORT_START_TAG("IN3") PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) //? INPUT_PORTS_END @@ -920,7 +920,7 @@ static INTERRUPT_GEN( joinem_interrupts ) cpunum_set_input_line(machine, 0, 0, HOLD_LINE); else { - if(!(input_port_read_indexed(machine, 4) & 0x80)) + if(!(input_port_read(machine, "IN2") & 0x80)) cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, PULSE_LINE); } } diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c index 3e0e0e760d5..047d89a3d3b 100644 --- a/src/mame/drivers/jackal.c +++ b/src/mame/drivers/jackal.c @@ -87,7 +87,7 @@ static int irq_enable; static READ8_HANDLER( topgunbl_rotary_r ) { - return (1 << (input_port_read_indexed(machine, 5 + offset) * 8 / 256)) ^ 0xff; + return (1 << (input_port_read(machine, offset ? "DIAL1" : "DIAL0") * 8 / 256)) ^ 0xff; } static WRITE8_HANDLER( jackal_flipscreen_w ) @@ -232,10 +232,10 @@ static INPUT_PORTS_START( topgunbl ) PORT_MODIFY("IN0") PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START // player 1 8-way rotary control - converted in topgunbl_rotary_r() + PORT_START_TAG("DIAL0") // player 1 8-way rotary control - converted in topgunbl_rotary_r() PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X) - PORT_START // player 2 8-way rotary control - converted in topgunbl_rotary_r() + PORT_START_TAG("DIAL1") // player 2 8-way rotary control - converted in topgunbl_rotary_r() PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M) PORT_PLAYER(2) INPUT_PORTS_END diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c index f6cf09e7332..cf2164e2a4e 100644 --- a/src/mame/drivers/jalmah.c +++ b/src/mame/drivers/jalmah.c @@ -194,47 +194,47 @@ static VIDEO_START( jalmah ) tilemap_set_transparent_pen(sc3_tilemap,15); } -#define MCU_READ(_number_,_bit_,_offset_,_retval_)\ -if((0xffff - input_port_read_indexed(machine, _number_)) & _bit_) { jm_regs[_offset_] = _retval_; } +#define MCU_READ(tag, _bit_, _offset_, _retval_) \ +if((0xffff - input_port_read(machine, tag)) & _bit_) { jm_regs[_offset_] = _retval_; } /*RAM-based protection handlings*/ static void daireika_mcu_run(running_machine *machine) { static UINT16 prg_prot; - if((0xffff - input_port_read_indexed(machine,0)) & 0x0008)//service_mode + if((0xffff - input_port_read(machine, "SYSTEM")) & 0x0008) //service_mode { - jm_regs[0x000/2] = input_port_read_indexed(machine,2); - jm_regs[0x002/2] = input_port_read_indexed(machine,3); - jm_regs[0x004/2] = input_port_read_indexed(machine,4); - jm_regs[0x006/2] = input_port_read_indexed(machine,5); - jm_regs[0x008/2] = input_port_read_indexed(machine,6); - jm_regs[0x00a/2] = input_port_read_indexed(machine,7); + jm_regs[0x000/2] = input_port_read(machine, "KEY0"); + jm_regs[0x002/2] = input_port_read(machine, "KEY1"); + jm_regs[0x004/2] = input_port_read(machine, "KEY2"); + jm_regs[0x006/2] = input_port_read(machine, "KEY3"); + jm_regs[0x008/2] = input_port_read(machine, "KEY4"); + jm_regs[0x00a/2] = input_port_read(machine, "KEY5"); } else { jm_regs[0x000/2] = 0x0000; - MCU_READ(3,0x0001,0x000/2,0x00);/*FF*/ - MCU_READ(4,0x0400,0x000/2,0x01);/*A*/ - MCU_READ(4,0x1000,0x000/2,0x02);/*B*/ - MCU_READ(4,0x0200,0x000/2,0x03);/*C*/ - MCU_READ(4,0x0800,0x000/2,0x04);/*D*/ - MCU_READ(4,0x0004,0x000/2,0x05);/*E*/ - MCU_READ(4,0x0010,0x000/2,0x06);/*F*/ - MCU_READ(4,0x0002,0x000/2,0x07);/*G*/ - MCU_READ(4,0x0008,0x000/2,0x08);/*H*/ - MCU_READ(3,0x0400,0x000/2,0x09);/*I*/ - MCU_READ(3,0x1000,0x000/2,0x0a);/*J*/ - MCU_READ(3,0x0200,0x000/2,0x0b);/*K*/ - MCU_READ(3,0x0800,0x000/2,0x0c);/*L*/ - MCU_READ(3,0x0004,0x000/2,0x0d);/*M*/ - MCU_READ(3,0x0010,0x000/2,0x0e);/*N*/ - MCU_READ(2,0x0200,0x000/2,0x0f);/*RON (trusted)*/ - MCU_READ(2,0x1000,0x000/2,0x10);/*REACH (trusted)*/ - MCU_READ(2,0x0400,0x000/2,0x11);/*KAN */ - MCU_READ(3,0x0008,0x000/2,0x12);/*PON */ - MCU_READ(3,0x0002,0x000/2,0x13);/*CHI (trusted)*/ - MCU_READ(2,0x0004,0x000/2,0x14);/*START1*/ + MCU_READ("KEY1", 0x0001, 0x000/2, 0x00); /*FF*/ + MCU_READ("KEY2", 0x0400, 0x000/2, 0x01); /*A*/ + MCU_READ("KEY2", 0x1000, 0x000/2, 0x02); /*B*/ + MCU_READ("KEY2", 0x0200, 0x000/2, 0x03); /*C*/ + MCU_READ("KEY2", 0x0800, 0x000/2, 0x04); /*D*/ + MCU_READ("KEY2", 0x0004, 0x000/2, 0x05); /*E*/ + MCU_READ("KEY2", 0x0010, 0x000/2, 0x06); /*F*/ + MCU_READ("KEY2", 0x0002, 0x000/2, 0x07); /*G*/ + MCU_READ("KEY2", 0x0008, 0x000/2, 0x08); /*H*/ + MCU_READ("KEY1", 0x0400, 0x000/2, 0x09); /*I*/ + MCU_READ("KEY1", 0x1000, 0x000/2, 0x0a); /*J*/ + MCU_READ("KEY1", 0x0200, 0x000/2, 0x0b); /*K*/ + MCU_READ("KEY1", 0x0800, 0x000/2, 0x0c); /*L*/ + MCU_READ("KEY1", 0x0004, 0x000/2, 0x0d); /*M*/ + MCU_READ("KEY1", 0x0010, 0x000/2, 0x0e); /*N*/ + MCU_READ("KEY0", 0x0200, 0x000/2, 0x0f); /*RON (trusted)*/ + MCU_READ("KEY0", 0x1000, 0x000/2, 0x10); /*REACH (trusted)*/ + MCU_READ("KEY0", 0x0400, 0x000/2, 0x11); /*KAN */ + MCU_READ("KEY1", 0x0008, 0x000/2, 0x12); /*PON */ + MCU_READ("KEY1", 0x0002, 0x000/2, 0x13); /*CHI (trusted)*/ + MCU_READ("KEY0", 0x0004, 0x000/2, 0x14); /*START1*/ } jm_regs[0x00c/2] = mame_rand(machine) & 0xffff; prg_prot++; @@ -247,39 +247,39 @@ static void urashima_mcu_run(running_machine *machine) { static UINT16 prg_prot; - if((0xffff - input_port_read_indexed(machine,0)) & 0x0008)//service_mode + if((0xffff - input_port_read(machine, "SYSTEM")) & 0x0008) //service_mode { - jm_regs[0x300/2] = input_port_read_indexed(machine,2); - jm_regs[0x302/2] = input_port_read_indexed(machine,3); - jm_regs[0x304/2] = input_port_read_indexed(machine,4); - jm_regs[0x306/2] = input_port_read_indexed(machine,5); - jm_regs[0x308/2] = input_port_read_indexed(machine,6); - jm_regs[0x30a/2] = input_port_read_indexed(machine,7); + jm_regs[0x300/2] = input_port_read(machine, "KEY0"); + jm_regs[0x302/2] = input_port_read(machine, "KEY1"); + jm_regs[0x304/2] = input_port_read(machine, "KEY2"); + jm_regs[0x306/2] = input_port_read(machine, "KEY3"); + jm_regs[0x308/2] = input_port_read(machine, "KEY4"); + jm_regs[0x30a/2] = input_port_read(machine, "KEY5"); } else { jm_regs[0x300/2] = 0x0000; - MCU_READ(3,0x0001,0x300/2,0x00);/*FF*/ - MCU_READ(4,0x0400,0x300/2,0x01);/*A*/ - MCU_READ(4,0x1000,0x300/2,0x02);/*B*/ - MCU_READ(4,0x0200,0x300/2,0x03);/*C*/ - MCU_READ(4,0x0800,0x300/2,0x04);/*D*/ - MCU_READ(4,0x0004,0x300/2,0x05);/*E*/ - MCU_READ(4,0x0010,0x300/2,0x06);/*F*/ - MCU_READ(4,0x0002,0x300/2,0x07);/*G*/ - MCU_READ(4,0x0008,0x300/2,0x08);/*H*/ - MCU_READ(3,0x0400,0x300/2,0x09);/*I*/ - MCU_READ(3,0x1000,0x300/2,0x0a);/*J*/ - MCU_READ(3,0x0200,0x300/2,0x0b);/*K*/ - MCU_READ(3,0x0800,0x300/2,0x0c);/*L*/ - MCU_READ(3,0x0004,0x300/2,0x0d);/*M*/ - MCU_READ(3,0x0010,0x300/2,0x0e);/*N*/ - MCU_READ(2,0x0200,0x300/2,0x0f);/*RON (trusted)*/ - MCU_READ(2,0x1000,0x300/2,0x10);/*REACH (trusted)*/ - MCU_READ(2,0x0400,0x300/2,0x11);/*KAN */ - MCU_READ(3,0x0008,0x300/2,0x12);/*PON */ - MCU_READ(3,0x0002,0x300/2,0x13);/*CHI (trusted)*/ - MCU_READ(2,0x0004,0x300/2,0x14);/*START1*/ + MCU_READ("KEY1", 0x0001, 0x300/2, 0x00); /*FF*/ + MCU_READ("KEY2", 0x0400, 0x300/2, 0x01); /*A*/ + MCU_READ("KEY2", 0x1000, 0x300/2, 0x02); /*B*/ + MCU_READ("KEY2", 0x0200, 0x300/2, 0x03); /*C*/ + MCU_READ("KEY2", 0x0800, 0x300/2, 0x04); /*D*/ + MCU_READ("KEY2", 0x0004, 0x300/2, 0x05); /*E*/ + MCU_READ("KEY2", 0x0010, 0x300/2, 0x06); /*F*/ + MCU_READ("KEY2", 0x0002, 0x300/2, 0x07); /*G*/ + MCU_READ("KEY2", 0x0008, 0x300/2, 0x08); /*H*/ + MCU_READ("KEY1", 0x0400, 0x300/2, 0x09); /*I*/ + MCU_READ("KEY1", 0x1000, 0x300/2, 0x0a); /*J*/ + MCU_READ("KEY1", 0x0200, 0x300/2, 0x0b); /*K*/ + MCU_READ("KEY1", 0x0800, 0x300/2, 0x0c); /*L*/ + MCU_READ("KEY1", 0x0004, 0x300/2, 0x0d); /*M*/ + MCU_READ("KEY1", 0x0010, 0x300/2, 0x0e); /*N*/ + MCU_READ("KEY0", 0x0200, 0x300/2, 0x0f); /*RON (trusted)*/ + MCU_READ("KEY0", 0x1000, 0x300/2, 0x10); /*REACH (trusted)*/ + MCU_READ("KEY0", 0x0400, 0x300/2, 0x11); /*KAN */ + MCU_READ("KEY1", 0x0008, 0x300/2, 0x12); /*PON */ + MCU_READ("KEY1", 0x0002, 0x300/2, 0x13); /*CHI (trusted)*/ + MCU_READ("KEY0", 0x0004, 0x300/2, 0x14); /*START1*/ } jm_regs[0x30c/2] = mame_rand(machine) & 0xffff; prg_prot++; @@ -289,38 +289,38 @@ static void urashima_mcu_run(running_machine *machine) static void second_mcu_run(running_machine *machine) { - if((0xffff - input_port_read_indexed(machine,1)) & 0x0004)//service_mode + if((0xffff - input_port_read(machine, "DSW")) & 0x0004) //service_mode { - jm_regs[0x200/2] = input_port_read_indexed(machine,2); - jm_regs[0x202/2] = input_port_read_indexed(machine,3); - jm_regs[0x204/2] = input_port_read_indexed(machine,4); + jm_regs[0x200/2] = input_port_read(machine, "KEY0"); + jm_regs[0x202/2] = input_port_read(machine, "KEY1"); + jm_regs[0x204/2] = input_port_read(machine, "KEY2"); } else { jm_regs[0x200/2] = 0x0000; - MCU_READ(3,0x0001,0x200/2,0x00);/*FF*/ - MCU_READ(4,0x0400,0x200/2,0x01);/*A*/ - MCU_READ(4,0x1000,0x200/2,0x02);/*B*/ - MCU_READ(4,0x0200,0x200/2,0x03);/*C*/ - MCU_READ(4,0x0800,0x200/2,0x04);/*D*/ - MCU_READ(4,0x0004,0x200/2,0x05);/*E*/ - MCU_READ(4,0x0010,0x200/2,0x06);/*F*/ - MCU_READ(4,0x0002,0x200/2,0x07);/*G*/ - MCU_READ(4,0x0008,0x200/2,0x08);/*H*/ - MCU_READ(3,0x0400,0x200/2,0x09);/*I*/ - MCU_READ(3,0x1000,0x200/2,0x0a);/*J*/ - MCU_READ(3,0x0200,0x200/2,0x0b);/*K*/ - MCU_READ(3,0x0800,0x200/2,0x0c);/*L*/ - MCU_READ(3,0x0004,0x200/2,0x0d);/*M*/ - MCU_READ(3,0x0010,0x200/2,0x0e);/*N*/ - MCU_READ(2,0x0200,0x200/2,0x0f);/*RON*/ - MCU_READ(2,0x1000,0x200/2,0x10);/*REACH*/ - MCU_READ(2,0x0400,0x200/2,0x11);/*KAN*/ - MCU_READ(3,0x0008,0x200/2,0x12);/*PON*/ - MCU_READ(3,0x0002,0x200/2,0x13);/*CHI*/ - MCU_READ(2,0x0004,0x200/2,0x14);/*START1*/ + MCU_READ("KEY1", 0x0001, 0x200/2, 0x00); /*FF*/ + MCU_READ("KEY2", 0x0400, 0x200/2, 0x01); /*A*/ + MCU_READ("KEY2", 0x1000, 0x200/2, 0x02); /*B*/ + MCU_READ("KEY2", 0x0200, 0x200/2, 0x03); /*C*/ + MCU_READ("KEY2", 0x0800, 0x200/2, 0x04); /*D*/ + MCU_READ("KEY2", 0x0004, 0x200/2, 0x05); /*E*/ + MCU_READ("KEY2", 0x0010, 0x200/2, 0x06); /*F*/ + MCU_READ("KEY2", 0x0002, 0x200/2, 0x07); /*G*/ + MCU_READ("KEY2", 0x0008, 0x200/2, 0x08); /*H*/ + MCU_READ("KEY1", 0x0400, 0x200/2, 0x09); /*I*/ + MCU_READ("KEY1", 0x1000, 0x200/2, 0x0a); /*J*/ + MCU_READ("KEY1", 0x0200, 0x200/2, 0x0b); /*K*/ + MCU_READ("KEY1", 0x0800, 0x200/2, 0x0c); /*L*/ + MCU_READ("KEY1", 0x0004, 0x200/2, 0x0d); /*M*/ + MCU_READ("KEY1", 0x0010, 0x200/2, 0x0e); /*N*/ + MCU_READ("KEY0", 0x0200, 0x200/2, 0x0f); /*RON*/ + MCU_READ("KEY0", 0x1000, 0x200/2, 0x10); /*REACH*/ + MCU_READ("KEY0", 0x0400, 0x200/2, 0x11); /*KAN*/ + MCU_READ("KEY1", 0x0008, 0x200/2, 0x12); /*PON*/ + MCU_READ("KEY1", 0x0002, 0x200/2, 0x13); /*CHI*/ + MCU_READ("KEY0", 0x0004, 0x200/2, 0x14); /*START1*/ -// MCU_READ(2,0x0004,0x7b8/2,0x03);/*START1(correct?) */ +// MCU_READ("KEY0", 0x0004, 0x7b8/2, 0x03); /*START1(correct?) */ } jm_regs[0x20c/2] = mame_rand(machine) & 0xffff; //kakumei2 @@ -548,11 +548,9 @@ static ADDRESS_MAP_START( jalmah, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END - - -static INPUT_PORTS_START( jalmah ) +static INPUT_PORTS_START( common ) /*System port*/ - PORT_START + PORT_START_TAG("SYSTEM") PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -562,7 +560,9 @@ static INPUT_PORTS_START( jalmah ) PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x0004, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_SERVICE( 0x0008, IP_ACTIVE_LOW ) + PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -595,7 +595,7 @@ static INPUT_PORTS_START( jalmah ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) /*Dip-SW port*/ - PORT_START + PORT_START_TAG("DSW") PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) // Coin2 is always 1C/1C. PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0002, DEF_STR( 3C_1C ) ) @@ -646,14 +646,14 @@ static INPUT_PORTS_START( jalmah ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) /*Mahjong Panel ports*/ - PORT_START + PORT_START_TAG("KEY0") PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_BIT( 0xe9fb, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + PORT_START_TAG("KEY1") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_M ) @@ -665,7 +665,7 @@ static INPUT_PORTS_START( jalmah ) PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_BIT( 0xe1e0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + PORT_START_TAG("KEY2") PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_H ) @@ -675,15 +675,22 @@ static INPUT_PORTS_START( jalmah ) PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_BIT( 0xe1e1, IP_ACTIVE_LOW, IPT_UNUSED ) +INPUT_PORTS_END - PORT_START +static INPUT_PORTS_START( jalmah ) + PORT_INCLUDE( common ) + + PORT_MODIFY("SYSTEM") + PORT_SERVICE( 0x0008, IP_ACTIVE_LOW ) + + PORT_START_TAG("KEY3") PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2) PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2) PORT_BIT( 0xe9fb, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_PLAYER(2) - PORT_START + PORT_START_TAG("KEY4") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP ) PORT_PLAYER(2) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) PORT_PLAYER(2) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_M ) PORT_PLAYER(2) @@ -695,7 +702,7 @@ static INPUT_PORTS_START( jalmah ) PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_PLAYER(2) PORT_BIT( 0xe1e0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + PORT_START_TAG("KEY5") PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2) PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2) @@ -709,53 +716,9 @@ INPUT_PORTS_END static INPUT_PORTS_START( jalmah2 ) - /*System port*/ - PORT_START - PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0002, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0004, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0100, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0200, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0400, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0800, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x1000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x2000, 0x2000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x2000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x4000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_INCLUDE( common ) - /*Dip-SW port*/ - PORT_START + PORT_MODIFY("DSW") PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -763,18 +726,6 @@ static INPUT_PORTS_START( jalmah2 ) PORT_DIPSETTING( 0x0002, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_SERVICE( 0x0004, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -787,103 +738,16 @@ static INPUT_PORTS_START( jalmah2 ) PORT_DIPSETTING( 0x0500, DEF_STR( 1C_3C ) ) PORT_DIPSETTING( 0x0400, DEF_STR( 1C_4C ) ) PORT_DIPSETTING( 0x0000, "1 Coin / 99 Credits" ) - PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0800, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x1000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x2000, 0x2000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x2000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x4000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - /*Mahjong Panel ports*/ - PORT_START - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) - PORT_BIT( 0xe9fb, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START + PORT_MODIFY("KEY1") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP ) PORT_NAME("P1 Mahjong Flip Flop?") PORT_CODE(KEYCODE_2) //? seems a button,affects continue countdown - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_M ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_N ) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_MAHJONG_K ) - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_MAHJONG_I ) - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_MAHJONG_L ) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_MAHJONG_J ) - PORT_BIT( 0xe1e0, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_G ) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_E ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_H ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_F ) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_MAHJONG_C ) - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_MAHJONG_A ) - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_MAHJONG_D ) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_MAHJONG_B ) - PORT_BIT( 0xe1e1, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END static INPUT_PORTS_START( jalmah2a ) - /*System port*/ - PORT_START - PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0002, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0004, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0100, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0200, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0400, 0x0400, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0400, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0800, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x1000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x2000, 0x2000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x2000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x4000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_INCLUDE( common ) - /*Dip-SW port*/ - PORT_START + PORT_MODIFY("DSW") PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -891,18 +755,9 @@ static INPUT_PORTS_START( jalmah2a ) PORT_DIPSETTING( 0x0002, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_SERVICE( 0x0004, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_DIPNAME( 0x0010, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -915,52 +770,12 @@ static INPUT_PORTS_START( jalmah2a ) PORT_DIPSETTING( 0x0500, DEF_STR( 1C_3C ) ) PORT_DIPSETTING( 0x0400, DEF_STR( 1C_4C ) ) PORT_DIPSETTING( 0x0000, "1 Coin / 99 Credits" ) - PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x0800, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x1000, 0x1000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x1000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x2000, 0x2000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x2000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x4000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - /*Mahjong Panel ports*/ - PORT_START - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) - PORT_BIT( 0xe9fb, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START + PORT_MODIFY("KEY1") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP ) PORT_NAME("P1 Mahjong Flip Flop?") PORT_CODE(KEYCODE_2) //? seems a button,affects continue countdown - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_M ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_N ) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_MAHJONG_K ) - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_MAHJONG_I ) - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_MAHJONG_L ) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_MAHJONG_J ) - PORT_BIT( 0xe1e0, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_G ) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_E ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_H ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_F ) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_MAHJONG_C ) - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_MAHJONG_A ) - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_MAHJONG_D ) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_MAHJONG_B ) - PORT_BIT( 0xe1e1, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END static const gfx_layout charlayout = diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c index b7564b1a203..f1c2b493691 100644 --- a/src/mame/drivers/jchan.c +++ b/src/mame/drivers/jchan.c @@ -302,7 +302,7 @@ static void jchan_mcu_run(running_machine *machine) case 0x03: // DSW { - mcu_ram[mcu_offset] = input_port_read_indexed(machine, 3); + mcu_ram[mcu_offset] = input_port_read(machine, "DSW"); logerror("PC=%06X : MCU executed command: %04X %04X (read DSW)\n",activecpu_get_pc(),mcu_command,mcu_offset*2); } break; @@ -455,8 +455,8 @@ static READ16_HANDLER ( jchan_ctrl_r ) { switch(offset) { - case 0/2: return input_port_read_indexed(machine, 0); // Player 1 controls - case 2/2: return input_port_read_indexed(machine, 1); // Player 2 controls + case 0/2: return input_port_read(machine, "IN0"); // Player 1 controls + case 2/2: return input_port_read(machine, "IN1"); // Player 2 controls default: logerror("jchan_ctrl_r unknown!"); break; } return jchan_ctrl[offset]; @@ -704,7 +704,7 @@ static INPUT_PORTS_START( jchan ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN3") // DSW provided by the MCU - $200098.b <- $300200 + PORT_START_TAG("DSW") // DSW provided by the MCU - $200098.b <- $300200 PORT_DIPNAME( 0x0100, 0x0100, "Test Mode" ) PORT_DIPSETTING( 0x0100, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) diff --git a/src/mame/drivers/jcross.c b/src/mame/drivers/jcross.c index 408a0d2aed6..42a965be72f 100644 --- a/src/mame/drivers/jcross.c +++ b/src/mame/drivers/jcross.c @@ -70,7 +70,7 @@ static READ8_HANDLER( sound_nmi_ack_r ) static READ8_HANDLER( jcross_port_0_r ) { - return(input_port_read_indexed(machine, 0) | sound_cpu_busy); + return(input_port_read(machine, "IN0") | sound_cpu_busy); } static WRITE8_HANDLER(jcross_vregs0_w){jcross_vregs[0]=data;} @@ -100,11 +100,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cpuA_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x9fff) AM_ROM AM_RANGE(0xa000, 0xa000) AM_READ(jcross_port_0_r) - AM_RANGE(0xa100, 0xa100) AM_READ(input_port_1_r) - AM_RANGE(0xa200, 0xa200) AM_READ(input_port_2_r) + AM_RANGE(0xa100, 0xa100) AM_READ_PORT("IN1") + AM_RANGE(0xa200, 0xa200) AM_READ_PORT("IN2") AM_RANGE(0xa300, 0xa300) AM_WRITE(sound_command_w) - AM_RANGE(0xa400, 0xa400) AM_READ(input_port_3_r) - AM_RANGE(0xa500, 0xa500) AM_READ(input_port_4_r) + AM_RANGE(0xa400, 0xa400) AM_READ_PORT("DSW1") + AM_RANGE(0xa500, 0xa500) AM_READ_PORT("DSW2") AM_RANGE(0xa600, 0xa600) AM_WRITE(jcross_palettebank_w) AM_RANGE(0xa700, 0xa700) AM_READWRITE(snk_cpuB_nmi_trigger_r, snk_cpuA_nmi_ack_w) AM_RANGE(0xd300, 0xd300) AM_WRITE(jcross_vregs0_w) @@ -339,5 +339,3 @@ ROM_START( jcross ) ROM_END GAME( 1984, jcross, 0, jcross, jcross, 0, ROT270, "SNK", "Jumping Cross",GAME_NO_COCKTAIL|GAME_IMPERFECT_GRAPHICS) - - diff --git a/src/mame/drivers/jedi.c b/src/mame/drivers/jedi.c index d7888904709..b4108aad95f 100644 --- a/src/mame/drivers/jedi.c +++ b/src/mame/drivers/jedi.c @@ -214,8 +214,8 @@ static READ8_HANDLER( a2d_data_r ) switch (state->a2d_select) { - case 0: ret = input_port_read_indexed(machine, 2); break; - case 2: ret = input_port_read_indexed(machine, 3); break; + case 0: ret = input_port_read(machine, "STICKY"); break; + case 2: ret = input_port_read(machine, "STICKX"); break; } return ret; @@ -309,7 +309,7 @@ ADDRESS_MAP_END *************************************/ static INPUT_PORTS_START( jedi ) - PORT_START /* 0C00 */ + PORT_START_TAG("0c00") /* 0C00 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) @@ -319,17 +319,17 @@ static INPUT_PORTS_START( jedi ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_START /* 0C01 */ + PORT_START_TAG("0c01") /* 0C01 */ PORT_BIT( 0x03, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_TILT ) PORT_BIT( 0x18, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x60, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(jedi_audio_comm_stat_r, 0) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK ) - PORT_START /* analog Y */ + PORT_START_TAG("STICKY") /* analog Y */ PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) - PORT_START /* analog X */ + PORT_START_TAG("STICKX") /* analog X */ PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) INPUT_PORTS_END diff --git a/src/mame/machine/irobot.c b/src/mame/machine/irobot.c index 10b4cac5ea4..20ffcd94025 100644 --- a/src/mame/machine/irobot.c +++ b/src/mame/machine/irobot.c @@ -225,9 +225,9 @@ READ8_HANDLER( irobot_control_r ) { if (irobot_control_num == 0) - return input_port_read_indexed(machine, 5); + return input_port_read(machine, "AN0"); else if (irobot_control_num == 1) - return input_port_read_indexed(machine, 6); + return input_port_read(machine, "AN1"); return 0; } diff --git a/src/mame/video/itech8.c b/src/mame/video/itech8.c index c936e0dd7e1..4cbec468cf4 100644 --- a/src/mame/video/itech8.c +++ b/src/mame/video/itech8.c @@ -459,7 +459,8 @@ static TIMER_CALLBACK( blitter_done ) READ8_HANDLER( itech8_blitter_r ) { int result = blitter_data[offset / 2]; - + static const char *portnames[] = { "AN_C", "AN_D", "AN_E", "AN_F" }; + /* debugging */ if (FULL_LOGGING) logerror("%04x:blitter_r(%02x)\n", activecpu_get_previouspc(), offset / 2); @@ -478,7 +479,7 @@ READ8_HANDLER( itech8_blitter_r ) /* a read from offsets 12-15 return input port values */ if (offset >= 12 && offset <= 15) - result = input_port_read_indexed(machine, 3 + offset - 12); + result = input_port_read(machine, portnames[offset - 12]); return result; }