diff options
| author | 2008-07-17 08:27:29 +0000 | |
|---|---|---|
| committer | 2008-07-17 08:27:29 +0000 | |
| commit | 98ec2c8ac6c541f4b7087bde20261734605d5aa1 (patch) | |
| tree | 0af7a1cbe3aaaeae4bcc9161987b5acd854f8444 | |
| parent | 2381235812da7e887b97bcfc0063d87d458a6ee8 (diff) | |
From: Fabio Priuli [mailto:doge.fabio@gmail.com]
Subject: some more read_indexed removal
Hi,
enclosed please find a few patches which
* convert to use tagged inputs and handlers all drivers starting with S
* simplify input reads in system24 (removing a redundant handler)
* clean up a bit inputs in system 16 & 18 bootlegs (among the other things, now coinage and P2 inputs in fpointbl & fpointbj work again)
Note that I put ssv.c changes in a separate patch because, according to MT1959 bug, the driver could have been modified. Let me know, however, if this patch or any other fails to apply.
Once again, I spent a lot of time testing these changes (both with automated tests with -str 25 and by playing emulated sets) so I hope everything is correct.
Regards,
Fabio Priuli
--
From: Fabio Priuli [mailto:doge.fabio@gmail.com]
Subject: fixed patch
Hi,
applying to a fresh source my recent patches I noticed that patchS09.diff got corrupted somehow before being submitted (it misses a few lines). While not terrible (each patch was as usual independent from the others), yet it's a bit annoying that part of the changes (system 16 & 18 bootlegs) would have been 'lost' :)
I attached a fixed patchS09.diff, which contains all the changes done in my previous patchS09.diff but shall now correctly apply
Sorry for the inconvenience
Fabio Priuli
--
From: Fabio Priuli [mailto:doge.fabio@gmail.com]
Subject: two more patches
Hi,
enclosed please find two patches which
* convert to use tagged inputs and handlers most drivers starting with T
* fix MT bug #2006
* remove a lot of redundant #define from taito drivers, replacing them with PORT_INCLUDEs and definitions from taitoipt.h
Hopefully, both .diff will apply with no problems despite their size. Let me know if something fails to apply and I will generate per-case .diff :)
As usual, I tested as much as I could the changes, so there shall be no regression.
Regards,
Fabio Priuli
115 files changed, 4901 insertions, 6055 deletions
diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c index dfb2e20c790..fa8e54f8517 100644 --- a/src/mame/drivers/bbusters.c +++ b/src/mame/drivers/bbusters.c @@ -260,50 +260,48 @@ static int gun_select; static READ16_HANDLER( control_3_r ) { - /* gun_select seems to assume only values 5,6,7... is this correct? */ - return input_port_read_indexed(machine, gun_select); + static const char *port[] = { "GUNX1", "GUNY1", "GUNX2", "GUNY2", "GUNX3", "GUNY3" }; + + return input_port_read(machine, port[gun_select]); } static WRITE16_HANDLER( gun_select_w ) { logerror("%08x: gun r\n",activecpu_get_pc()); - gun_select=5 + (data&0xff); + gun_select = data & 0xff; } static READ16_HANDLER( kludge_r ) { - bbuster_ram[0xa692/2]=input_port_read(machine, "IN5")<<1; - bbuster_ram[0xa694/2]=input_port_read(machine, "IN6")<<1; - bbuster_ram[0xa696/2]=input_port_read(machine, "IN7")<<1; - bbuster_ram[0xa698/2]=input_port_read(machine, "IN8")<<1; - bbuster_ram[0xa69a/2]=input_port_read(machine, "IN9")<<1; - bbuster_ram[0xa69c/2]=input_port_read(machine, "IN10")<<1; + bbuster_ram[0xa692/2] = input_port_read(machine, "GUNX1")<<1; + bbuster_ram[0xa694/2] = input_port_read(machine, "GUNY1")<<1; + bbuster_ram[0xa696/2] = input_port_read(machine, "GUNX2")<<1; + bbuster_ram[0xa698/2] = input_port_read(machine, "GUNY2")<<1; + bbuster_ram[0xa69a/2] = input_port_read(machine, "GUNX3")<<1; + bbuster_ram[0xa69c/2] = input_port_read(machine, "GUNY3")<<1; return 0; } static WRITE16_HANDLER( sound_cpu_w ) { - soundlatch_w(machine,0,data&0xff); - cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE); + soundlatch_w(machine, 0, data&0xff); + cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE); } static READ16_HANDLER( mechatt_gun_r ) { - int baseport=0,x,y; - static const char *port[] = { "IN2", "IN3", "IN4", "IN5" }; - - if (offset) baseport=2; /* Player 2 */ + int x, y; - x=input_port_read(machine, port[baseport]); - y=input_port_read(machine, port[baseport+1]); + x = input_port_read(machine, offset ? "GUNX2" : "GUNX1"); + y = input_port_read(machine, offset ? "GUNY2" : "GUNY1"); /* Todo - does the hardware really clamp like this? */ - x+=0x18; - if (x>0xff) x=0xff; - if (y>0xef) y=0xef; + x += 0x18; + if (x > 0xff) x = 0xff; + if (y > 0xef) y = 0xef; - return x|(y<<8); + return x | (y<<8); } /*******************************************************************************/ @@ -317,11 +315,11 @@ static ADDRESS_MAP_START( bbuster_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0b0000, 0x0b1fff) AM_READ(SMH_RAM) AM_RANGE(0x0b2000, 0x0b3fff) AM_READ(SMH_RAM) AM_RANGE(0x0d0000, 0x0d0fff) AM_READ(SMH_RAM) - AM_RANGE(0x0e0000, 0x0e0001) AM_READ(input_port_2_word_r) /* Coins */ - AM_RANGE(0x0e0002, 0x0e0003) AM_READ(input_port_0_word_r) /* Player 1 & 2 */ - AM_RANGE(0x0e0004, 0x0e0005) AM_READ(input_port_1_word_r) /* Player 3 */ - AM_RANGE(0x0e0008, 0x0e0009) AM_READ(input_port_3_word_r) /* Dip 1 */ - AM_RANGE(0x0e000a, 0x0e000b) AM_READ(input_port_4_word_r) /* Dip 2 */ + AM_RANGE(0x0e0000, 0x0e0001) AM_READ_PORT("COINS") /* Coins */ + AM_RANGE(0x0e0002, 0x0e0003) AM_READ_PORT("IN0") /* Player 1 & 2 */ + AM_RANGE(0x0e0004, 0x0e0005) AM_READ_PORT("IN1") /* Player 3 */ + AM_RANGE(0x0e0008, 0x0e0009) AM_READ_PORT("DSW1") /* Dip 1 */ + AM_RANGE(0x0e000a, 0x0e000b) AM_READ_PORT("DSW2") /* Dip 2 */ AM_RANGE(0x0e0018, 0x0e0019) AM_READ(sound_cpu_r) AM_RANGE(0x0e8000, 0x0e8001) AM_READ(kludge_r) AM_RANGE(0x0e8002, 0x0e8003) AM_READ(control_3_r) @@ -355,8 +353,8 @@ static ADDRESS_MAP_START( mechatt_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0b0000, 0x0b3fff) AM_READ(SMH_RAM) AM_RANGE(0x0c0000, 0x0c3fff) AM_READ(SMH_RAM) AM_RANGE(0x0d0000, 0x0d07ff) AM_READ(SMH_RAM) - AM_RANGE(0x0e0000, 0x0e0001) AM_READ(input_port_0_word_r) - AM_RANGE(0x0e0002, 0x0e0003) AM_READ(input_port_1_word_r) + AM_RANGE(0x0e0000, 0x0e0001) AM_READ_PORT("IN0") + AM_RANGE(0x0e0002, 0x0e0003) AM_READ_PORT("DSW1") AM_RANGE(0x0e0004, 0x0e0007) AM_READ(mechatt_gun_r) AM_RANGE(0x0e8000, 0x0e8001) AM_READ(sound_cpu_r) ADDRESS_MAP_END @@ -442,7 +440,7 @@ static INPUT_PORTS_START( bbusters ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN2") + PORT_START_TAG("COINS") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) @@ -504,19 +502,19 @@ static INPUT_PORTS_START( bbusters ) PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW2:7" ) /* Listed as "Unused" */ PORT_SERVICE_DIPLOC(0x80, IP_ACTIVE_LOW, "SW2:8" ) - PORT_START_TAG("IN5") + PORT_START_TAG("GUNX1") PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(1) - PORT_START_TAG("IN6") + PORT_START_TAG("GUNY1") PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(1) - PORT_START_TAG("IN7") + PORT_START_TAG("GUNX2") PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(2) - PORT_START_TAG("IN8") + PORT_START_TAG("GUNY2") PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(2) - PORT_START_TAG("IN9") + PORT_START_TAG("GUNX3") PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(3) - PORT_START_TAG("IN10") + PORT_START_TAG("GUNY3") PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(3) #if BBUSTERS_HACK @@ -585,14 +583,14 @@ static INPUT_PORTS_START( mechatt ) PORT_DIPUNUSED_DIPLOC(0x4000, 0x4000, "SW2:7" ) /* Listed as "Unused" */ PORT_SERVICE_DIPLOC( 0x8000, IP_ACTIVE_LOW, "SW2:8" ) - PORT_START_TAG("IN2") + PORT_START_TAG("GUNX1") PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(1) - PORT_START_TAG("IN3") + PORT_START_TAG("GUNY1") PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(1) - PORT_START_TAG("IN4") + PORT_START_TAG("GUNX2") PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(2) - PORT_START_TAG("IN5") + PORT_START_TAG("GUNY2") PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(2) #if MECHATT_HACK diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c index 70e36dbce7c..f0cfc4e3ec9 100644 --- a/src/mame/drivers/dkong.c +++ b/src/mame/drivers/dkong.c @@ -726,29 +726,29 @@ static WRITE8_HANDLER( dkong3_2a03_reset_w ) static READ8_HANDLER( strtheat_inputport_0_r ) { - if(input_port_read_indexed(machine, 3) & 0x40) + if(input_port_read(machine, "DSW0") & 0x40) { /* Joystick inputs */ - return input_port_read_indexed(machine, 0); + return input_port_read(machine, "IN0"); } else { /* Steering Wheel inputs */ - return (input_port_read_indexed(machine, 0) & ~3) | (input_port_read_indexed(machine, 4) & 3); + return (input_port_read(machine, "IN0") & ~3) | (input_port_read(machine, "IN4") & 3); } } static READ8_HANDLER( strtheat_inputport_1_r ) { - if(input_port_read_indexed(machine, 3) & 0x40) + if(input_port_read(machine, "DSW0") & 0x40) { /* Joystick inputs */ - return input_port_read_indexed(machine, 1); + return input_port_read(machine, "IN1"); } else { /* Steering Wheel inputs */ - return (input_port_read_indexed(machine, 1) & ~3) | (input_port_read_indexed(machine, 5) & 3); + return (input_port_read(machine, "IN1") & ~3) | (input_port_read(machine, "IN5") & 3); } } diff --git a/src/mame/drivers/galastrm.c b/src/mame/drivers/galastrm.c index a825695a71b..e311f75e396 100644 --- a/src/mame/drivers/galastrm.c +++ b/src/mame/drivers/galastrm.c @@ -103,13 +103,13 @@ static READ32_HANDLER( galastrm_input_r ) { case 0x00: { - return (input_port_read_indexed(machine,0) << 16) | input_port_read_indexed(machine,1) | + return (input_port_read(machine, "IN0") << 16) | input_port_read(machine, "IN1") | (eeprom_read_bit() << 7) | frame_counter << 9; } case 0x01: { - return input_port_read_indexed(machine,2) | (coin_word << 16); + return input_port_read(machine, "IN2") | (coin_word << 16); } } //logerror("CPU #0 PC %06x: read input %06x\n",activecpu_get_pc(),offset); @@ -170,9 +170,9 @@ static READ32_HANDLER( galastrm_adstick_ctrl_r ) if (offset == 0x00) { if (ACCESSING_BITS_24_31) - return input_port_read_indexed(machine, 3) << 24; + return input_port_read(machine, "STICKX") << 24; if (ACCESSING_BITS_16_23) - return input_port_read_indexed(machine, 4) << 16; + return input_port_read(machine, "STICKY") << 16; } return 0; } @@ -221,10 +221,10 @@ ADDRESS_MAP_END ***********************************************************/ static INPUT_PORTS_START( galastrm ) - PORT_START /* IN0 */ + PORT_START_TAG("IN0") /* IN0 */ PORT_BIT( 0xFFFF, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* IN1 */ + PORT_START_TAG("IN1") /* IN1 */ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) /* Freeze input */ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -242,7 +242,7 @@ static INPUT_PORTS_START( galastrm ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* IN2 */ + PORT_START_TAG("IN2") /* IN2 */ PORT_SERVICE_NO_TOGGLE( 0x0001, IP_ACTIVE_LOW ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN1 ) @@ -260,10 +260,10 @@ static INPUT_PORTS_START( galastrm ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("STICKX") PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(60) PORT_KEYDELTA(15) PORT_PLAYER(1) - PORT_START + PORT_START_TAG("STICKY") PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(60) PORT_KEYDELTA(15) PORT_REVERSE PORT_PLAYER(1) INPUT_PORTS_END diff --git a/src/mame/drivers/legionna.c b/src/mame/drivers/legionna.c index 3250aade88a..fc71f64a8c1 100644 --- a/src/mame/drivers/legionna.c +++ b/src/mame/drivers/legionna.c @@ -221,7 +221,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( legionna ) SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */ - PORT_START + PORT_START_TAG("DSW1") PORT_DIPNAME( 0x001f, 0x001f, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x0015, DEF_STR( 6C_1C ) ) PORT_DIPSETTING( 0x0017, DEF_STR( 5C_1C ) ) @@ -275,7 +275,7 @@ static INPUT_PORTS_START( legionna ) PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x8000, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("PLAYERS12") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY @@ -293,7 +293,7 @@ static INPUT_PORTS_START( legionna ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -309,7 +309,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( heatbrl ) SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */ - PORT_START + PORT_START_TAG("DSW1") PORT_DIPNAME( 0x001f, 0x001f, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x0015, DEF_STR( 6C_1C ) ) PORT_DIPSETTING( 0x0017, DEF_STR( 5C_1C ) ) @@ -361,7 +361,7 @@ static INPUT_PORTS_START( heatbrl ) PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x8000, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("PLAYERS12") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -379,7 +379,7 @@ static INPUT_PORTS_START( heatbrl ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("SYSTEM") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -390,7 +390,7 @@ static INPUT_PORTS_START( heatbrl ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN4 ) // haven't found coin4, maybe it doesn't exist // PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("PLAYERS34") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3) @@ -413,7 +413,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( godzilla ) SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */ - PORT_START + PORT_START_TAG("DSW1") PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -463,7 +463,7 @@ static INPUT_PORTS_START( godzilla ) PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("PLAYERS12") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -481,7 +481,7 @@ static INPUT_PORTS_START( godzilla ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("SYSTEM") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -492,7 +492,7 @@ static INPUT_PORTS_START( godzilla ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("PLAYERS34") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3) @@ -514,7 +514,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( sdgndmrb ) SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */ - PORT_START + PORT_START_TAG("DSW1") PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -564,7 +564,7 @@ static INPUT_PORTS_START( sdgndmrb ) PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("PLAYERS12") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -582,7 +582,7 @@ static INPUT_PORTS_START( sdgndmrb ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("SYSTEM") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -593,7 +593,7 @@ static INPUT_PORTS_START( sdgndmrb ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("PLAYERS34") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3) @@ -611,7 +611,7 @@ static INPUT_PORTS_START( sdgndmrb ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("DSW2") PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -665,7 +665,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( denjinmk ) SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */ - PORT_START + PORT_START_TAG("DSW1") PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -690,8 +690,7 @@ static INPUT_PORTS_START( denjinmk ) PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Service_Mode ) ) PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - - + PORT_DIPNAME( 0x0f00, 0x0f00, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x0200, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0500, DEF_STR( 3C_1C ) ) @@ -727,7 +726,7 @@ static INPUT_PORTS_START( denjinmk ) PORT_DIPSETTING( 0xe000, "e" ) PORT_DIPSETTING( 0xf000, "f" ) - PORT_START + PORT_START_TAG("PLAYERS12") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -745,7 +744,7 @@ static INPUT_PORTS_START( denjinmk ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("SYSTEM") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -756,7 +755,7 @@ static INPUT_PORTS_START( denjinmk ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("PLAYERS34") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3) @@ -774,7 +773,7 @@ static INPUT_PORTS_START( denjinmk ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("DSW2") PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -829,7 +828,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( cupsoc ) SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */ - PORT_START + PORT_START_TAG("DSW1") PORT_DIPNAME( 0x0007, 0x0007, "Coin 1 (3)" ) PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) ) @@ -872,7 +871,7 @@ static INPUT_PORTS_START( cupsoc ) PORT_DIPSETTING( 0xc000, "3:30" ) PORT_DIPSETTING( 0x4000, "4:00" ) - PORT_START + PORT_START_TAG("PLAYERS12") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -890,7 +889,7 @@ static INPUT_PORTS_START( cupsoc ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_START + PORT_START_TAG("SYSTEM") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) //TEST @@ -900,7 +899,7 @@ static INPUT_PORTS_START( cupsoc ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START4 ) PORT_BIT( 0xfc00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("PLAYERS34") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3) @@ -918,7 +917,7 @@ static INPUT_PORTS_START( cupsoc ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_START + PORT_START_TAG("DSW2") PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) ) diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c index d22552fa0e6..f728e22ff94 100644 --- a/src/mame/drivers/royalmah.c +++ b/src/mame/drivers/royalmah.c @@ -316,7 +316,7 @@ static WRITE8_HANDLER( mjapinky_palbank_w ) static READ8_HANDLER( mjapinky_dsw_r ) { - if (rombank == 0x0e) return input_port_read_indexed(machine, 13); + if (rombank == 0x0e) return input_port_read(machine, "DSW3"); else return *(memory_region(machine, REGION_CPU1) + 0x10000 + 0x8000 * rombank); } diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c index b2f31182871..c5b457925ca 100644 --- a/src/mame/drivers/sbowling.c +++ b/src/mame/drivers/sbowling.c @@ -176,10 +176,10 @@ static WRITE8_HANDLER(graph_control_w) static READ8_HANDLER (controls_r) { - if(sbw_system&2) - return input_port_read_indexed(machine, 2); + if(sbw_system & 2) + return input_port_read(machine, "TRACKY"); else - return input_port_read_indexed(machine, 3); + return input_port_read(machine, "TRACKX"); } static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -192,33 +192,33 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( port_map, ADDRESS_SPACE_IO, 8 ) - AM_RANGE(0x00, 0x00) AM_READWRITE(input_port_0_r, watchdog_reset_w) + AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(watchdog_reset_w) AM_RANGE(0x01, 0x01) AM_READWRITE(controls_r, pix_data_w) AM_RANGE(0x02, 0x02) AM_READWRITE(pix_data_r, pix_shift_w) - AM_RANGE(0x03, 0x03) AM_READWRITE(input_port_1_r, SMH_NOP) - AM_RANGE(0x04, 0x04) AM_READWRITE(input_port_4_r, system_w) - AM_RANGE(0x05, 0x05) AM_READWRITE(input_port_5_r, graph_control_w) + AM_RANGE(0x03, 0x03) AM_READ_PORT("IN1") AM_WRITENOP + AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW0") AM_WRITE(system_w) + AM_RANGE(0x05, 0x05) AM_READ_PORT("DSW1") AM_WRITE(graph_control_w) ADDRESS_MAP_END static INPUT_PORTS_START( sbowling ) - PORT_START + PORT_START_TAG("IN0") PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_TILT ) - PORT_START + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 ) - PORT_START + PORT_START_TAG("TRACKY") PORT_BIT( 0xff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) - PORT_START + PORT_START_TAG("TRACKX") PORT_BIT( 0xff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_REVERSE - PORT_START /* coin slots: A 4 LSB, B 4 MSB */ + PORT_START_TAG("DSW0") /* coin slots: A 4 LSB, B 4 MSB */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -244,7 +244,7 @@ static INPUT_PORTS_START( sbowling ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("DSW1") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) ) PORT_DIPSETTING( 0x01, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) ) diff --git a/src/mame/drivers/sderby.c b/src/mame/drivers/sderby.c index b3abf3115fe..2449afd9de5 100644 --- a/src/mame/drivers/sderby.c +++ b/src/mame/drivers/sderby.c @@ -93,7 +93,7 @@ static READ16_HANDLER ( sderby_input_r ) switch (offset) { case 0x00 >> 1: - return input_port_read_indexed(machine, 0); + return input_port_read(machine, "IN0"); case 0x02 >> 1: return 0xffff; // to avoid game to reset (needs more work) } @@ -108,11 +108,11 @@ static READ16_HANDLER( roulette_input_r ) switch (offset) { case 0x00 >>1: - return input_port_read_indexed(machine, 0); + return input_port_read(machine, "IN0"); case 0x02 >>1: - return input_port_read_indexed(machine, 1); + return input_port_read(machine, "IN1"); case 0x04 >>1: - return input_port_read_indexed(machine, 2); + return input_port_read(machine, "IN2"); } return 0xffff; @@ -165,7 +165,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( sderby ) - PORT_START /* 0x308000.w */ + PORT_START_TAG("IN0") /* 0x308000.w */ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY @@ -185,7 +185,7 @@ static INPUT_PORTS_START( sderby ) INPUT_PORTS_END static INPUT_PORTS_START( pmroulet ) - PORT_START + PORT_START_TAG("IN0") PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ? PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_VBLANK ) // it must be toggled to boot anyway PORT_SERVICE_NO_TOGGLE(0x0020, IP_ACTIVE_LOW) // seems to be .. @@ -193,14 +193,14 @@ static INPUT_PORTS_START( pmroulet ) PORT_BIT( 0x0f00, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ? PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ? - PORT_START + PORT_START_TAG("IN1") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x000e, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ? PORT_BIT( 0x00f0, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ? PORT_BIT( 0x0f00, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ? PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ? - PORT_START + PORT_START_TAG("IN2") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c index 4aaee7eef89..b146f3c5d90 100644 --- a/src/mame/drivers/segae.c +++ b/src/mame/drivers/segae.c @@ -2273,10 +2273,10 @@ static READ8_HANDLER (segae_hangonjr_port_f8_r) temp = 0; if (port_fa_last == 0x08) /* 0000 1000 */ /* Angle */ - temp = input_port_read_indexed(machine, 4); + temp = input_port_read(machine, "IN2"); if (port_fa_last == 0x09) /* 0000 1001 */ /* Accel */ - temp = input_port_read_indexed(machine, 5); + temp = input_port_read(machine, "IN3"); return temp; } @@ -2312,13 +2312,13 @@ static WRITE8_HANDLER (segae_ridleofp_port_fa_w) if (data & 1) { - int curr = input_port_read_indexed(machine, 4); + int curr = input_port_read(machine, "IN2"); diff1 = ((curr - last1) & 0x0fff) | (curr & 0xf000); last1 = curr; } if (data & 2) { - int curr = input_port_read_indexed(machine, 5) & 0x0fff; + int curr = input_port_read(machine, "IN3") & 0x0fff; diff2 = ((curr - last2) & 0x0fff) | (curr & 0xf000); last2 = curr; } diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c index 987f7baac56..b095e0791c2 100644 --- a/src/mame/drivers/segahang.c +++ b/src/mame/drivers/segahang.c @@ -157,13 +157,19 @@ static READ16_HANDLER( hangon_io_r ) return ppi8255_r(device_list_find_by_tag( machine->config->devicelist, PPI8255, "ppi8255_0" ), offset & 3); case 0x1000/2: /* Input ports and DIP switches */ - return input_port_read_indexed(machine, offset & 3); + { + static const char *sysports[] = { "SERVICE", "COINAGE", "DSW", "UNKNOWN" }; + return input_port_read(machine, sysports[offset & 3]); + } case 0x3000/2: /* PPI @ 4C */ return ppi8255_r(device_list_find_by_tag( machine->config->devicelist, PPI8255, "ppi8255_1" ), offset & 3); case 0x3020/2: /* ADC0804 data output */ - return input_port_read_indexed(machine, 4 + adc_select); + { + static const char *adcports[] = { "ADC0", "ADC1", "ADC2", "ADC3" }; + return input_port_read_safe(machine, adcports[adc_select], 0); + } } logerror("%06X:hangon_io_r - unknown read access to address %04X\n", activecpu_get_pc(), offset * 2); @@ -202,14 +208,20 @@ static READ16_HANDLER( sharrier_io_r ) return ppi8255_r(device_list_find_by_tag( machine->config->devicelist, PPI8255, "ppi8255_0" ), offset & 3); case 0x0010/2: /* Input ports and DIP switches */ - return input_port_read_indexed(machine, offset & 3); + { + static const char *sysports[] = { "SERVICE", "UNKNOWN", "COINAGE", "DSW" }; + return input_port_read(machine, sysports[offset & 3]); + } case 0x0020/2: /* PPI @ 4C */ if (offset == 2) return 0; return ppi8255_r(device_list_find_by_tag( machine->config->devicelist, PPI8255, "ppi8255_1" ), offset & 3); case 0x0030/2: /* ADC0804 data output */ - return input_port_read_indexed(machine, 4 + adc_select); + { + static const char *adcports[] = { "ADC0", "ADC1", "ADC2", "ADC3" }; + return input_port_read_safe(machine, adcports[adc_select], 0); + } } logerror("%06X:sharrier_io_r - unknown read access to address %04X\n", activecpu_get_pc(), offset * 2); @@ -333,7 +345,7 @@ static INTERRUPT_GEN( i8751_main_cpu_vblank ) static void sharrier_i8751_sim(running_machine *machine) { - workram[0x492/2] = (input_port_read_indexed(machine, 4) << 8) | input_port_read_indexed(machine, 5); + workram[0x492/2] = (input_port_read(machine, "ADC0") << 8) | input_port_read(machine, "ADC1"); } diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c index f975e575570..750b5880beb 100644 --- a/src/mame/drivers/segaorun.c +++ b/src/mame/drivers/segaorun.c @@ -382,7 +382,10 @@ static READ16_HANDLER( outrun_custom_io_r ) return ppi8255_r(device_list_find_by_tag( machine->config->devicelist, PPI8255, "ppi8255" ), offset & 3); case 0x10/2: - return input_port_read_indexed(machine, offset & 3); + { + static const char *const sysports[] = { "SERVICE", "UNKNOWN", "COINAGE", "DSW" }; + return input_port_read(machine, sysports[offset & 3]); + } case 0x30/2: { @@ -445,7 +448,10 @@ static READ16_HANDLER( shangon_custom_io_r ) case 0x1002/2: case 0x1004/2: case 0x1006/2: - return input_port_read_indexed(machine, offset & 3); + { + static const char *const sysports[] = { "SERVICE", "UNKNOWN", "COINAGE", "DSW" }; + return input_port_read(machine, sysports[offset & 3]); + } case 0x3020/2: { diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c index a3122809d0d..5c5f8122eff 100644 --- a/src/mame/drivers/segas16a.c +++ b/src/mame/drivers/segas16a.c @@ -272,10 +272,13 @@ static READ16_HANDLER( standard_io_r ) return ppi8255_r(device_list_find_by_tag( machine->config->devicelist, PPI8255, "ppi8255" ), offset & 3); case 0x1000/2: - return input_port_read_indexed(machine, offset & 3); + { + static const char *const sysports[] = { "SERVICE", "P1", "UNUSED", "P2" }; + return input_port_read(machine, sysports[offset & 3]); + } case 0x2000/2: - return input_port_read_indexed(machine, 4 + (offset & 1)); + return input_port_read(machine, (offset & 1) ? "DSW2" : "DSW1"); } logerror("%06X:standard_io_r - unknown read access to address %04X\n", activecpu_get_pc(), offset * 2); return 0xffff; diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c index 37a7a46598a..c46d8e0b3bb 100644 --- a/src/mame/drivers/segas16b.c +++ b/src/mame/drivers/segas16b.c @@ -1135,10 +1135,13 @@ static READ16_HANDLER( standard_io_r ) switch (offset & (0x3000/2)) { case 0x1000/2: - return input_port_read_indexed(machine, offset & 3); + { + static const char *const sysports[] = { "SERVICE", "P1", "UNUSED", "P2" }; + return input_port_read(machine, sysports[offset & 3]); + } case 0x2000/2: - return input_port_read_indexed(machine, 4 + (offset & 1)); + return input_port_read(machine, (offset & 1) ? "DSW2" : "DSW1"); } logerror("%06X:standard_io_r - unknown read access to address %04X\n", activecpu_get_pc(), offset * 2); return segaic16_open_bus_r(machine,0,mem_mask); @@ -1394,7 +1397,7 @@ static void altbeast_common_i8751_sim(running_machine *machine, offs_t soundoffs } /* read inputs */ - workram[inputoffs] = ~input_port_read_indexed(machine, 0) << 8; + workram[inputoffs] = ~input_port_read(machine, "SERVICE") << 8; } static void altbeasj_i8751_sim(running_machine *machine) @@ -1473,8 +1476,8 @@ static void goldnaxe_i8751_sim(running_machine *machine) } /* read inputs */ - workram[0x2cd0/2] = (input_port_read_indexed(machine, 1) << 8) | input_port_read_indexed(machine, 3); - workram[0x2c96/2] = input_port_read_indexed(machine, 0) << 8; + workram[0x2cd0/2] = (input_port_read(machine, "P1") << 8) | input_port_read(machine, "P2"); + workram[0x2c96/2] = input_port_read(machine, "SERVICE") << 8; } @@ -1494,9 +1497,9 @@ static void tturf_i8751_sim(running_machine *machine) } /* read inputs */ - workram[0x01e6/2] = input_port_read_indexed(machine, 0) << 8; - workram[0x01e8/2] = input_port_read_indexed(machine, 1) << 8; - workram[0x01ea/2] = input_port_read_indexed(machine, 3) << 8; + workram[0x01e6/2] = input_port_read(machine, "SERVICE") << 8; + workram[0x01e8/2] = input_port_read(machine, "P1") << 8; + workram[0x01ea/2] = input_port_read(machine, "P2") << 8; } @@ -1533,7 +1536,7 @@ static void wrestwar_i8751_sim(running_machine *machine) } /* read inputs */ - workram[0x2082/2] = input_port_read_indexed(machine, 0); + workram[0x2082/2] = input_port_read(machine, "SERVICE"); } diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c index 4d661917802..27312a9c1f9 100644 --- a/src/mame/drivers/segas24.c +++ b/src/mame/drivers/segas24.c @@ -508,21 +508,22 @@ static WRITE16_HANDLER( fdc_ctrl_w ) static UINT8 hotrod_io_r(running_machine *machine, int port) { - switch(port) { + switch(port) + { case 0: - return input_port_read_indexed(machine, 0); + return input_port_read(machine, "P1"); case 1: - return input_port_read_indexed(machine, 1); + return input_port_read(machine, "P2"); case 2: - return 0xff; + return input_port_read_safe(machine, "P3", 0xff); case 3: return 0xff; case 4: - return input_port_read_indexed(machine, 2); + return input_port_read(machine, "SERVICE"); case 5: // Dip switches - return input_port_read_indexed(machine, 3); + return input_port_read(machine, "COINAGE"); case 6: - return input_port_read_indexed(machine, 4); + return input_port_read(machine, "DSW"); case 7: // DAC return 0xff; } @@ -531,23 +532,25 @@ static UINT8 hotrod_io_r(running_machine *machine, int port) static UINT8 dcclub_io_r(running_machine *machine, int port) { - switch(port) { - case 0: { + switch(port) + { + case 0: + { static const UINT8 pos[16] = { 0, 1, 3, 2, 6, 4, 12, 8, 9 }; - return (input_port_read_indexed(machine, 0) & 0xf) | ((~pos[input_port_read_indexed(machine, 5)>>4]<<4) & 0xf0); + return (input_port_read(machine, "P1") & 0xf) | ((~pos[input_port_read(machine, "PADDLE")>>4]<<4) & 0xf0); } case 1: - return input_port_read_indexed(machine, 1); + return input_port_read(machine, "P2"); case 2: return 0xff; case 3: return 0xff; case 4: - return input_port_read_indexed(machine, 2); + return input_port_read(machine, "SERVICE"); case 5: // Dip switches - return input_port_read_indexed(machine, 3); + return input_port_read(machine, "COINAGE"); case 6: - return input_port_read_indexed(machine, 4); + return input_port_read(machine, "DSW"); case 7: // DAC return 0xff; } @@ -558,44 +561,24 @@ static int cur_input_line; static UINT8 mahmajn_io_r(running_machine *machine, int port) { - switch(port) { + static const char *keynames[] = { "MJ0", "MJ1", "MJ2", "MJ3", "MJ4", "MJ5", "P1", "P2" }; + + switch(port) + { case 0: return ~(1 << cur_input_line); case 1: return 0xff; case 2: - return input_port_read_indexed(machine, cur_input_line); - case 3: - return 0xff; - case 4: - return input_port_read_indexed(machine, 8); - case 5: // Dip switches - return input_port_read_indexed(machine, 9); - case 6: - return input_port_read_indexed(machine, 10); - case 7: // DAC - return 0xff; - } - return 0x00; -} - -static UINT8 gground_io_r(running_machine *machine, int port) -{ - switch(port) { - case 0: - return input_port_read_indexed(machine, 0); - case 1: - return input_port_read_indexed(machine, 1); - case 2: // P3 inputs - return input_port_read_indexed(machine, 2); + return input_port_read(machine, keynames[cur_input_line]); case 3: return 0xff; case 4: - return input_port_read_indexed(machine, 3); + return input_port_read(machine, "SERVICE"); case 5: // Dip switches - return input_port_read_indexed(machine, 4); + return input_port_read(machine, "COINAGE"); case 6: - return input_port_read_indexed(machine, 5); + return input_port_read(machine, "DSW"); case 7: // DAC return 0xff; } @@ -604,7 +587,8 @@ static UINT8 gground_io_r(running_machine *machine, int port) static void mahmajn_io_w(running_machine *machine, int port, UINT8 data) { - switch(port) { + switch(port) + { case 3: if(data & 4) cur_input_line = (cur_input_line + 1) & 7; @@ -619,7 +603,8 @@ static void mahmajn_io_w(running_machine *machine, int port, UINT8 data) static void hotrod_io_w(running_machine *machine, int port, UINT8 data) { - switch(port) { + switch(port) + { case 3: // Lamps break; case 7: // DAC @@ -634,39 +619,46 @@ static UINT8 hotrod_ctrl_cur; static WRITE16_HANDLER( hotrod3_ctrl_w ) { - if(ACCESSING_BITS_0_7) { + static const char *portnames[] = { "PEDAL1", "PEDAL2", "PEDAL3", "PEDAL4" }; + + if(ACCESSING_BITS_0_7) + { data &= 3; - hotrod_ctrl_cur = input_port_read_indexed(machine, 9+data); + hotrod_ctrl_cur = input_port_read_safe(machine, portnames[data], 0); } } static READ16_HANDLER( hotrod3_ctrl_r ) { - if(ACCESSING_BITS_0_7) { - switch(offset) { + if(ACCESSING_BITS_0_7) + { + switch(offset) + { // Steering dials - case 0: - return input_port_read_indexed(machine, 5) & 0xff; - case 1: - return input_port_read_indexed(machine, 5) >> 8; - case 2: - return input_port_read_indexed(machine, 6) & 0xff; - case 3: - return input_port_read_indexed(machine, 6) >> 8; - case 4: - return input_port_read_indexed(machine, 7) & 0xff; - case 5: - return input_port_read_indexed(machine, 7) >> 8; - case 6: - return input_port_read_indexed(machine, 8) & 0xff; - case 7: - return input_port_read_indexed(machine, 8) >> 8; - - case 8: { // Serial ADCs for the accel - int v = hotrod_ctrl_cur & 0x80; - hotrod_ctrl_cur <<= 1; - return v ? 0xff : 0; - } + case 0: + return input_port_read_safe(machine, "DIAL1", 0) & 0xff; + case 1: + return input_port_read_safe(machine, "DIAL1", 0) >> 8; + case 2: + return input_port_read_safe(machine, "DIAL2", 0) & 0xff; + case 3: + return input_port_read_safe(machine, "DIAL2", 0) >> 8; + case 4: + return input_port_read_safe(machine, "DIAL3", 0) & 0xff; + case 5: + return input_port_read_safe(machine, "DIAL3", 0) >> 8; + case 6: + return input_port_read_safe(machine, "DIAL4", 0) & 0xff; + case 7: + return input_port_read_safe(machine, "DIAL4", 0) >> 8; + + case 8: + { + // Serial ADCs for the accel + int v = hotrod_ctrl_cur & 0x80; + hotrod_ctrl_cur <<= 1; + return v ? 0xff : 0; + } } } return 0; @@ -1105,14 +1097,14 @@ static DRIVER_INIT(dcclub) static DRIVER_INIT(qrouka) { - system24temp_sys16_io_set_callbacks(gground_io_r, hotrod_io_w, resetcontrol_w, iod_r, iod_w); + system24temp_sys16_io_set_callbacks(hotrod_io_r, hotrod_io_w, resetcontrol_w, iod_r, iod_w); mlatch_table = qrouka_mlt; track_size = 0; } static DRIVER_INIT(quizmeku) { - system24temp_sys16_io_set_callbacks(gground_io_r, hotrod_io_w, resetcontrol_w, iod_r, iod_w); + system24temp_sys16_io_set_callbacks(hotrod_io_r, hotrod_io_w, resetcontrol_w, iod_r, iod_w); mlatch_table = quizmeku_mlt; track_size = 0; } @@ -1196,8 +1188,6 @@ static DRIVER_INIT(dcclubfd) } - - static DRIVER_INIT(sgmast) { system24temp_sys16_io_set_callbacks(hotrod_io_r, hotrod_io_w, resetcontrol_w, iod_r, iod_w); @@ -1217,7 +1207,7 @@ static DRIVER_INIT(qsww) static DRIVER_INIT(gground) { - system24temp_sys16_io_set_callbacks(gground_io_r, hotrod_io_w, resetcontrol_w, iod_r, iod_w); + system24temp_sys16_io_set_callbacks(hotrod_io_r, hotrod_io_w, resetcontrol_w, iod_r, iod_w); mlatch_table = 0; track_size = 0x2d00; s24_fd1094_driver_init(machine); @@ -1426,28 +1416,28 @@ static INPUT_PORTS_START( hotrod ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("DIAL1") PORT_BIT( 0xfff, 0x000, IPT_DIAL ) PORT_MINMAX(0x000,0xfff) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1) - PORT_START + PORT_START_TAG("DIAL2") PORT_BIT( 0xfff, 0x000, IPT_DIAL ) PORT_MINMAX(0x000,0xfff) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(2) - PORT_START + PORT_START_TAG("DIAL3") PORT_BIT( 0xfff, 0x000, IPT_DIAL ) PORT_MINMAX(0x000,0xfff) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(3) - PORT_START + PORT_START_TAG("DIAL4") PORT_BIT( 0xfff, 0x000, IPT_DIAL ) PORT_MINMAX(0x000,0xfff) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(4) - PORT_START + PORT_START_TAG("PEDAL1") PORT_BIT( 0xff, 0x01, IPT_PEDAL ) PORT_MINMAX(0x01,0xff) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1) - PORT_START + PORT_START_TAG("PEDAL2") PORT_BIT( 0xff, 0x01, IPT_PEDAL ) PORT_MINMAX(0x01,0xff) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(2) - PORT_START + PORT_START_TAG("PEDAL3") PORT_BIT( 0xff, 0x01, IPT_PEDAL ) PORT_MINMAX(0x01,0xff) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(3) - PORT_START + PORT_START_TAG("PEDAL4") PORT_BIT( 0xff, 0x01, IPT_PEDAL ) PORT_MINMAX(0x01,0xff) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(4) INPUT_PORTS_END @@ -1537,10 +1527,10 @@ static INPUT_PORTS_START( roughrac ) PORT_DIPSETTING( 0x80, "10" ) PORT_DIPSETTING( 0x00, "15" ) - PORT_START + PORT_START_TAG("DIAL1") PORT_BIT( 0xfff, 0x000, IPT_DIAL ) PORT_MINMAX(0x000,0xfff) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1) - PORT_START + PORT_START_TAG("DIAL2") PORT_BIT( 0xfff, 0x000, IPT_DIAL ) PORT_MINMAX(0x000,0xfff) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(2) INPUT_PORTS_END @@ -1652,7 +1642,7 @@ static INPUT_PORTS_START( dcclub ) /* In the Japan set missing angle input */ PORT_DIPSETTING( 0x40, DEF_STR( Hard ) ) PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) - PORT_START + PORT_START_TAG("PADDLE") PORT_BIT( 0xff, 0x00, IPT_PADDLE ) PORT_MINMAX(0x00,0x8f) PORT_SENSITIVITY(64) PORT_KEYDELTA(64) PORT_PLAYER(1) INPUT_PORTS_END @@ -1702,7 +1692,7 @@ static INPUT_PORTS_START( sgmastj ) PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("DIAL1") PORT_BIT( 0xfff, 0x000, IPT_DIAL ) PORT_MINMAX(0x000,0xfff) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(2) INPUT_PORTS_END diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c index c0c93fdb5e6..7828d33ed09 100644 --- a/src/mame/drivers/segas32.c +++ b/src/mame/drivers/segas32.c @@ -586,6 +586,11 @@ static INTERRUPT_GEN( start_of_vblank_int ) static UINT16 common_io_chip_r(running_machine *machine, int which, offs_t offset, UINT16 mem_mask) { + static const char *const portnames[2][8] = + { + { "P1_A", "P2_A", "PORTC_A", "PORTD_A", "SERVICE12_A", "SERVICE34_A", "PORTG_A", "PORTH_A" }, + { "P1_B", "P2_B", "PORTC_B", "PORTD_B", "SERVICE12_B", "SERVICE34_B", "PORTG_B", "PORTH_B" }, + }; offset &= 0x1f/2; switch (offset) @@ -604,7 +609,7 @@ static UINT16 common_io_chip_r(running_machine *machine, int which, offs_t offse return misc_io_data[which][offset]; /* otherwise, return an input port */ - return input_port_read_indexed(machine, which*8 + offset); + return input_port_read_safe(machine, portnames[which][offset], 0xffff); /* 'SEGA' protection */ case 0x10/2: @@ -1294,7 +1299,7 @@ ADDRESS_MAP_END *************************************/ static INPUT_PORTS_START( system32_generic ) - PORT_START_TAG("P1") + PORT_START_TAG("P1_A") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) @@ -1304,7 +1309,7 @@ static INPUT_PORTS_START( system32_generic ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY - PORT_START_TAG("P2") + PORT_START_TAG("P2_A") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) @@ -1314,13 +1319,13 @@ static INPUT_PORTS_START( system32_generic ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) - PORT_START_TAG("PORTC") + PORT_START_TAG("PORTC_A") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("PORTD") + PORT_START_TAG("PORTD_A") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("SERVICE12") + PORT_START_TAG("SERVICE12_A") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) @@ -1329,54 +1334,23 @@ static INPUT_PORTS_START( system32_generic ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("SERVICE34") + PORT_START_TAG("SERVICE34_A") PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE3 ) /* sometimes mirrors SERVICE1 */ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE4 ) /* tends to also work as a test switch */ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(eeprom_bit_r, NULL) - PORT_START_TAG("PORTG") + PORT_START_TAG("PORTG_A") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("PORTH") + PORT_START_TAG("PORTH_A") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END static INPUT_PORTS_START( multi32_generic ) - PORT_START_TAG("P1_A") - PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START_TAG("P2_A") - PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START_TAG("PORTC_A") - PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START_TAG("PORTD_A") - PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START_TAG("SERVICE12_A") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW ) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START_TAG("SERVICE34_A") - PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE3 ) /* sometimes mirrors SERVICE1 */ - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE4 ) /* tends to also work as a test switch */ - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START_TAG("PORTG_A") - PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START_TAG("PORTH_A") - PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_INCLUDE( system32_generic ) PORT_START_TAG("P1_B") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -1420,16 +1394,16 @@ INPUT_PORTS_END static INPUT_PORTS_START( arescue ) PORT_INCLUDE( system32_generic ) - PORT_MODIFY("P1") + PORT_MODIFY("P1_A") PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("P2") + PORT_MODIFY("P2_A") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("SERVICE12") + PORT_MODIFY("SERVICE12_A") PORT_BIT( 0x38, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("SERVICE34") + PORT_MODIFY("SERVICE34_A") PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START_TAG("ANALOG1") @@ -1446,13 +1420,13 @@ INPUT_PORTS_END static INPUT_PORTS_START( alien3 ) PORT_INCLUDE( system32_generic ) - PORT_MODIFY("P1") + PORT_MODIFY("P1_A") PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("P2") + PORT_MODIFY("P2_A") PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("SERVICE12") + PORT_MODIFY("SERVICE12_A") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE2 ) @@ -1475,10 +1449,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( arabfgt ) PORT_INCLUDE( system32_generic ) - PORT_MODIFY("P1") + PORT_MODIFY("P1_A") PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("P2") + PORT_MODIFY("P2_A") PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START_TAG("EXTRA1") @@ -1508,7 +1482,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( arabfgtu ) PORT_INCLUDE( arabfgt ) - PORT_MODIFY("SERVICE12") + PORT_MODIFY("SERVICE12_A") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN3 ) @@ -1521,10 +1495,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( brival ) PORT_INCLUDE( system32_generic ) - PORT_MODIFY("P1") + PORT_MODIFY("P1_A") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("P2") + PORT_MODIFY("P2_A") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START_TAG("EXTRA2") @@ -1542,12 +1516,12 @@ INPUT_PORTS_END static INPUT_PORTS_START( darkedge ) PORT_INCLUDE( system32_generic ) - PORT_MODIFY("P1") + PORT_MODIFY("P1_A") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) - PORT_MODIFY("P2") + PORT_MODIFY("P2_A") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) @@ -1572,19 +1546,19 @@ INPUT_PORTS_END static INPUT_PORTS_START( f1en ) PORT_INCLUDE( system32_generic ) - PORT_MODIFY("P1") + PORT_MODIFY("P1_A") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_CODE(KEYCODE_SPACE) PORT_NAME("Gear Up") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_CODE(KEYCODE_LSHIFT) PORT_NAME("Gear Down") PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("P2") + PORT_MODIFY("P2_A") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("SERVICE12") + PORT_MODIFY("SERVICE12_A") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("SERVICE34") + PORT_MODIFY("SERVICE34_A") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1613,7 +1587,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( f1lap ) PORT_INCLUDE( f1en ) - PORT_MODIFY("P1") + PORT_MODIFY("P1_A") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_CODE(KEYCODE_SPACE) PORT_NAME("Gear Up") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_CODE(KEYCODE_LSHIFT) PORT_NAME("Gear Down") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_CODE(KEYCODE_Z) @@ -1652,7 +1626,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( ga2u ) PORT_INCLUDE( ga2 ) - PORT_MODIFY("SERVICE12") + PORT_MODIFY("SERVICE12_A") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN3 ) @@ -1745,10 +1719,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( holo ) PORT_INCLUDE( system32_generic ) - PORT_MODIFY("P1") + PORT_MODIFY("P1_A") PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("P2") + PORT_MODIFY("P2_A") PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END @@ -1756,10 +1730,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( jpark ) PORT_INCLUDE( system32_generic ) - PORT_MODIFY("P1") + PORT_MODIFY("P1_A") PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("P2") + PORT_MODIFY("P2_A") PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START_TAG("ANALOG1") @@ -1824,20 +1798,20 @@ INPUT_PORTS_END static INPUT_PORTS_START( radm ) PORT_INCLUDE( system32_generic ) - PORT_MODIFY("P1") + PORT_MODIFY("P1_A") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_CODE(KEYCODE_SPACE) PORT_NAME("Light") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_CODE(KEYCODE_LSHIFT) PORT_NAME("Wiper") PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("P2") + PORT_MODIFY("P2_A") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("SERVICE12") + PORT_MODIFY("SERVICE12_A") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("SERVICE34") + PORT_MODIFY("SERVICE34_A") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1866,18 +1840,18 @@ INPUT_PORTS_END static INPUT_PORTS_START( radr ) PORT_INCLUDE( system32_generic ) - PORT_MODIFY("P1") + PORT_MODIFY("P1_A") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_CODE(KEYCODE_SPACE) PORT_NAME("Gear Change") PORT_TOGGLE PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("P2") + PORT_MODIFY("P2_A") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("SERVICE12") + PORT_MODIFY("SERVICE12_A") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("SERVICE34") + PORT_MODIFY("SERVICE34_A") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1935,18 +1909,18 @@ INPUT_PORTS_END static INPUT_PORTS_START( slipstrm ) PORT_INCLUDE( system32_generic ) - PORT_MODIFY("P1") + PORT_MODIFY("P1_A") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_CODE(KEYCODE_SPACE) PORT_NAME("Gear Change") PORT_TOGGLE PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("P2") + PORT_MODIFY("P2_A") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("SERVICE12") + PORT_MODIFY("SERVICE12_A") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("SERVICE34") + PORT_MODIFY("SERVICE34_A") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1975,15 +1949,15 @@ INPUT_PORTS_END static INPUT_PORTS_START( sonic ) PORT_INCLUDE( system32_generic ) - PORT_MODIFY("P1") + PORT_MODIFY("P1_A") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("P2") + PORT_MODIFY("P2_A") PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("SERVICE12") + PORT_MODIFY("SERVICE12_A") PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 ) @@ -2010,10 +1984,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( spidman ) PORT_INCLUDE( system32_generic ) - PORT_MODIFY("P1") + PORT_MODIFY("P1_A") PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_MODIFY("P2") + PORT_MODIFY("P2_A") PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START_TAG("EXTRA1") @@ -2044,7 +2018,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( spidmanu ) PORT_INCLUDE( spidman ) - PORT_MODIFY("SERVICE12") + PORT_MODIFY("SERVICE12_A") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN3 ) diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c index b212e6ccb2e..271eb1f5fb9 100644 --- a/src/mame/drivers/segaxbd.c +++ b/src/mame/drivers/segaxbd.c @@ -289,11 +289,11 @@ static READ16_HANDLER( iochip_0_r ) D6: /INTR of ADC0804 D5-D0: CN C pin 24-19 (switch state 0= open, 1= closed) */ - return iochip_r(0, 0, input_port_read_indexed(machine, 0)); + return iochip_r(0, 0, input_port_read(machine, "IO0PORTA")); case 1: /* I/O port: CN C pins 17,15,13,11,9,7,5,3 */ - return iochip_r(0, 1, input_port_read_indexed(machine, 1)); + return iochip_r(0, 1, input_port_read(machine, "IO0PORTB")); case 2: /* Output port */ @@ -364,19 +364,19 @@ static READ16_HANDLER( iochip_1_r ) { case 0: /* Input port: switches, CN D pin A1-8 (switch state 1= open, 0= closed) */ - return iochip_r(1, 0, input_port_read_indexed(machine, 2)); + return iochip_r(1, 0, input_port_read(machine, "IO1PORTA")); case 1: /* Input port: switches, CN D pin A9-16 (switch state 1= open, 0= closed) */ - return iochip_r(1, 1, input_port_read_indexed(machine, 3)); + return iochip_r(1, 1, input_port_read(machine, "IO1PORTB")); case 2: /* Input port: DIP switches (1= off, 0= on) */ - return iochip_r(1, 2, input_port_read_indexed(machine, 4)); + return iochip_r(1, 2, input_port_read(machine, "IO1PORTC")); case 3: /* Input port: DIP switches (1= off, 0= on) */ - return iochip_r(1, 3, input_port_read_indexed(machine, 5)); + return iochip_r(1, 3, input_port_read(machine, "IO1PORTD")); case 4: /* Unused */ diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c index 5e3746df641..8a13720446c 100644 --- a/src/mame/drivers/segaybd.c +++ b/src/mame/drivers/segaybd.c @@ -237,6 +237,7 @@ static READ8_HANDLER( sound_data_r ) static READ16_HANDLER( io_chip_r ) { + static const char *portnames[] = { "P1", "GENERAL", "PORTC", "PORTD", "PORTE", "DSW", "COINAGE", "PORTH" }; offset &= 0x1f/2; switch (offset) @@ -255,7 +256,7 @@ static READ16_HANDLER( io_chip_r ) return misc_io_data[offset]; /* otherwise, return an input port */ - return input_port_read_indexed(machine, offset); + return input_port_read(machine, portnames[offset]); /* 'SEGA' protection */ case 0x10/2: diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c index 3844a9c5490..f8724327563 100644 --- a/src/mame/drivers/seibuspi.c +++ b/src/mame/drivers/seibuspi.c @@ -890,16 +890,18 @@ logerror("z80 data = %08x mask = %08x\n",data,mem_mask); static READ32_HANDLER( spi_controls1_r ) { - if( ACCESSING_BITS_0_7 ) { - return (input_port_read_indexed(machine, 1) << 8) | input_port_read_indexed(machine, 0) | 0xffff0000; + if( ACCESSING_BITS_0_7 ) + { + return (input_port_read(machine, "P2") << 8) | input_port_read(machine, "P1") | 0xffff0000; } return 0xffffffff; } static READ32_HANDLER( spi_controls2_r ) { - if( ACCESSING_BITS_0_7 ) { - return ((input_port_read_indexed(machine, 2) | 0xffffff00) & ~0x40) | (eeprom_read_bit() << 6); + if( ACCESSING_BITS_0_7 ) + { + return ((input_port_read(machine, "SYSTEM") | 0xffffff00) & ~0x40) | (eeprom_read_bit() << 6); } return 0xffffffff; } @@ -963,12 +965,12 @@ static WRITE8_HANDLER( z80_bank_w ) static READ8_HANDLER( z80_jp1_r ) { - return input_port_read_indexed(machine, 3); + return input_port_read(machine, "JP1"); } static READ8_HANDLER( z80_coin_r ) { - return input_port_read_indexed(machine, 4); + return input_port_read(machine, "COIN"); } static READ32_HANDLER( soundrom_r ) @@ -1117,7 +1119,7 @@ ADDRESS_MAP_END /********************************************************************/ static INPUT_PORTS_START( spi_2button ) - PORT_START_TAG("IN0") + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -1126,7 +1128,8 @@ static INPUT_PORTS_START( spi_2button ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("IN1") + + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -1136,7 +1139,7 @@ static INPUT_PORTS_START( spi_2button ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("IN2") + PORT_START_TAG("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW) /* Test Button */ @@ -1150,14 +1153,14 @@ static INPUT_PORTS_START( spi_2button ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("IN3") + PORT_START_TAG("COIN") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END static INPUT_PORTS_START( spi_3button ) - PORT_START_TAG("IN0") + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -1166,7 +1169,8 @@ static INPUT_PORTS_START( spi_3button ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("IN1") + + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -1176,7 +1180,7 @@ static INPUT_PORTS_START( spi_3button ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("IN2") + PORT_START_TAG("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW ) @@ -1190,14 +1194,14 @@ static INPUT_PORTS_START( spi_3button ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("IN3") + PORT_START_TAG("COIN") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END static INPUT_PORTS_START( seibu386_2button ) - PORT_START_TAG("IN0") + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -1206,7 +1210,8 @@ static INPUT_PORTS_START( seibu386_2button ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("IN1") + + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -1216,7 +1221,7 @@ static INPUT_PORTS_START( seibu386_2button ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("IN2") + PORT_START_TAG("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW) /* Test Button */ @@ -1270,13 +1275,13 @@ static CUSTOM_INPUT( ejanhs_encode ) } static INPUT_PORTS_START( spi_ejanhs ) - PORT_START_TAG("IN0") + PORT_START_TAG("P1") PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(ejanhs_encode, "IN0BITS") - PORT_START_TAG("IN1") + PORT_START_TAG("P2") PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(ejanhs_encode, "IN1BITS") - PORT_START_TAG("IN2") + PORT_START_TAG("SYSTEM") PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service Coin") PORT_CODE(KEYCODE_7) PORT_BIT( 0xf3, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1288,7 +1293,7 @@ static INPUT_PORTS_START( spi_ejanhs ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("IN3") + PORT_START_TAG("COIN") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -1957,7 +1962,7 @@ static READ32_HANDLER ( rfjet_speedup_r ) cpu_spinuntil_int(); // idle // Hack to enter test mode r = spimainram[(0x002894c-0x800)/4] & (~0x400); - return r | (((input_port_read_indexed(machine, 2) ^ 0xFF)<<8) & 0x400); + return r | (((input_port_read(machine, "SYSTEM") ^ 0xff)<<8) & 0x400); } /* rfjetj */ diff --git a/src/mame/drivers/seicross.c b/src/mame/drivers/seicross.c index 91c7dd6e14e..9ea212f7955 100644 --- a/src/mame/drivers/seicross.c +++ b/src/mame/drivers/seicross.c @@ -91,7 +91,7 @@ static MACHINE_RESET( friskyt ) static READ8_HANDLER( friskyt_portB_r ) { - return (portb & 0x9f) | (input_port_read_indexed(machine, 6) & 0x60); + return (portb & 0x9f) | (input_port_read_safe(machine, "DEBUG", 0) & 0x60); } static WRITE8_HANDLER( friskyt_portB_w ) @@ -123,9 +123,9 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9800, 0x981f) AM_RAM AM_BASE(&seicross_row_scroll) AM_RANGE(0x9880, 0x989f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram_2) AM_SIZE(&spriteram_2_size) AM_RANGE(0x9c00, 0x9fff) AM_RAM_WRITE(seicross_colorram_w) AM_BASE(&colorram) - AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r) /* IN0 */ - AM_RANGE(0xa800, 0xa800) AM_READ(input_port_1_r) /* IN1 */ - AM_RANGE(0xb000, 0xb000) AM_READ(input_port_2_r) /* test */ + AM_RANGE(0xa000, 0xa000) AM_READ_PORT("IN0") /* IN0 */ + AM_RANGE(0xa800, 0xa800) AM_READ_PORT("IN1") /* IN1 */ + AM_RANGE(0xb000, 0xb000) AM_READ_PORT("TEST") /* test */ AM_RANGE(0xb800, 0xb800) AM_READ(watchdog_reset_r) ADDRESS_MAP_END @@ -150,9 +150,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mcu_no_nvram_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x007f) AM_RAM - AM_RANGE(0x1003, 0x1003) AM_READ(input_port_3_r) /* DSW1 */ - AM_RANGE(0x1005, 0x1005) AM_READ(input_port_4_r) /* DSW2 */ - AM_RANGE(0x1006, 0x1006) AM_READ(input_port_5_r) /* DSW3 */ + AM_RANGE(0x1003, 0x1003) AM_READ_PORT("DSW1") /* DSW1 */ + AM_RANGE(0x1005, 0x1005) AM_READ_PORT("DSW2") /* DSW2 */ + AM_RANGE(0x1006, 0x1006) AM_READ_PORT("DSW3") /* DSW3 */ AM_RANGE(0x2000, 0x2000) AM_WRITE(DAC_0_data_w) AM_RANGE(0x8000, 0xf7ff) AM_ROM AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE(1) @@ -162,7 +162,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( friskyt ) - PORT_START /* IN0 */ + PORT_START_TAG("IN0") /* IN0 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY @@ -172,7 +172,7 @@ static INPUT_PORTS_START( friskyt ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 ) - PORT_START /* IN1 */ + PORT_START_TAG("IN1") /* IN1 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL @@ -184,7 +184,7 @@ static INPUT_PORTS_START( friskyt ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x80, DEF_STR( On ) ) - PORT_START /* Test */ + PORT_START_TAG("TEST") /* Test */ PORT_DIPNAME( 0x01, 0x00, "Test Mode" ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x01, DEF_STR( On ) ) @@ -195,7 +195,7 @@ static INPUT_PORTS_START( friskyt ) INPUT_PORTS_END static INPUT_PORTS_START( radrad ) - PORT_START /* IN0 */ + PORT_START_TAG("IN0") /* IN0 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY @@ -205,7 +205,7 @@ static INPUT_PORTS_START( radrad ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 ) - PORT_START /* IN1 */ + PORT_START_TAG("IN1") /* IN1 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL @@ -215,12 +215,12 @@ static INPUT_PORTS_START( radrad ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_START /* Test */ + PORT_START_TAG("TEST") /* Test */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */ - PORT_START /* DSW1 */ + PORT_START_TAG("DSW1") /* DSW1 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) ) PORT_DIPSETTING( 0x01, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) ) @@ -234,7 +234,7 @@ static INPUT_PORTS_START( radrad ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START /* DSW2 */ + PORT_START_TAG("DSW2") /* DSW2 */ PORT_DIPNAME( 0x0f, 0x01, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x07, DEF_STR( 7C_1C ) ) PORT_DIPSETTING( 0x06, DEF_STR( 6C_1C ) ) @@ -253,7 +253,7 @@ static INPUT_PORTS_START( radrad ) PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) ) PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START /* DSW3 */ + PORT_START_TAG("DSW3") /* DSW3 */ PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_B ) ) PORT_DIPSETTING( 0x08, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x09, DEF_STR( 2C_2C ) ) @@ -275,7 +275,7 @@ static INPUT_PORTS_START( radrad ) INPUT_PORTS_END static INPUT_PORTS_START( seicross ) - PORT_START /* IN0 */ + PORT_START_TAG("IN0") /* IN0 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY @@ -285,7 +285,7 @@ static INPUT_PORTS_START( seicross ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 ) - PORT_START /* IN1 */ + PORT_START_TAG("IN1") /* IN1 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL @@ -295,14 +295,14 @@ static INPUT_PORTS_START( seicross ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL - PORT_START /* Test */ + PORT_START_TAG("TEST") /* Test */ PORT_SERVICE( 0x01, IP_ACTIVE_HIGH ) PORT_DIPNAME( 0x02, 0x00, "Connection Error" ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x02, DEF_STR( On ) ) PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* probably unused */ - PORT_START /* DSW1 */ + PORT_START_TAG("DSW1") /* DSW1 */ PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x01, DEF_STR( On ) ) @@ -316,7 +316,7 @@ static INPUT_PORTS_START( seicross ) PORT_DIPSETTING( 0x0c, "30000 60000 90000" ) PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START /* DSW2 */ + PORT_START_TAG("DSW2") /* DSW2 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) ) PORT_DIPSETTING( 0x01, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) ) @@ -330,7 +330,7 @@ static INPUT_PORTS_START( seicross ) PORT_DIPSETTING( 0x0c, "5" ) PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START /* DSW3 */ + PORT_START_TAG("DSW3") /* DSW3 */ PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_B ) ) PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) ) @@ -343,7 +343,7 @@ static INPUT_PORTS_START( seicross ) PORT_DIPSETTING( 0x0c, DEF_STR( 1C_6C ) ) PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START /* Debug */ + PORT_START_TAG("DEBUG") /* Debug */ PORT_BIT( 0x1f, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_DIPNAME( 0x20, 0x20, "Debug Mode" ) PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) diff --git a/src/mame/drivers/sengokmj.c b/src/mame/drivers/sengokmj.c index b244cf0c865..96e9d656e6b 100644 --- a/src/mame/drivers/sengokmj.c +++ b/src/mame/drivers/sengokmj.c @@ -67,12 +67,12 @@ static READ16_HANDLER( mahjong_panel_r ) { switch(sengokumj_mux_data) { - case 1: return input_port_read_indexed(machine, 2); - case 2: return input_port_read_indexed(machine, 3); - case 4: return input_port_read_indexed(machine, 4); - case 8: return input_port_read_indexed(machine, 5); - case 0x10: return input_port_read_indexed(machine, 6); - case 0x20: return input_port_read_indexed(machine, 7); + case 1: return input_port_read(machine, "KEY0"); + case 2: return input_port_read(machine, "KEY1"); + case 4: return input_port_read(machine, "KEY2"); + case 8: return input_port_read(machine, "KEY3"); + case 0x10: return input_port_read(machine, "KEY4"); + case 0x20: return input_port_read(machine, "UNUSED"); } return 0xffff; @@ -130,16 +130,16 @@ static ADDRESS_MAP_START( sengokmj_io_map, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x8080, 0x8081) AM_WRITENOP // ? AM_RANGE(0x80c0, 0x80c1) AM_WRITENOP // ? AM_RANGE(0x8140, 0x8141) AM_WRITE(mahjong_panel_w) - AM_RANGE(0xc000, 0xc001) AM_READ(input_port_1_word_r) + AM_RANGE(0xc000, 0xc001) AM_READ_PORT("DSW1") AM_RANGE(0xc002, 0xc003) AM_READ(mahjong_panel_r) - AM_RANGE(0xc004, 0xc005) AM_READ(input_port_8_word_r) + AM_RANGE(0xc004, 0xc005) AM_READ_PORT("DSW2") ADDRESS_MAP_END static INPUT_PORTS_START( sengokmj ) SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */ - PORT_START + PORT_START_TAG("DSW1") PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -166,7 +166,7 @@ static INPUT_PORTS_START( sengokmj ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + 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 ) @@ -176,7 +176,7 @@ static INPUT_PORTS_START( sengokmj ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + 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 ) @@ -186,7 +186,7 @@ static INPUT_PORTS_START( sengokmj ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + 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 ) @@ -196,7 +196,7 @@ static INPUT_PORTS_START( sengokmj ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + 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 ) @@ -206,7 +206,7 @@ static INPUT_PORTS_START( sengokmj ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + 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 ) @@ -216,10 +216,10 @@ static INPUT_PORTS_START( sengokmj ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + PORT_START_TAG("UNUSED") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + PORT_START_TAG("DSW2") PORT_DIPNAME( 0x0001, 0x0001, "Door" ) PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c index 09386c7a5d4..f330ca85548 100644 --- a/src/mame/drivers/seta.c +++ b/src/mame/drivers/seta.c @@ -1522,7 +1522,7 @@ static WRITE16_HANDLER( sub_ctrl_w ) /* DSW reading for 16 bit CPUs */ static READ16_HANDLER( seta_dsw_r ) { - UINT16 dsw = input_port_read_indexed(machine, 3); + UINT16 dsw = input_port_read(machine, "DSW"); if (offset == 0) return (dsw >> 8) & 0xff; else return (dsw >> 0) & 0xff; } @@ -1532,12 +1532,12 @@ static READ16_HANDLER( seta_dsw_r ) static READ8_HANDLER( dsw1_r ) { - return (input_port_read_indexed(machine, 3) >> 8) & 0xff; + return (input_port_read(machine, "DSW") >> 8) & 0xff; } static READ8_HANDLER( dsw2_r ) { - return (input_port_read_indexed(machine, 3) >> 0) & 0xff; + return (input_port_read(machine, "DSW") >> 0) & 0xff; } @@ -1621,7 +1621,7 @@ static ADDRESS_MAP_START( downtown_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x09ffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x100000, 0x103fff) AM_READ(seta_sound_word_r ) // Sound AM_RANGE(0x200000, 0x200001) AM_READ(SMH_NOP ) // watchdog? (twineagl) - AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW + AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW AM_RANGE(0x700000, 0x7003ff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0x900000, 0x901fff) AM_READ(SMH_RAM ) // VRAM AM_RANGE(0x902000, 0x903fff) AM_READ(SMH_RAM ) // VRAM @@ -1635,7 +1635,7 @@ static ADDRESS_MAP_START( downtown_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x09ffff) AM_WRITE(SMH_ROM ) // ROM AM_RANGE(0x100000, 0x103fff) AM_WRITE(seta_sound_word_w ) // Sound AM_RANGE(0x200000, 0x200001) AM_WRITE(SMH_NOP ) // watchdog? - AM_RANGE(0x300000, 0x300001) AM_WRITE(SMH_NOP ) // IRQ enable/acknowledge? + AM_RANGE(0x300000, 0x300001) AM_WRITE(SMH_NOP ) // IRQ enable/acknowledge? AM_RANGE(0x400000, 0x400007) AM_WRITE(twineagl_tilebank_w ) // special tile banking to animate water in twineagl AM_RANGE(0x500000, 0x500001) AM_WRITE(SMH_NOP ) // ? AM_RANGE(0x700000, 0x7003ff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16 ) AM_SIZE(&seta_paletteram_size) // Palette @@ -1656,15 +1656,15 @@ ADDRESS_MAP_END static READ16_HANDLER ( calibr50_ip_r ) { - int dir1 = input_port_read(machine, "IN4") & 0xfff; // analog port - int dir2 = input_port_read(machine, "IN5") & 0xfff; // analog port + int dir1 = input_port_read(machine, "ROT1") & 0xfff; // analog port + int dir2 = input_port_read(machine, "ROT2") & 0xfff; // analog port switch (offset) { - case 0x00/2: return input_port_read(machine, "IN0"); // p1 - case 0x02/2: return input_port_read(machine, "IN1"); // p2 + case 0x00/2: return input_port_read(machine, "P1"); // p1 + case 0x02/2: return input_port_read(machine, "P2"); // p2 - case 0x08/2: return input_port_read_indexed(machine, 2); // Coins + case 0x08/2: return input_port_read(machine, "COINS"); // Coins case 0x10/2: return (dir1&0xff); // lower 8 bits of p1 rotation case 0x12/2: return (dir1>>8); // upper 4 bits of p1 rotation @@ -1693,8 +1693,8 @@ static ADDRESS_MAP_START( calibr50_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100000, 0x100007) AM_READ(SMH_NOP ) // ? (same as a00010-a00017?) AM_RANGE(0x200000, 0x200fff) AM_READ(SMH_RAM ) // NVRAM AM_RANGE(0x300000, 0x300001) AM_READ(SMH_NOP ) // ? (value's read but not used) - AM_RANGE(0x400000, 0x400001) AM_READ(watchdog_reset16_r ) // Watchdog - AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW + AM_RANGE(0x400000, 0x400001) AM_READ(watchdog_reset16_r ) // Watchdog + AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW AM_RANGE(0x700000, 0x7003ff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0x900000, 0x901fff) AM_READ(SMH_RAM ) // VRAM AM_RANGE(0x902000, 0x903fff) AM_READ(SMH_RAM ) // VRAM @@ -1702,7 +1702,7 @@ static ADDRESS_MAP_START( calibr50_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xa00000, 0xa00019) AM_READ(calibr50_ip_r ) // Input Ports /**/AM_RANGE(0xd00000, 0xd00607) AM_READ(SMH_RAM ) // Sprites Y AM_RANGE(0xe00000, 0xe03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr - AM_RANGE(0xb00000, 0xb00001) AM_READ(soundlatch2_word_r ) // From Sub CPU + AM_RANGE(0xb00000, 0xb00001) AM_READ(soundlatch2_word_r ) // From Sub CPU /**/AM_RANGE(0xc00000, 0xc00001) AM_READ(SMH_RAM ) // ? $4000 ADDRESS_MAP_END @@ -1825,12 +1825,12 @@ static ADDRESS_MAP_START( atehate_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x900000, 0x9fffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x100000, 0x103fff) AM_READ(seta_sound_word_r ) // Sound - AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW + AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW AM_RANGE(0x700000, 0x7003ff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0xa00000, 0xa00607) AM_READ(SMH_RAM ) // Sprites Y - AM_RANGE(0xb00000, 0xb00001) AM_READ(input_port_0_word_r ) // P1 - AM_RANGE(0xb00002, 0xb00003) AM_READ(input_port_1_word_r ) // P2 - AM_RANGE(0xb00004, 0xb00005) AM_READ(input_port_2_word_r ) // Coins + AM_RANGE(0xb00000, 0xb00001) AM_READ_PORT("P1") // P1 + AM_RANGE(0xb00002, 0xb00003) AM_READ_PORT("P2") // P2 + AM_RANGE(0xb00004, 0xb00005) AM_READ_PORT("COINS") // Coins /**/AM_RANGE(0xc00000, 0xc00001) AM_READ(SMH_RAM ) // ? 0x4000 AM_RANGE(0xe00000, 0xe03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr ADDRESS_MAP_END @@ -1858,10 +1858,10 @@ static ADDRESS_MAP_START( blandia_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x210000, 0x21ffff) AM_READ(SMH_RAM ) // RAM (gundhara) AM_RANGE(0x300000, 0x30ffff) AM_READ(SMH_RAM ) // RAM (wrofaero only?) AM_RANGE(0x500000, 0x500005) AM_READ(SMH_RAM ) // (gundhara) - AM_RANGE(0x400000, 0x400001) AM_READ(input_port_0_word_r ) // P1 - AM_RANGE(0x400002, 0x400003) AM_READ(input_port_1_word_r ) // P2 - AM_RANGE(0x400004, 0x400005) AM_READ(input_port_2_word_r ) // Coins - AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW + AM_RANGE(0x400000, 0x400001) AM_READ_PORT("P1") // P1 + AM_RANGE(0x400002, 0x400003) AM_READ_PORT("P2") // P2 + AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins + AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW AM_RANGE(0x700000, 0x7003ff) AM_READ(SMH_RAM ) // (rezon,jjsquawk) AM_RANGE(0x700400, 0x700fff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0x701000, 0x70ffff) AM_READ(SMH_RAM ) // @@ -1913,10 +1913,10 @@ static ADDRESS_MAP_START( blandiap_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x210000, 0x21ffff) AM_READ(SMH_RAM ) // RAM (gundhara) AM_RANGE(0x300000, 0x30ffff) AM_READ(SMH_RAM ) // RAM (wrofaero only?) AM_RANGE(0x500000, 0x500005) AM_READ(SMH_RAM ) // (gundhara) - AM_RANGE(0x400000, 0x400001) AM_READ(input_port_0_word_r ) // P1 - AM_RANGE(0x400002, 0x400003) AM_READ(input_port_1_word_r ) // P2 - AM_RANGE(0x400004, 0x400005) AM_READ(input_port_2_word_r ) // Coins - AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW + AM_RANGE(0x400000, 0x400001) AM_READ_PORT("P1") // P1 + AM_RANGE(0x400002, 0x400003) AM_READ_PORT("P2") // P2 + AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins + AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW AM_RANGE(0x700000, 0x7003ff) AM_READ(SMH_RAM ) // (rezon,jjsquawk) AM_RANGE(0x700400, 0x700fff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0x701000, 0x70ffff) AM_READ(SMH_RAM ) // @@ -1966,7 +1966,9 @@ static int gun_input_bit = 0, gun_input_src = 0; static READ16_HANDLER( zombraid_gun_r ) // Serial interface { - int data = input_port_read_indexed(machine, 4 + gun_input_src); // Input Ports 5-8 + static const char *portnames[] = { "GUNX1", "GUNY1", "GUNX2", "GUNY2" }; + + int data = input_port_read(machine, portnames[gun_input_src]); // Input Ports 5-8 return (data >> gun_input_bit) & 1; } @@ -2009,10 +2011,10 @@ static ADDRESS_MAP_START( wrofaero_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x210000, 0x21ffff) AM_READ(SMH_RAM ) // RAM (gundhara) AM_RANGE(0x300000, 0x30ffff) AM_READ(SMH_RAM ) // RAM (wrofaero only?) AM_RANGE(0x500000, 0x500005) AM_READ(SMH_RAM ) // (gundhara) - AM_RANGE(0x400000, 0x400001) AM_READ(input_port_0_word_r ) // P1 - AM_RANGE(0x400002, 0x400003) AM_READ(input_port_1_word_r ) // P2 - AM_RANGE(0x400004, 0x400005) AM_READ(input_port_2_word_r ) // Coins - AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW + AM_RANGE(0x400000, 0x400001) AM_READ_PORT("P1") // P1 + AM_RANGE(0x400002, 0x400003) AM_READ_PORT("P2") // P2 + AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins + AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW AM_RANGE(0x700000, 0x7003ff) AM_READ(SMH_RAM ) // (rezon,jjsquawk) AM_RANGE(0x700400, 0x700fff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0x701000, 0x70ffff) AM_READ(SMH_RAM ) // @@ -2065,11 +2067,11 @@ static ADDRESS_MAP_START( orbs_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xf00000, 0xf0ffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP ) // ? AM_RANGE(0x200000, 0x200001) AM_READ(SMH_NOP ) // ? - AM_RANGE(0x300000, 0x300003) AM_READ(seta_dsw_r ) // DSW - AM_RANGE(0x500000, 0x500001) AM_READ(input_port_0_word_r ) // P1 - AM_RANGE(0x500002, 0x500003) AM_READ(input_port_1_word_r ) // P2 - AM_RANGE(0x500004, 0x500005) AM_READ(input_port_2_word_r ) // Coins - //AM_RANGE(0x600000, 0x60000f) AM_READ(krzybowl_input_r ) // P1 + AM_RANGE(0x300000, 0x300003) AM_READ(seta_dsw_r ) // DSW + AM_RANGE(0x500000, 0x500001) AM_READ_PORT("P1") // P1 + AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P2") // P2 + AM_RANGE(0x500004, 0x500005) AM_READ_PORT("COINS") // Coins + //AM_RANGE(0x600000, 0x60000f) AM_READ(krzybowl_input_r ) // P1 AM_RANGE(0x8000f0, 0x8000f1) AM_READ(SMH_RAM ) // NVRAM AM_RANGE(0x800100, 0x8001ff) AM_READ(SMH_RAM ) // NVRAM AM_RANGE(0xa00000, 0xa03fff) AM_READ(seta_sound_word_r ) // Sound @@ -2103,10 +2105,10 @@ static ADDRESS_MAP_START( blockcar_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xf00000, 0xf03fff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0xf04000, 0xf041ff) AM_READ(SMH_RAM ) // Backup RAM? AM_RANGE(0xf05000, 0xf050ff) AM_READ(SMH_RAM ) // Backup RAM? - AM_RANGE(0x300000, 0x300003) AM_READ(seta_dsw_r ) // DSW - AM_RANGE(0x500000, 0x500001) AM_READ(input_port_0_word_r ) // P1 - AM_RANGE(0x500002, 0x500003) AM_READ(input_port_1_word_r ) // P2 - AM_RANGE(0x500004, 0x500005) AM_READ(input_port_2_word_r ) // Coins + AM_RANGE(0x300000, 0x300003) AM_READ(seta_dsw_r ) // DSW + AM_RANGE(0x500000, 0x500001) AM_READ_PORT("P1") // P1 + AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P2") // P2 + AM_RANGE(0x500004, 0x500005) AM_READ_PORT("COINS") // Coins AM_RANGE(0xa00000, 0xa03fff) AM_READ(seta_sound_word_r ) // Sound AM_RANGE(0xb00000, 0xb003ff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0xc00000, 0xc03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr @@ -2138,11 +2140,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( daioh_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x100000, 0x10ffff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0x400000, 0x400001) AM_READ(input_port_0_word_r ) // P1 - AM_RANGE(0x400002, 0x400003) AM_READ(input_port_1_word_r ) // P2 - AM_RANGE(0x400004, 0x400005) AM_READ(input_port_2_word_r ) // Coins - AM_RANGE(0x500006, 0x500007) AM_READ(input_port_4_word_r ) // Buttons 4,5,6 - AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW + AM_RANGE(0x400000, 0x400001) AM_READ_PORT("P1") // P1 + AM_RANGE(0x400002, 0x400003) AM_READ_PORT("P2") // P2 + AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins + AM_RANGE(0x500006, 0x500007) AM_READ_PORT("EXTRA") // Buttons 4,5,6 + AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW AM_RANGE(0x700000, 0x7003ff) AM_READ(SMH_RAM ) AM_RANGE(0x700400, 0x700fff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0x701000, 0x70ffff) AM_READ(SMH_RAM ) @@ -2190,13 +2192,13 @@ static ADDRESS_MAP_START( drgnunit_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xf00000, 0xf0ffff) AM_READ(SMH_RAM ) // RAM (qzkklogy) AM_RANGE(0xffc000, 0xffffff) AM_READ(SMH_RAM ) // RAM (drgnunit,stg) AM_RANGE(0x100000, 0x103fff) AM_READ(seta_sound_word_r ) // Sound - AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW + AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW AM_RANGE(0x700000, 0x7003ff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0x900000, 0x901fff) AM_READ(SMH_RAM ) // VRAM AM_RANGE(0x902000, 0x903fff) AM_READ(SMH_RAM ) // VRAM - AM_RANGE(0xb00000, 0xb00001) AM_READ(input_port_0_word_r ) // P1 - AM_RANGE(0xb00002, 0xb00003) AM_READ(input_port_1_word_r ) // P2 - AM_RANGE(0xb00004, 0xb00005) AM_READ(input_port_2_word_r ) // Coins + AM_RANGE(0xb00000, 0xb00001) AM_READ_PORT("P1") // P1 + AM_RANGE(0xb00002, 0xb00003) AM_READ_PORT("P2") // P2 + AM_RANGE(0xb00004, 0xb00005) AM_READ_PORT("COINS") // Coins AM_RANGE(0xb00006, 0xb00007) AM_READ(SMH_NOP ) // unused (qzkklogy) /**/AM_RANGE(0xc00000, 0xc00001) AM_READ(SMH_RAM ) // ? $4000 /**/AM_RANGE(0xd00000, 0xd00607) AM_READ(SMH_RAM ) // Sprites Y @@ -2230,11 +2232,11 @@ static ADDRESS_MAP_START( extdwnhl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x210000, 0x21ffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x220000, 0x23ffff) AM_READ(SMH_RAM ) // RAM (sokonuke) - AM_RANGE(0x400000, 0x400001) AM_READ(input_port_0_word_r ) // P1 - AM_RANGE(0x400002, 0x400003) AM_READ(input_port_1_word_r ) // P2 - AM_RANGE(0x400004, 0x400005) AM_READ(input_port_2_word_r ) // Coins - AM_RANGE(0x400008, 0x40000b) AM_READ(seta_dsw_r ) // DSW - AM_RANGE(0x40000c, 0x40000d) AM_READ(watchdog_reset16_r ) // Watchdog (extdwnhl, MUST RETURN $FFFF) + AM_RANGE(0x400000, 0x400001) AM_READ_PORT("P1") // P1 + AM_RANGE(0x400002, 0x400003) AM_READ_PORT("P2") // P2 + AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins + AM_RANGE(0x400008, 0x40000b) AM_READ(seta_dsw_r ) // DSW + AM_RANGE(0x40000c, 0x40000d) AM_READ(watchdog_reset16_r ) // Watchdog (extdwnhl, MUST RETURN $FFFF) AM_RANGE(0x500004, 0x500007) AM_READ(SMH_NOP ) // IRQ Ack (extdwnhl) AM_RANGE(0x600400, 0x600fff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0x601000, 0x610bff) AM_READ(SMH_RAM ) // @@ -2281,11 +2283,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( kamenrid_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // ROM - AM_RANGE(0x500000, 0x500001) AM_READ(input_port_0_word_r ) // P1 - AM_RANGE(0x500002, 0x500003) AM_READ(input_port_1_word_r ) // P2 - AM_RANGE(0x500004, 0x500007) AM_READ(seta_dsw_r ) // DSW - AM_RANGE(0x500008, 0x500009) AM_READ(input_port_2_word_r ) // Coins - AM_RANGE(0x50000c, 0x50000d) AM_READ(watchdog_reset16_r ) // xx Watchdog? + AM_RANGE(0x500000, 0x500001) AM_READ_PORT("P1") // P1 + AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P2") // P2 + AM_RANGE(0x500004, 0x500007) AM_READ(seta_dsw_r ) // DSW + AM_RANGE(0x500008, 0x500009) AM_READ_PORT("COINS") // Coins + AM_RANGE(0x50000c, 0x50000d) AM_READ(watchdog_reset16_r ) // xx Watchdog? AM_RANGE(0x700000, 0x7003ff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0x700400, 0x700fff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0x701000, 0x703fff) AM_READ(SMH_RAM ) // Palette @@ -2332,10 +2334,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( madshark_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // ROM - AM_RANGE(0x500000, 0x500001) AM_READ(input_port_0_word_r ) // P1 - AM_RANGE(0x500002, 0x500003) AM_READ(input_port_1_word_r ) // P2 - AM_RANGE(0x500004, 0x500005) AM_READ(input_port_2_word_r ) // Coins - AM_RANGE(0x500008, 0x50000b) AM_READ(seta_dsw_r ) // DSW + AM_RANGE(0x500000, 0x500001) AM_READ_PORT("P1") // P1 + AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P2") // P2 + AM_RANGE(0x500004, 0x500005) AM_READ_PORT("COINS") // Coins + AM_RANGE(0x500008, 0x50000b) AM_READ(seta_dsw_r ) // DSW AM_RANGE(0x700400, 0x700fff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0x800000, 0x801fff) AM_READ(SMH_RAM ) // VRAM 0 AM_RANGE(0x802000, 0x803fff) AM_READ(SMH_RAM ) // VRAM 1 @@ -2377,10 +2379,10 @@ ADDRESS_MAP_END static READ16_HANDLER( krzybowl_input_r ) { // analog ports - int dir1x = input_port_read_indexed(machine, 4) & 0xfff; - int dir1y = input_port_read_indexed(machine, 5) & 0xfff; - int dir2x = input_port_read_indexed(machine, 6) & 0xfff; - int dir2y = input_port_read_indexed(machine, 7) & 0xfff; + int dir1x = input_port_read(machine, "TRACK1_X") & 0xfff; + int dir1y = input_port_read(machine, "TRACK1_Y") & 0xfff; + int dir2x = input_port_read(machine, "TRACK2_X") & 0xfff; + int dir2y = input_port_read(machine, "TRACK2_Y") & 0xfff; switch (offset) { @@ -2403,10 +2405,10 @@ static ADDRESS_MAP_START( krzybowl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xf00000, 0xf0ffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP ) // ? AM_RANGE(0x200000, 0x200001) AM_READ(SMH_NOP ) // ? - AM_RANGE(0x300000, 0x300003) AM_READ(seta_dsw_r ) // DSW - AM_RANGE(0x500000, 0x500001) AM_READ(input_port_0_word_r ) // P1 - AM_RANGE(0x500002, 0x500003) AM_READ(input_port_1_word_r ) // P2 - AM_RANGE(0x500004, 0x500005) AM_READ(input_port_2_word_r ) // Coins + AM_RANGE(0x300000, 0x300003) AM_READ(seta_dsw_r ) // DSW + AM_RANGE(0x500000, 0x500001) AM_READ_PORT("P1") // P1 + AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P2") // P2 + AM_RANGE(0x500004, 0x500005) AM_READ_PORT("COINS") // Coins AM_RANGE(0x600000, 0x60000f) AM_READ(krzybowl_input_r ) // P1 AM_RANGE(0x8000f0, 0x8000f1) AM_READ(SMH_RAM ) // NVRAM AM_RANGE(0x800100, 0x8001ff) AM_READ(SMH_RAM ) // NVRAM @@ -2452,10 +2454,10 @@ static ADDRESS_MAP_START( msgundam_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x100000, 0x1fffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0x400000, 0x400001) AM_READ(input_port_0_word_r ) // P1 - AM_RANGE(0x400002, 0x400003) AM_READ(input_port_1_word_r ) // P2 - AM_RANGE(0x400004, 0x400005) AM_READ(input_port_2_word_r ) // Coins - AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW + AM_RANGE(0x400000, 0x400001) AM_READ_PORT("P1") // P1 + AM_RANGE(0x400002, 0x400003) AM_READ_PORT("P2") // P2 + AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins + AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW AM_RANGE(0x700400, 0x700fff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0x800000, 0x800607) AM_READ(SMH_RAM ) // Sprites Y AM_RANGE(0x900000, 0x903fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr @@ -2506,10 +2508,10 @@ static ADDRESS_MAP_START( oisipuzl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x100000, 0x17ffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0x300000, 0x300003) AM_READ(seta_dsw_r ) // DSW - AM_RANGE(0x400000, 0x400001) AM_READ(input_port_0_word_r ) // P1 - AM_RANGE(0x400002, 0x400003) AM_READ(input_port_1_word_r ) // P2 - AM_RANGE(0x400004, 0x400005) AM_READ(input_port_2_word_r ) // Coins + AM_RANGE(0x300000, 0x300003) AM_READ(seta_dsw_r ) // DSW + AM_RANGE(0x400000, 0x400001) AM_READ_PORT("P1") // P1 + AM_RANGE(0x400002, 0x400003) AM_READ_PORT("P2") // P2 + AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins AM_RANGE(0x700000, 0x703fff) AM_READ(seta_sound_word_r ) // Sound AM_RANGE(0x800000, 0x803fff) AM_READ(SMH_RAM ) // VRAM 0&1 AM_RANGE(0x880000, 0x883fff) AM_READ(SMH_RAM ) // VRAM 2&3 @@ -2548,10 +2550,10 @@ static ADDRESS_MAP_START( triplfun_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x100000, 0x17ffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0x300000, 0x300003) AM_READ(seta_dsw_r ) // DSW - AM_RANGE(0x400000, 0x400001) AM_READ(input_port_0_word_r ) // P1 - AM_RANGE(0x400002, 0x400003) AM_READ(input_port_1_word_r ) // P2 - AM_RANGE(0x400004, 0x400005) AM_READ(input_port_2_word_r ) // Coins + AM_RANGE(0x300000, 0x300003) AM_READ(seta_dsw_r ) // DSW + AM_RANGE(0x400000, 0x400001) AM_READ_PORT("P1") // P1 + AM_RANGE(0x400002, 0x400003) AM_READ_PORT("P2") // P2 + AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins AM_RANGE(0x500006, 0x500007) AM_READ(OKIM6295_status_0_lsb_r) // tfun sound AM_RANGE(0x700000, 0x703fff) AM_READ(SMH_RAM ) // old sound AM_RANGE(0x800000, 0x803fff) AM_READ(SMH_RAM ) // VRAM 0&1 @@ -2602,17 +2604,16 @@ static READ16_HANDLER( kiwame_input_r ) { int row_select = kiwame_nvram_r( machine,0x10a/2,0x00ff ) & 0x1f; int i; + static const char *keynames[] = { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4" }; for(i = 0; i < 5; i++) if (row_select & (1<<i)) break; - i = 4 + (i % 5); - switch( offset ) { - case 0x00/2: return input_port_read_indexed(machine, i ); + case 0x00/2: return input_port_read(machine, keynames[i]); case 0x02/2: return 0xffff; - case 0x04/2: return input_port_read_indexed(machine, 2 ); + case 0x04/2: return input_port_read(machine, "COINS"); // case 0x06/2: case 0x08/2: return 0xffff; @@ -2625,14 +2626,14 @@ static READ16_HANDLER( kiwame_input_r ) static ADDRESS_MAP_START( kiwame_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0xfffc00, 0xffffff) AM_READ(kiwame_nvram_r ) // NVRAM + Regs ? + AM_RANGE(0xfffc00, 0xffffff) AM_READ(kiwame_nvram_r ) // NVRAM + Regs ? AM_RANGE(0x800000, 0x803fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr /**/AM_RANGE(0x900000, 0x900001) AM_READ(SMH_RAM ) // ? 0x4000 /**/AM_RANGE(0xa00000, 0xa00607) AM_READ(SMH_RAM ) // Sprites Y AM_RANGE(0xb00000, 0xb003ff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0xc00000, 0xc03fff) AM_READ(seta_sound_word_r ) // Sound - AM_RANGE(0xd00000, 0xd00009) AM_READ(kiwame_input_r ) - AM_RANGE(0xe00000, 0xe00003) AM_READ(seta_dsw_r ) // DSW + AM_RANGE(0xd00000, 0xd00009) AM_READ(kiwame_input_r ) + AM_RANGE(0xe00000, 0xe00003) AM_READ(seta_dsw_r ) // DSW ADDRESS_MAP_END static ADDRESS_MAP_START( kiwame_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -2669,12 +2670,12 @@ static ADDRESS_MAP_START( thunderl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100000, 0x103fff) AM_READ(seta_sound_word_r ) // Sound AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW AM_RANGE(0x700000, 0x7003ff) AM_READ(SMH_RAM ) // Palette - AM_RANGE(0xb00000, 0xb00001) AM_READ(input_port_0_word_r ) // P1 - AM_RANGE(0xb00002, 0xb00003) AM_READ(input_port_1_word_r ) // P2 - AM_RANGE(0xb00004, 0xb00005) AM_READ(input_port_2_word_r ) // Coins + AM_RANGE(0xb00000, 0xb00001) AM_READ_PORT("P1") // P1 + AM_RANGE(0xb00002, 0xb00003) AM_READ_PORT("P2") // P2 + AM_RANGE(0xb00004, 0xb00005) AM_READ_PORT("COINS") // Coins AM_RANGE(0xb0000c, 0xb0000d) AM_READ(thunderl_protection_r ) // Protection (not in wits) - AM_RANGE(0xb00008, 0xb00009) AM_READ(input_port_4_word_r ) // P3 (wits) - AM_RANGE(0xb0000a, 0xb0000b) AM_READ(input_port_5_word_r ) // P4 (wits) + AM_RANGE(0xb00008, 0xb00009) AM_READ_PORT("P3") // P3 (wits) + AM_RANGE(0xb0000a, 0xb0000b) AM_READ_PORT("P4") // P4 (wits) /**/AM_RANGE(0xc00000, 0xc00001) AM_READ(SMH_RAM ) // ? 0x4000 /**/AM_RANGE(0xd00000, 0xd00607) AM_READ(SMH_RAM ) // Sprites Y AM_RANGE(0xe00000, 0xe03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr @@ -2736,10 +2737,10 @@ static ADDRESS_MAP_START( umanclub_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x300000, 0x3003ff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0x300400, 0x300fff) AM_READ(SMH_RAM ) // - AM_RANGE(0x400000, 0x400001) AM_READ(input_port_0_word_r ) // P1 - AM_RANGE(0x400002, 0x400003) AM_READ(input_port_1_word_r ) // P2 - AM_RANGE(0x400004, 0x400005) AM_READ(input_port_2_word_r ) // Coins - AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW + AM_RANGE(0x400000, 0x400001) AM_READ_PORT("P1") // P1 + AM_RANGE(0x400002, 0x400003) AM_READ_PORT("P2") // P2 + AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins + AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW AM_RANGE(0xa00000, 0xa00607) AM_READ(SMH_RAM ) // Sprites Y /**/AM_RANGE(0xa80000, 0xa80001) AM_READ(SMH_RAM ) // ? 0x4000 AM_RANGE(0xb00000, 0xb03fff) AM_READ(SMH_RAM ) // Sprites Code + X + Attr @@ -2776,10 +2777,10 @@ static WRITE16_HANDLER( utoukond_soundlatch_w ) static ADDRESS_MAP_START( utoukond_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // ROM - AM_RANGE(0x400000, 0x400001) AM_READ(input_port_0_word_r ) // P1 - AM_RANGE(0x400002, 0x400003) AM_READ(input_port_1_word_r ) // P2 - AM_RANGE(0x400004, 0x400005) AM_READ(input_port_2_word_r ) // Coins - AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW + AM_RANGE(0x400000, 0x400001) AM_READ_PORT("P1") // P1 + AM_RANGE(0x400002, 0x400003) AM_READ_PORT("P2") // P2 + AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins + AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r ) // DSW AM_RANGE(0x700400, 0x700fff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0x800000, 0x801fff) AM_READ(SMH_RAM ) // VRAM 0 AM_RANGE(0x802000, 0x803fff) AM_READ(SMH_RAM ) // VRAM 1 @@ -2836,11 +2837,11 @@ static READ8_HANDLER( ff_r ) {return 0xff;} static ADDRESS_MAP_START( tndrcade_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x01ff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x0800, 0x0800) AM_READ(ff_r ) // ? (bits 0/1/2/3: 1 -> do test 0-ff/100-1e0/5001-57ff/banked rom) -// AM_RANGE(0x0800, 0x0800) AM_READ(soundlatch_r ) // -// AM_RANGE(0x0801, 0x0801) AM_READ(soundlatch2_r ) // - AM_RANGE(0x1000, 0x1000) AM_READ(input_port_0_r ) // P1 - AM_RANGE(0x1001, 0x1001) AM_READ(input_port_1_r ) // P2 - AM_RANGE(0x1002, 0x1002) AM_READ(input_port_2_r ) // Coins +// AM_RANGE(0x0800, 0x0800) AM_READ(soundlatch_r ) // +// AM_RANGE(0x0801, 0x0801) AM_READ(soundlatch2_r ) // + AM_RANGE(0x1000, 0x1000) AM_READ_PORT("P1") // P1 + AM_RANGE(0x1001, 0x1001) AM_READ_PORT("P2") // P2 + AM_RANGE(0x1002, 0x1002) AM_READ_PORT("COINS") // Coins AM_RANGE(0x2001, 0x2001) AM_READ(YM2203_read_port_0_r ) AM_RANGE(0x5000, 0x57ff) AM_READ(SMH_RAM ) // Shared RAM AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_ROM ) // ROM @@ -2867,9 +2868,9 @@ static ADDRESS_MAP_START( twineagl_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x01ff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x0800, 0x0800) AM_READ(soundlatch_r ) // AM_RANGE(0x0801, 0x0801) AM_READ(soundlatch2_r ) // - AM_RANGE(0x1000, 0x1000) AM_READ(input_port_0_r ) // P1 - AM_RANGE(0x1001, 0x1001) AM_READ(input_port_1_r ) // P2 - AM_RANGE(0x1002, 0x1002) AM_READ(input_port_2_r ) // Coins + AM_RANGE(0x1000, 0x1000) AM_READ_PORT("P1") // P1 + AM_RANGE(0x1001, 0x1001) AM_READ_PORT("P2") // P2 + AM_RANGE(0x1002, 0x1002) AM_READ_PORT("COINS") // Coins AM_RANGE(0x5000, 0x57ff) AM_READ(SMH_RAM ) // Shared RAM AM_RANGE(0x7000, 0x7fff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1 ) // Banked ROM @@ -2891,22 +2892,22 @@ ADDRESS_MAP_END static READ8_HANDLER( downtown_ip_r ) { - int dir1 = input_port_read_indexed(machine, 4); // analog port - int dir2 = input_port_read_indexed(machine, 5); // analog port + int dir1 = input_port_read(machine, "ROT1"); // analog port + int dir2 = input_port_read(machine, "ROT2"); // analog port dir1 = (~ (0x800 >> ((dir1 * 12)/0x100)) ) & 0xfff; dir2 = (~ (0x800 >> ((dir2 * 12)/0x100)) ) & 0xfff; switch (offset) { - case 0: return (input_port_read_indexed(machine, 2) & 0xf0) + (dir1>>8); // upper 4 bits of p1 rotation + coins - case 1: return (dir1&0xff); // lower 8 bits of p1 rotation - case 2: return input_port_read_indexed(machine, 0); // p1 - case 3: return 0xff; // ? - case 4: return (dir2>>8); // upper 4 bits of p2 rotation + ? - case 5: return (dir2&0xff); // lower 8 bits of p2 rotation - case 6: return input_port_read_indexed(machine, 1); // p2 - case 7: return 0xff; // ? + case 0: return (input_port_read(machine, "COINS") & 0xf0) + (dir1 >> 8); // upper 4 bits of p1 rotation + coins + case 1: return (dir1 & 0xff); // lower 8 bits of p1 rotation + case 2: return input_port_read(machine, "P1"); // p1 + case 3: return 0xff; // ? + case 4: return (dir2 >> 8); // upper 4 bits of p2 rotation + ? + case 5: return (dir2 & 0xff); // lower 8 bits of p2 rotation + case 6: return input_port_read(machine, "P2"); // p2 + case 7: return 0xff; // ? } return 0; @@ -2968,10 +2969,10 @@ static ADDRESS_MAP_START( metafox_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x01ff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0x0800, 0x0800) AM_READ(soundlatch_r ) // AM_RANGE(0x0801, 0x0801) AM_READ(soundlatch2_r ) // - AM_RANGE(0x1000, 0x1000) AM_READ(input_port_2_r ) // Coins - AM_RANGE(0x1002, 0x1002) AM_READ(input_port_0_r ) // P1 -// AM_RANGE(0x1004, 0x1004) AM_READ(SMH_NOP ) // ? - AM_RANGE(0x1006, 0x1006) AM_READ(input_port_1_r ) // P2 + AM_RANGE(0x1000, 0x1000) AM_READ_PORT("COINS") // Coins + AM_RANGE(0x1002, 0x1002) AM_READ_PORT("P1") // P1 +// AM_RANGE(0x1004, 0x1004) AM_READ(SMH_NOP ) // ? + AM_RANGE(0x1006, 0x1006) AM_READ_PORT("P2") // P2 AM_RANGE(0x5000, 0x57ff) AM_READ(SMH_RAM ) // Shared RAM AM_RANGE(0x7000, 0x7fff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1 ) // Banked ROM @@ -3043,10 +3044,10 @@ static WRITE16_HANDLER( pairlove_prot_w ) static ADDRESS_MAP_START( pairlove_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM ) // ROM - AM_RANGE(0x300000, 0x300003) AM_READ(seta_dsw_r ) // DSW - AM_RANGE(0x500000, 0x500001) AM_READ(input_port_0_word_r ) // P1 - AM_RANGE(0x500002, 0x500003) AM_READ(input_port_1_word_r ) // P2 - AM_RANGE(0x500004, 0x500005) AM_READ(input_port_2_word_r ) // Coins + AM_RANGE(0x300000, 0x300003) AM_READ(seta_dsw_r ) // DSW + AM_RANGE(0x500000, 0x500001) AM_READ_PORT("P1") // P1 + AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P2") // P2 + AM_RANGE(0x500004, 0x500005) AM_READ_PORT("COINS") // Coins AM_RANGE(0x900000, 0x9001ff) AM_READ(pairlove_prot_r) AM_RANGE(0xa00000, 0xa03fff) AM_READ(seta_sound_word_r ) // Sound AM_RANGE(0xb00000, 0xb00fff) AM_READ(SMH_RAM ) // Palette @@ -3081,9 +3082,9 @@ static WRITE16_HANDLER( YM3812_write_port_0_lsb_w ) { if (ACCESSING_BITS_0_7) Y static ADDRESS_MAP_START( crazyfgt_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x400000, 0x40ffff) AM_RAM - AM_RANGE(0x610000, 0x610001) AM_READ(input_port_0_word_r ) - AM_RANGE(0x610002, 0x610003) AM_READ(input_port_1_word_r ) - AM_RANGE(0x610004, 0x610005) AM_READ(input_port_2_word_r ) + AM_RANGE(0x610000, 0x610001) AM_READ_PORT("COINS") + AM_RANGE(0x610002, 0x610003) AM_READ_PORT("UNK") + AM_RANGE(0x610004, 0x610005) AM_READ_PORT("INPUT") AM_RANGE(0x610006, 0x610007) AM_WRITENOP AM_RANGE(0x620000, 0x620003) AM_WRITENOP // protection AM_RANGE(0x630000, 0x630003) AM_READ(seta_dsw_r) @@ -3108,9 +3109,9 @@ ADDRESS_MAP_END static READ16_HANDLER( inttoote_dsw_r ) { int shift = offset * 4; - return ((((input_port_read_indexed(machine, 0) >> shift) & 0xf)) << 0) | - ((((input_port_read_indexed(machine, 1) >> shift) & 0xf)) << 4) | - ((((input_port_read_indexed(machine, 1) >> (shift+8)) & 0xf)) << 8) ; + return ((((input_port_read(machine, "DSW1") >> shift) & 0xf)) << 0) | + ((((input_port_read(machine, "DSW2_3") >> shift) & 0xf)) << 4) | + ((((input_port_read(machine, "DSW2_3") >> (shift+8)) & 0xf)) << 8) ; } static UINT16 *inttoote_key_select; @@ -3118,11 +3119,11 @@ static READ16_HANDLER( inttoote_key_r ) { switch( *inttoote_key_select ) { - case 0x08: return input_port_read_indexed(machine, 4+0); - case 0x10: return input_port_read_indexed(machine, 4+1); - case 0x20: return input_port_read_indexed(machine, 4+2); - case 0x40: return input_port_read_indexed(machine, 4+3); - case 0x80: return input_port_read_indexed(machine, 4+4); + case 0x08: return input_port_read(machine, "BET0"); + case 0x10: return input_port_read(machine, "BET1"); + case 0x20: return input_port_read(machine, "BET2"); + case 0x40: return input_port_read(machine, "BET3"); + case 0x80: return input_port_read(machine, "BET4"); } logerror("%06X: unknown read, select = %04x\n",activecpu_get_pc(),*inttoote_key_select); return 0xffff; @@ -3138,8 +3139,8 @@ static ADDRESS_MAP_START( inttoote_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x1fffff) AM_ROM // ROM (up to 2MB) AM_RANGE(0x200000, 0x200001) AM_READWRITE(inttoote_key_r, SMH_RAM) AM_BASE(&inttoote_key_select) - AM_RANGE(0x200002, 0x200003) AM_READ(input_port_2_word_r) - AM_RANGE(0x200010, 0x200011) AM_READWRITE(input_port_3_word_r, SMH_NOP) + AM_RANGE(0x200002, 0x200003) AM_READ_PORT("P1") + AM_RANGE(0x200010, 0x200011) AM_READ_PORT("P2") AM_WRITENOP AM_RANGE(0x300000, 0x300001) AM_WRITE(watchdog_reset16_w) // Watchdog @@ -3177,66 +3178,65 @@ ADDRESS_MAP_END ***************************************************************************/ #define JOY_TYPE1_1BUTTON(_n_) \ - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START##_n_ ) + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START##_n_ ) #define JOY_TYPE1_2BUTTONS(_n_) \ - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START##_n_ ) + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START##_n_ ) #define JOY_TYPE1_3BUTTONS(_n_) \ - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START##_n_ ) - + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START##_n_ ) #define JOY_TYPE2_1BUTTON(_n_) \ - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START##_n_ ) + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START##_n_ ) #define JOY_TYPE2_2BUTTONS(_n_) \ - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START##_n_ ) + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START##_n_ ) #define JOY_TYPE2_3BUTTONS(_n_) \ - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START##_n_ ) + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(_n_) \ + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START##_n_ ) #define JOY_ROTATION(_n_, _left_, _right_ ) \ @@ -3249,23 +3249,23 @@ ADDRESS_MAP_END ***************************************************************************/ static INPUT_PORTS_START( arbalest ) - PORT_START_TAG("IN0") // Player 1 + PORT_START_TAG("P1") // Player 1 JOY_TYPE2_2BUTTONS(1) - PORT_START_TAG("IN1") // Player 2 + PORT_START_TAG("P2") // Player 2 JOY_TYPE2_2BUTTONS(2) - PORT_START_TAG("IN2") // Coins - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_TILT ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_START_TAG("COINS") // Coins + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) - PORT_START_TAG("IN3") // 2 DSWs - $600001 & 3.b + PORT_START_TAG("DSW") // 2 DSWs - $600001 & 3.b PORT_DIPNAME( 0x4001, 0x0000, "Licensed To" ) PORT_DIPSETTING( 0x0000, "Taito" ) // PORT_DIPSETTING( 0x4000, "Taito" ) @@ -3316,37 +3316,37 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( atehate ) - PORT_START_TAG("IN0") // Player 1 - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) - - PORT_START_TAG("IN1") // Player 2 - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 ) - - PORT_START_TAG("IN2") // Coins + PORT_START_TAG("P1") // Player 1 + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) + + PORT_START_TAG("P2") // Player 2 + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 ) + + PORT_START_TAG("COINS") // Coins PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_IMPULSE(5) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) // 4 Bits Called "Cut DSW" - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) // 4 Bits Called "Cut DSW" + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN3") // 2 DSWs - $e00001 & 3.b + PORT_START_TAG("DSW") // 2 DSWs - $e00001 & 3.b PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3") PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0002, DEF_STR( 3C_1C ) ) @@ -3397,23 +3397,23 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( blandia ) - PORT_START_TAG("IN0") //Player 1 - $400000.w + PORT_START_TAG("P1") //Player 1 - $400000.w JOY_TYPE1_3BUTTONS(1) - PORT_START_TAG("IN1") //Player 2 - $400002.w + PORT_START_TAG("P2") //Player 2 - $400002.w JOY_TYPE1_3BUTTONS(2) - PORT_START_TAG("IN2") //Coins - $400004.w + PORT_START_TAG("COINS") //Coins - $400004.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START_TAG("IN3") //2 DSWs - $600001 & 3.b + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:1") PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0001, DEF_STR( On ) ) @@ -3468,22 +3468,22 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( blockcar ) - PORT_START_TAG("IN0") //Player 1 - $500001.b + PORT_START_TAG("P1") //Player 1 - $500001.b JOY_TYPE1_2BUTTONS(1) // button2 = speed up - PORT_START_TAG("IN1") //Player 2 - $500003.b + PORT_START_TAG("P2") //Player 2 - $500003.b JOY_TYPE1_2BUTTONS(2) - PORT_START_TAG("IN2") //Coins + DSW - $500005.b + PORT_START_TAG("COINS") //Coins + DSW - $500005.b PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) PORT_DIPNAME( 0x0010, 0x0000, "Title" ) /* This is a jumper pad */ PORT_DIPSETTING( 0x0010, "Thunder & Lightning 2" ) PORT_DIPSETTING( 0x0000, "Block Carnival" ) - PORT_START_TAG("IN3") //2 DSWs - $300003 & 1.b + PORT_START_TAG("DSW") //2 DSWs - $300003 & 1.b PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) ) @@ -3533,23 +3533,23 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( calibr50 ) - PORT_START_TAG("IN0") //Player 1 + PORT_START_TAG("P1") //Player 1 JOY_TYPE2_2BUTTONS(1) - PORT_START_TAG("IN1") //Player 2 + PORT_START_TAG("P2") //Player 2 JOY_TYPE2_2BUTTONS(2) - PORT_START_TAG("IN2") //Coins - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_TILT ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_START_TAG("COINS") //Coins + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) - PORT_START_TAG("IN3") //2 DSWs - $600001 & 3.b + PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b PORT_DIPNAME( 0x4001, 0x4000, "Licensed To" ) PORT_DIPSETTING( 0x0001, "Romstar" ) PORT_DIPSETTING( 0x4001, "Taito America" ) @@ -3595,10 +3595,10 @@ static INPUT_PORTS_START( calibr50 ) PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_START_TAG("IN4") // Rotation Player 1 + PORT_START_TAG("ROT1") // Rotation Player 1 JOY_ROTATION(1, Z, X) - PORT_START_TAG("IN5") // Rotation Player 2 + PORT_START_TAG("ROT2") // Rotation Player 2 JOY_ROTATION(2, N, M) INPUT_PORTS_END @@ -3607,17 +3607,17 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( daioh ) - PORT_START_TAG("IN0") + PORT_START_TAG("P1") JOY_TYPE1_3BUTTONS(1) - PORT_START_TAG("IN1") + PORT_START_TAG("P2") JOY_TYPE1_3BUTTONS(2) - PORT_START_TAG("IN2") + PORT_START_TAG("COINS") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* These are NOT Dip Switches but jumpers */ PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unused ) ) // JP9 PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) @@ -3632,7 +3632,7 @@ static INPUT_PORTS_START( daioh ) PORT_DIPSETTING( 0x0080, "USA (6 buttons)" ) PORT_DIPSETTING( 0x0000, "Japan (2 buttons)" ) - PORT_START_TAG("IN3") + PORT_START_TAG("DSW") PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3") PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0002, DEF_STR( 3C_1C ) ) @@ -3678,15 +3678,15 @@ static INPUT_PORTS_START( daioh ) PORT_DIPSETTING( 0x4000, "800k and 2000k only" ) PORT_DIPSETTING( 0x0000, "1000k Only" ) - PORT_START_TAG("IN4") - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(2) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_START_TAG("EXTRA") + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(2) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) INPUT_PORTS_END /*************************************************************************** @@ -3694,17 +3694,17 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( drgnunit ) - PORT_START_TAG("IN0") //Player 1 + PORT_START_TAG("P1") //Player 1 JOY_TYPE1_3BUTTONS(1) - PORT_START_TAG("IN1") //Player 2 + PORT_START_TAG("P2") //Player 2 JOY_TYPE1_3BUTTONS(2) - PORT_START_TAG("IN2") //Coins + PORT_START_TAG("COINS") //Coins PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) PORT_DIPNAME( 0x0010, 0x0010, "Coinage Type" ) // not supported PORT_DIPSETTING( 0x0010, "1" ) PORT_DIPSETTING( 0x0000, "2" ) @@ -3717,7 +3717,7 @@ static INPUT_PORTS_START( drgnunit ) PORT_DIPSETTING( 0x0040, "Seta USA / Taito America" ) PORT_DIPSETTING( 0x0000, "Seta USA / Romstar" ) - PORT_START_TAG("IN3") //2 DSWs - $600001 & 3.b + PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b PORT_DIPNAME( 0x0003, 0x0002, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:1,2") PORT_DIPSETTING( 0x0003, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x0002, DEF_STR( Normal ) ) @@ -3765,23 +3765,23 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( downtown ) - PORT_START_TAG("IN0") //Player 1 + PORT_START_TAG("P1") //Player 1 JOY_TYPE2_2BUTTONS(1) - PORT_START_TAG("IN1") //Player 2 + PORT_START_TAG("P2") //Player 2 JOY_TYPE2_2BUTTONS(2) - PORT_START_TAG("IN2") //Coins - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_TILT ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_START_TAG("COINS") //Coins + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) - PORT_START_TAG("IN3") //2 DSWs - $600001 & 3.b + PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b PORT_DIPNAME( 0x0001, 0x0000, "Sales" ) PORT_DIPLOCATION("SW1:1") /* Manual for USA version says "Always Off" */ PORT_DIPSETTING( 0x0001, "Japan Only" ) PORT_DIPSETTING( 0x0000, DEF_STR( World ) ) @@ -3838,10 +3838,10 @@ static INPUT_PORTS_START( downtown ) PORT_DIPSETTING( 0x8000, "1" ) PORT_DIPSETTING( 0x0000, "2" ) - PORT_START_TAG("IN4") //Rotation Player 1 + PORT_START_TAG("ROT1") //Rotation Player 1 JOY_ROTATION(1, Z, X) - PORT_START_TAG("IN5") //Rotation Player 2 + PORT_START_TAG("ROT2") //Rotation Player 2 JOY_ROTATION(2, N, M) INPUT_PORTS_END @@ -3852,23 +3852,23 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( eightfrc ) - PORT_START_TAG("IN0") //Player 1 + PORT_START_TAG("P1") //Player 1 JOY_TYPE1_2BUTTONS(1) - PORT_START_TAG("IN1") //Player 2 + PORT_START_TAG("P2") //Player 2 JOY_TYPE1_2BUTTONS(2) - PORT_START_TAG("IN2") //Coins + PORT_START_TAG("COINS") //Coins PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START_TAG("IN3") //2 DSWs - $600001 & 3.b + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3") PORT_DIPSETTING( 0x0004, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0005, DEF_STR( 3C_1C ) ) @@ -3923,31 +3923,31 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( extdwnhl ) - PORT_START_TAG("IN0") //Player 1 - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) - - PORT_START_TAG("IN1") //Player 2 - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 ) - - PORT_START_TAG("IN2") //Coins + PORT_START_TAG("P1") //Player 1 + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) + + PORT_START_TAG("P2") //Player 2 + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 ) + + PORT_START_TAG("COINS") //Coins PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SERVICE ) // "test" + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SERVICE ) // "test" /* These are NOT Dip Switches but jumpers */ PORT_DIPNAME( 0x0030, 0x0030, "Country" ) PORT_DIPSETTING( 0x0030, DEF_STR( World ) ) @@ -3961,7 +3961,7 @@ static INPUT_PORTS_START( extdwnhl ) PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_START_TAG("IN3") //2 DSWs - $400009 & b.b + PORT_START_TAG("DSW") //2 DSWs - $400009 & b.b PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1") PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -4017,23 +4017,23 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( gundhara ) - PORT_START_TAG("IN0") //Player 1 + PORT_START_TAG("P1") //Player 1 JOY_TYPE1_3BUTTONS(1) - PORT_START_TAG("IN1") //Player 2 + PORT_START_TAG("P2") //Player 2 JOY_TYPE1_3BUTTONS(2) - PORT_START_TAG("IN2") //Coins + PORT_START_TAG("COINS") //Coins PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_SERVICE_NO_TOGGLE( 0x0008, IP_ACTIVE_LOW) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN3") //2 DSWs - $600001 & 3.b + PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3,4") PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0005, DEF_STR( 3C_1C ) ) @@ -4086,37 +4086,37 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( zombraid ) - PORT_START_TAG("IN0") //Player 1 - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("P1 Trigger") - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("P1 Reload") - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) - - PORT_START_TAG("IN1") //Player 2 - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 Trigger") - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 Reload") - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 ) - - PORT_START_TAG("IN2") //Coins + PORT_START_TAG("P1") //Player 1 + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("P1 Trigger") + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("P1 Reload") + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) + + PORT_START_TAG("P2") //Player 2 + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 Trigger") + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 Reload") + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 ) + + PORT_START_TAG("COINS") //Coins PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START_TAG("IN3") + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START_TAG("DSW") PORT_DIPNAME( 0x0001, 0x0001, "Vertical Screen Flip" ) PORT_DIPLOCATION("SW2:1") PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -4164,14 +4164,14 @@ static INPUT_PORTS_START( zombraid ) /* The user calibrated values are lost each time MAME starts, so the gun always needs to be re-calibrated. */ /* Either NVRAM or battery backed up RAM is not emulated. */ /* For now it is best to just use a Save State after calibration to remember the setting. */ - PORT_START_TAG("IN5") /* Player 1 Gun X ($f00003) */ + PORT_START_TAG("GUNX1") /* Player 1 Gun X ($f00003) */ PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, -1, 0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_REVERSE PORT_PLAYER(1) - PORT_START_TAG("IN6") /* Player 1 Gun Y ($f00003) */ + PORT_START_TAG("GUNY1") /* Player 1 Gun Y ($f00003) */ PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1, 0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1) - PORT_START_TAG("IN7") /* Player 2 Gun X ($f00003) */ + PORT_START_TAG("GUNX2") /* Player 2 Gun X ($f00003) */ PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, -1, 0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_REVERSE PORT_PLAYER(2) - PORT_START_TAG("IN8") /* Player 2 Gun Y ($f00003) */ + PORT_START_TAG("GUNY2") /* Player 2 Gun Y ($f00003) */ PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1, 0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(2) INPUT_PORTS_END @@ -4181,23 +4181,23 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( jjsquawk ) - PORT_START_TAG("IN0") //Player 1 - $400000.w + PORT_START_TAG("P1") //Player 1 - $400000.w JOY_TYPE1_2BUTTONS(1) - PORT_START_TAG("IN1") //Player 2 - $400002.w + PORT_START_TAG("P2") //Player 2 - $400002.w JOY_TYPE1_2BUTTONS(2) - PORT_START_TAG("IN2") //Coins - $400004.w + PORT_START_TAG("COINS") //Coins - $400004.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START_TAG("IN3") //2 DSWs - $600001 & 3.b + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3") PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0002, DEF_STR( 3C_1C ) ) @@ -4249,17 +4249,17 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( kamenrid ) - PORT_START_TAG("IN0") //Player 1 + PORT_START_TAG("P1") //Player 1 JOY_TYPE1_2BUTTONS(1) // BUTTON3 in "test mode" only - PORT_START_TAG("IN1") //Player 2 + PORT_START_TAG("P2") //Player 2 JOY_TYPE1_2BUTTONS(2) // BUTTON3 in "test mode" only - PORT_START_TAG("IN2") //Coins + PORT_START_TAG("COINS") //Coins PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) /* These are NOT Dip Switches but jumpers */ PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unused ) ) PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) @@ -4274,7 +4274,7 @@ static INPUT_PORTS_START( kamenrid ) PORT_DIPSETTING( 0x0080, DEF_STR( USA ) ) PORT_DIPSETTING( 0x0000, DEF_STR( Japan ) ) - PORT_START // IN3 - 2 DSWs - $500005 & 7.b + PORT_START_TAG("DSW") // IN3 - 2 DSWs - $500005 & 7.b PORT_SERVICE( 0x0001, IP_ACTIVE_LOW ) PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unused ) ) PORT_DIPSETTING( 0x0002, DEF_STR( Off ) ) @@ -4335,23 +4335,23 @@ INPUT_PORTS_END PORT_BIT( 0x0fff, 0x0000, IPT_TRACKBALL_##_dir_ ) PORT_PLAYER(_n_) PORT_SENSITIVITY(70) PORT_KEYDELTA(30) PORT_REVERSE static INPUT_PORTS_START( krzybowl ) - PORT_START_TAG("IN0") //Player 1 + PORT_START_TAG("P1") //Player 1 JOY_TYPE1_3BUTTONS(1) - PORT_START_TAG("IN1") //Player 2 + PORT_START_TAG("P2") //Player 2 JOY_TYPE1_3BUTTONS(2) - PORT_START_TAG("IN2") //Coins + PORT_START_TAG("COINS") //Coins PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_IMPULSE(5) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN3") //2 DSWs - $600001 & 3.b + PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:1") PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -4399,16 +4399,16 @@ static INPUT_PORTS_START( krzybowl ) PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_START_TAG("IN4") //Rotation X Player 1 + PORT_START_TAG("TRACK1_X") //Rotation X Player 1 KRZYBOWL_TRACKBALL(X,1) - PORT_START_TAG("IN5") //Rotation Y Player 1 + PORT_START_TAG("TRACK1_Y") //Rotation Y Player 1 KRZYBOWL_TRACKBALL(Y,1) - PORT_START_TAG("IN6") //Rotation X Player 2 + PORT_START_TAG("TRACK2_X") //Rotation X Player 2 KRZYBOWL_TRACKBALL(X,2) PORT_REVERSE - PORT_START_TAG("IN7") //Rotation Y Player 2 + PORT_START_TAG("TRACK2_Y") //Rotation Y Player 2 KRZYBOWL_TRACKBALL(Y,2) INPUT_PORTS_END @@ -4418,17 +4418,17 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( madshark ) - PORT_START_TAG("IN0") //Player 1 + PORT_START_TAG("P1") //Player 1 JOY_TYPE1_2BUTTONS(1) - PORT_START_TAG("IN1") //Player 2 + PORT_START_TAG("P2") //Player 2 JOY_TYPE1_2BUTTONS(2) - PORT_START_TAG("IN2") //Coins + PORT_START_TAG("COINS") //Coins PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) /* These are NOT Dip Switches but jumpers */ PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unused ) ) PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) @@ -4443,7 +4443,7 @@ static INPUT_PORTS_START( madshark ) PORT_DIPSETTING( 0x0080, DEF_STR( Japan ) ) PORT_DIPSETTING( 0x0000, DEF_STR( World ) ) - PORT_START_TAG("IN3") //2 DSWs + PORT_START_TAG("DSW") //2 DSWs PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1") PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -4494,23 +4494,23 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( metafox ) - PORT_START_TAG("IN0") //Player 1 + PORT_START_TAG("P1") //Player 1 JOY_TYPE2_2BUTTONS(1) - PORT_START_TAG("IN1") //Player 2 + PORT_START_TAG("P2") //Player 2 JOY_TYPE2_2BUTTONS(2) - PORT_START_TAG("IN2") //Coins - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_TILT ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_START_TAG("COINS") //Coins + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) - PORT_START_TAG("IN3") //$600001 & 3.b + PORT_START_TAG("DSW") //$600001 & 3.b PORT_DIPNAME( 0x4001, 0x4001, "Licensed To" ) PORT_DIPSETTING( 0x0001, "Jordan" ) PORT_DIPSETTING( 0x4001, "Romstar" ) @@ -4563,25 +4563,25 @@ INPUT_PORTS_END static INPUT_PORTS_START( msgundam ) - PORT_START_TAG("IN0") //Player 1 - $400000.w + PORT_START_TAG("P1") //Player 1 - $400000.w JOY_TYPE1_2BUTTONS(1) - PORT_START_TAG("IN1") //Player 2 - $400002.w + PORT_START_TAG("P2") //Player 2 - $400002.w JOY_TYPE1_2BUTTONS(2) - PORT_START_TAG("IN2") //Coins - $400004.w + PORT_START_TAG("COINS") //Coins - $400004.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Language ) ) PORT_DIPSETTING( 0x0080, DEF_STR( English ) ) PORT_DIPSETTING( 0x0000, DEF_STR( Japanese ) ) - PORT_START_TAG("IN3") //2 DSWs - $600001 & 3.b + PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3") PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) ) @@ -4633,7 +4633,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( msgunda1 ) PORT_INCLUDE(msgundam) - PORT_MODIFY("IN2") // IN2 - Coins - $400004.w + PORT_MODIFY("COINS") // IN2 - Coins - $400004.w /* this set seems to be a japan set, english mode doesn't work correctly */ PORT_DIPNAME( 0x0080, 0x0000, DEF_STR( Language ) ) // PORT_DIPSETTING( 0x0080, DEF_STR( English ) ) @@ -4646,23 +4646,23 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( oisipuzl ) - PORT_START_TAG("IN0") //Player 1 + PORT_START_TAG("P1") //Player 1 JOY_TYPE1_2BUTTONS(1) - PORT_START_TAG("IN1") //Player 2 + PORT_START_TAG("P2") //Player 2 JOY_TYPE1_2BUTTONS(2) - PORT_START_TAG("IN2") //Coins - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_START_TAG("COINS") //Coins + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_SERVICE_NO_TOGGLE( 0x0008, IP_ACTIVE_LOW ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN3") //2 DSWs - $600001 & 3.b + PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) ) @@ -4706,15 +4706,15 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( kiwame ) - PORT_START_TAG("IN0") //Unused - PORT_START_TAG("IN1") //Unused + PORT_START_TAG("P1") //Unused + PORT_START_TAG("P2") //Unused - PORT_START_TAG("IN2") //Coins + PORT_START_TAG("COINS") //Coins PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_IMPULSE(5) - PORT_START_TAG("IN3") //2 DSWs - $e00001 & 3.b + PORT_START_TAG("DSW") //2 DSWs - $e00001 & 3.b PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3") PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0002, DEF_STR( 3C_1C ) ) @@ -4773,45 +4773,45 @@ bit 0 a b c d lc 5 st bt */ - PORT_START_TAG("IN4") - PORT_BIT(0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) - PORT_BIT (0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT (0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT(0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP ) - PORT_BIT (0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START_TAG("IN5") - PORT_BIT(0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_B ) - PORT_BIT(0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_F ) - PORT_BIT(0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_J ) - PORT_BIT(0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_N ) - PORT_BIT(0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) - PORT_BIT(0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) - PORT_BIT (0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START_TAG("IN6") - PORT_BIT(0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_A ) - PORT_BIT(0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_E ) - PORT_BIT(0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_I ) - PORT_BIT(0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_M ) - PORT_BIT(0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) + PORT_START_TAG("KEY0") + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP ) + PORT_BIT( 0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START_TAG("KEY1") + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_B ) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_F ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_J ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_N ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) + PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START_TAG("KEY2") + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_A ) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_E ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_I ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_M ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT (0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START_TAG("IN7") - PORT_BIT(0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_C ) - PORT_BIT(0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_G ) - PORT_BIT(0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_K ) - PORT_BIT(0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) - PORT_BIT(0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) - PORT_BIT (0xffe0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START_TAG("IN8") - PORT_BIT(0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_D ) - PORT_BIT(0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_H ) - PORT_BIT(0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_L ) - PORT_BIT(0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) - PORT_BIT (0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START_TAG("KEY3") + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_C ) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_G ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_K ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) + PORT_BIT( 0xffe0, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START_TAG("KEY4") + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_D ) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_H ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_L ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) + PORT_BIT( 0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN ) INPUT_PORTS_END @@ -4821,33 +4821,33 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( qzkklogy ) - PORT_START_TAG("IN0") //Player 1 - $b00001.b - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) PORT_NAME("P1 Pause (Cheat)")// pause (cheat) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) - - PORT_START_TAG("IN1") //Player 2 - $b00003.b - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_PLAYER(2) PORT_NAME("P2 Pause (Cheat)")// pause (cheat) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 ) - - PORT_START_TAG("IN2") //Coins - $b00005.b + PORT_START_TAG("P1") //Player 1 - $b00001.b + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) PORT_NAME("P1 Pause (Cheat)")// pause (cheat) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) + + PORT_START_TAG("P2") //Player 2 - $b00003.b + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_PLAYER(2) PORT_NAME("P2 Pause (Cheat)")// pause (cheat) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 ) + + PORT_START_TAG("COINS") //Coins - $b00005.b PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN3") //2 DSWs - $600001 & 3.b + PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b PORT_DIPNAME( 0x0003, 0x0003, "Unknown 1-0&1*" ) /* Manual States dips 1-5 are unused */ PORT_DIPSETTING( 0x0000, "0" ) PORT_DIPSETTING( 0x0001, "1" ) @@ -4901,33 +4901,33 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( qzkklgy2 ) - PORT_START_TAG("IN0") //Player 1 - $b00001.b - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) - - PORT_START_TAG("IN1") //Player 2 - $b00003.b - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 ) - - PORT_START_TAG("IN2") //Coins - $b00005.b + PORT_START_TAG("P1") //Player 1 - $b00001.b + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) + + PORT_START_TAG("P2") //Player 2 - $b00003.b + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 ) + + PORT_START_TAG("COINS") //Coins - $b00005.b PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN3") //2 DSWs - $600001 & 3.b + PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b PORT_DIPNAME( 0x0003, 0x0003, "Unknown 1-0&1*" ) /* Manual States dips 1-5 are unused */ PORT_DIPSETTING( 0x0000, "0" ) PORT_DIPSETTING( 0x0001, "1" ) @@ -4980,23 +4980,23 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( rezon ) - PORT_START_TAG("IN0") //Player 1 + PORT_START_TAG("P1") //Player 1 JOY_TYPE1_3BUTTONS(1) // 1 used?? - PORT_START_TAG("IN1") //Player 2 + PORT_START_TAG("P2") //Player 2 JOY_TYPE1_3BUTTONS(2) // 1 used ?? - PORT_START_TAG("IN2") //Coins + PORT_START_TAG("COINS") //Coins PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_SERVICE_NO_TOGGLE( 0x0008, IP_ACTIVE_LOW) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) // no taito logo - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) // no taito logo + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN3") //2 DSWs - $600001 & 3.b + PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1") PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -5046,8 +5046,8 @@ static INPUT_PORTS_START( rezont ) PORT_INCLUDE( rezon ) - PORT_MODIFY("IN2") - PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // gives the taito logo + PORT_MODIFY("COINS") + PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // gives the taito logo INPUT_PORTS_END /*************************************************************************** @@ -5059,23 +5059,23 @@ INPUT_PORTS_END pressing P1's button3 freezes the game (pressing P2's button3 resumes it). */ static INPUT_PORTS_START( neobattl ) - PORT_START_TAG("IN0") // Player 1 - $400000.w + PORT_START_TAG("P1") // Player 1 - $400000.w JOY_TYPE1_1BUTTON(1) // bump to 3 buttons for freezing to work - PORT_START_TAG("IN1") //Player 2 - $400002.w + PORT_START_TAG("P2") //Player 2 - $400002.w JOY_TYPE1_1BUTTON(2) // bump to 3 buttons for freezing to work - PORT_START_TAG("IN2") //Coins - $400004.w + PORT_START_TAG("COINS") //Coins - $400004.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START_TAG("IN3") //2 DSWs - $600001 & 3.b + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -5135,23 +5135,23 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( sokonuke ) - PORT_START_TAG("IN0") //Player 1 + PORT_START_TAG("P1") //Player 1 JOY_TYPE1_1BUTTON(1) - PORT_START_TAG("IN1") //Player 2 + PORT_START_TAG("P2") //Player 2 JOY_TYPE1_1BUTTON(2) - PORT_START_TAG("IN2") //Coins + PORT_START_TAG("COINS") //Coins PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_SERVICE_NO_TOGGLE( 0x0008, IP_ACTIVE_LOW ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN3") //2 DSWs - $400009 & b.b + PORT_START_TAG("DSW") //2 DSWs - $400009 & b.b PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -5207,22 +5207,22 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( stg ) - PORT_START_TAG("IN0") //Player 1 - $b00001.b + PORT_START_TAG("P1") //Player 1 - $b00001.b JOY_TYPE1_2BUTTONS(1) - PORT_START_TAG("IN1") //Player 2 - $b00003.b + PORT_START_TAG("P2") //Player 2 - $b00003.b JOY_TYPE1_2BUTTONS(2) - PORT_START_TAG("IN2") //Coins - $b00005.b + PORT_START_TAG("COINS") //Coins - $b00005.b PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) // PORT_DIPNAME( 0x00f0, 0x00f0, "Title" ) /* This is the index in a table with pointers to the title logo, but the table is filled with just 1 value */ - PORT_START_TAG("IN3") //2 DSWs - $600001 & 3.b + PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) ) // 0 PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) ) // 4 @@ -5264,17 +5264,17 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( thunderl ) - PORT_START_TAG("IN0") //Player 1 + PORT_START_TAG("P1") //Player 1 JOY_TYPE1_2BUTTONS(1) // button2 = speed up - PORT_START_TAG("IN1") //Player 2 + PORT_START_TAG("P2") //Player 2 JOY_TYPE1_2BUTTONS(2) - PORT_START_TAG("IN2") //Coins + DSW + PORT_START_TAG("COINS") //Coins + DSW PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) PORT_DIPNAME( 0x0010, 0x0000, "Force 1 Life" ) PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0010, DEF_STR( On ) ) @@ -5288,7 +5288,7 @@ static INPUT_PORTS_START( thunderl ) // PORT_DIPSETTING( 0x0020, DEF_STR( None ) ) // PORT_DIPSETTING( 0x0000, DEF_STR( None ) ) - PORT_START_TAG("IN3") //2 DSWs - $600003 & 1.b + PORT_START_TAG("DSW") //2 DSWs - $600003 & 1.b PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3,4") PORT_DIPSETTING( 0x000c, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x000d, DEF_STR( 3C_1C ) ) @@ -5345,6 +5345,13 @@ static INPUT_PORTS_START( thunderl ) PORT_DIPSETTING( 0xc000, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x4000, DEF_STR( Hard ) ) PORT_DIPSETTING( 0x0000, DEF_STR( Hardest ) ) + + /* These are needed due to the memory map shared with Wit's */ + PORT_START_TAG("P3") + PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("P4") //Player 4 + PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END @@ -5354,23 +5361,23 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( tndrcade ) - PORT_START_TAG("IN0") //Player 1 + PORT_START_TAG("P1") //Player 1 JOY_TYPE1_2BUTTONS(1) - PORT_START_TAG("IN1") //Player 2 + PORT_START_TAG("P2") //Player 2 JOY_TYPE1_2BUTTONS(2) - PORT_START_TAG("IN2") //Coins + PORT_START_TAG("COINS") //Coins PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_START2 ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_TILT ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START_TAG("IN3") //2 DSWs - $600001 & 3.b + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_START2 ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) ) @@ -5423,7 +5430,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( tndrcadj ) PORT_INCLUDE(tndrcade) - PORT_MODIFY("IN3") //2 DSWs - $600001 & 3.b + PORT_MODIFY("DSW") //2 DSWs - $600001 & 3.b PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW2:8") PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -5440,23 +5447,23 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( twineagl ) - PORT_START_TAG("IN0") //Player 1 + PORT_START_TAG("P1") //Player 1 JOY_TYPE1_2BUTTONS(1) - PORT_START_TAG("IN1") //Player 2 + PORT_START_TAG("P2") //Player 2 JOY_TYPE1_2BUTTONS(2) - PORT_START_TAG("IN2") //Coins + PORT_START_TAG("COINS") //Coins PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_START2 ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_TILT ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START_TAG("IN3") //2 DSWs - $600001 & 3.b + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_START2 ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b PORT_DIPNAME( 0x4001, 0x4001, "Copyright" ) // Always "Seta" if sim. players = 1 PORT_DIPSETTING( 0x4001, "Seta (Taito license)" ) PORT_DIPSETTING( 0x0001, "Taito" ) @@ -5506,23 +5513,23 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( umanclub ) - PORT_START_TAG("IN0") //Player 1 + PORT_START_TAG("P1") //Player 1 JOY_TYPE1_2BUTTONS(1) - PORT_START_TAG("IN1") //Player 2 + PORT_START_TAG("P2") //Player 2 JOY_TYPE1_2BUTTONS(2) - PORT_START_TAG("IN2") //Coins + PORT_START_TAG("COINS") //Coins PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START_TAG("IN3") //2 DSWs + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START_TAG("DSW") //2 DSWs PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -5581,17 +5588,17 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( utoukond ) - PORT_START_TAG("IN0") //Player 1 + PORT_START_TAG("P1") //Player 1 JOY_TYPE1_3BUTTONS(1) - PORT_START_TAG("IN1") //Player 2 + PORT_START_TAG("P2") //Player 2 JOY_TYPE1_3BUTTONS(2) - PORT_START_TAG("IN2") //Coins + PORT_START_TAG("COINS") //Coins PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* These are NOT Dip Switches but jumpers */ PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unused ) ) PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) @@ -5606,7 +5613,7 @@ static INPUT_PORTS_START( utoukond ) PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_START_TAG("IN3") //2 DSWs + PORT_START_TAG("DSW") //2 DSWs PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3,4") PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0005, DEF_STR( 3C_1C ) ) @@ -5760,24 +5767,24 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( wrofaero ) - PORT_START_TAG("IN0") //Player 1 - $400000.w + PORT_START_TAG("P1") //Player 1 - $400000.w JOY_TYPE1_3BUTTONS(1) // 3rd button selects the weapon // when the dsw for cheating is on - PORT_START_TAG("IN1") //Player 2 - $400002.w + PORT_START_TAG("P2") //Player 2 - $400002.w JOY_TYPE1_3BUTTONS(2) - PORT_START_TAG("IN2") //Coins - $400004.w + PORT_START_TAG("COINS") //Coins - $400004.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START_TAG("IN3") //2 DSWs - $600001 & 3.b + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:1") PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -5831,17 +5838,17 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( wits ) - PORT_START_TAG("IN0") //Player 1 + PORT_START_TAG("P1") //Player 1 JOY_TYPE1_2BUTTONS(1) - PORT_START_TAG("IN1") //Player 2 + PORT_START_TAG("P2") //Player 2 JOY_TYPE1_2BUTTONS(2) - PORT_START_TAG("IN2") //Coins + DSW + PORT_START_TAG("COINS") //Coins + DSW PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) PORT_DIPNAME( 0x0010, 0x0010, "Unknown 3-4*" ) // Jumpers, I guess PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -5854,7 +5861,7 @@ static INPUT_PORTS_START( wits ) PORT_DIPSETTING( 0x0040, "Visco (Japan Only)" ) PORT_DIPSETTING( 0x0000, "Athena (Japan Only)" ) - PORT_START_TAG("IN3") //2 DSWs - $600003 & 1.b + PORT_START_TAG("DSW") //2 DSWs - $600003 & 1.b PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) ) @@ -5898,10 +5905,10 @@ static INPUT_PORTS_START( wits ) PORT_DIPSETTING( 0x4000, DEF_STR( 1C_4C ) ) PORT_DIPSETTING( 0x0000, DEF_STR( 1C_6C ) ) - PORT_START_TAG("IN4") //Player 3 + PORT_START_TAG("P3") //Player 3 JOY_TYPE1_2BUTTONS(3) - PORT_START_TAG("IN5") //Player 4 + PORT_START_TAG("P4") //Player 4 JOY_TYPE1_2BUTTONS(4) INPUT_PORTS_END @@ -5911,23 +5918,23 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( zingzip ) - PORT_START_TAG("IN0") //Player 1 - $400000.w + PORT_START_TAG("P1") //Player 1 - $400000.w JOY_TYPE1_2BUTTONS(1) - PORT_START_TAG("IN1") //Player 2 - $400002.w + PORT_START_TAG("P2") //Player 2 - $400002.w JOY_TYPE1_2BUTTONS(2) - PORT_START_TAG("IN2") //Coins - $400004.w + PORT_START_TAG("COINS") //Coins - $400004.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) // no coin 2 - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START_TAG("IN3") //2 DSWs - $600001 & 3.b + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) // no coin 2 + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1") PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -5975,17 +5982,17 @@ INPUT_PORTS_END *************************************/ static INPUT_PORTS_START( pairlove ) - PORT_START_TAG("IN0") //Player 1 - $500001.b + PORT_START_TAG("P1") //Player 1 - $500001.b JOY_TYPE1_2BUTTONS(1) // button2 = speed up - PORT_START_TAG("IN1") //Player 2 - $500003.b + PORT_START_TAG("P2") //Player 2 - $500003.b JOY_TYPE1_2BUTTONS(2) - PORT_START_TAG("IN2") //Coins + DSW - $500005.b + PORT_START_TAG("COINS") //Coins + DSW - $500005.b PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) PORT_START_TAG("DSW") // 2 DIP switches PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1") @@ -6032,23 +6039,23 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( orbs ) - PORT_START_TAG("IN0") //Player 1 + PORT_START_TAG("P1") //Player 1 JOY_TYPE1_1BUTTON(1) - PORT_START_TAG("IN1") //Player 2 ?? + PORT_START_TAG("P2") //Player 2 ?? JOY_TYPE1_1BUTTON(2) - PORT_START_TAG("IN2") //Coins + PORT_START_TAG("COINS") //Coins PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_IMPULSE(5) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN3") //2 DSWs - $600001 & 3.b + PORT_START_TAG("DSW") //2 DSWs - $600001 & 3.b PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1") PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -6102,7 +6109,7 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( crazyfgt ) - PORT_START_TAG("IN0") //Coins - $610000.w + PORT_START_TAG("COINS") //Coins - $610000.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -6112,17 +6119,17 @@ static INPUT_PORTS_START( crazyfgt ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SPECIAL ) // protection - PORT_START_TAG("IN1") //? - $610002.w - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START_TAG("IN2") //Player - $610004.w + PORT_START_TAG("UNK") //? - $610002.w + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START_TAG("INPUT") //Player - $610004.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("top-center") PORT_CODE(KEYCODE_5_PAD) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("bottom-center") PORT_CODE(KEYCODE_2_PAD) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("top-left") PORT_CODE(KEYCODE_4_PAD) @@ -6132,7 +6139,7 @@ static INPUT_PORTS_START( crazyfgt ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_SERVICE1 ) // ticket - PORT_START_TAG("IN3") //2 DSWs - $630001 & 3.b + PORT_START_TAG("DSW") //2 DSWs - $630001 & 3.b PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3") PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) ) @@ -6183,7 +6190,7 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( inttoote ) - PORT_START_TAG("IN0") // DSW 1 + PORT_START_TAG("DSW1") // DSW 1 PORT_DIPNAME( 0x03, 0x03, "Max Bet" ) PORT_DIPSETTING( 0x03, "10" ) PORT_DIPSETTING( 0x02, "20" ) @@ -6208,7 +6215,7 @@ static INPUT_PORTS_START( inttoote ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START_TAG("IN1") // DSW 2&3 + PORT_START_TAG("DSW2_3") // DSW 2&3 PORT_DIPNAME( 0x0001, 0x0001, "Unknown 2-0" ) PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -6262,7 +6269,7 @@ static INPUT_PORTS_START( inttoote ) PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_START_TAG("IN2") + PORT_START_TAG("IN0") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SPECIAL ) // P1 coin out @@ -6280,7 +6287,7 @@ static INPUT_PORTS_START( inttoote ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN3") + PORT_START_TAG("IN1") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Door Open") PORT_TOGGLE PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Question Mark") @@ -6306,7 +6313,7 @@ static INPUT_PORTS_START( inttoote ) 5 1-6 (5H) 6 (6) */ - PORT_START_TAG("IN4") // 200000.w (0x08) + PORT_START_TAG("BET0") // 200000.w (0x08) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 1") PORT_CODE(KEYCODE_1_PAD) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 2") PORT_CODE(KEYCODE_2_PAD) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 3") PORT_CODE(KEYCODE_3_PAD) @@ -6324,7 +6331,7 @@ static INPUT_PORTS_START( inttoote ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN5") // 200000.w (0x10) + PORT_START_TAG("BET1") // 200000.w (0x10) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 6") PORT_CODE(KEYCODE_6_PAD) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Collect") PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -6342,7 +6349,7 @@ static INPUT_PORTS_START( inttoote ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN6") // 200000.w (0x20) + PORT_START_TAG("BET2") // 200000.w (0x20) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 1-2") PORT_CODE(KEYCODE_Q) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 1-3") PORT_CODE(KEYCODE_A) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 1-4") PORT_CODE(KEYCODE_Z) @@ -6360,7 +6367,7 @@ static INPUT_PORTS_START( inttoote ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN7") // 200000.w (0x40) + PORT_START_TAG("BET3") // 200000.w (0x40) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 2-3") PORT_CODE(KEYCODE_W) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 2-4") PORT_CODE(KEYCODE_S) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 2-5") PORT_CODE(KEYCODE_X) @@ -6378,7 +6385,7 @@ static INPUT_PORTS_START( inttoote ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN8") // 200000.w (0x80) + PORT_START_TAG("BET4") // 200000.w (0x80) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 3-5") PORT_CODE(KEYCODE_D) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 3-6") PORT_CODE(KEYCODE_C) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Bet 4-5") PORT_CODE(KEYCODE_R) diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c index dd6e431347c..7e1081956a3 100644 --- a/src/mame/drivers/seta2.c +++ b/src/mame/drivers/seta2.c @@ -453,19 +453,19 @@ static WRITE16_HANDLER( grdians_lockout_w ) } static ADDRESS_MAP_START( grdians_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0x304000, 0x30ffff) AM_READ(SMH_RAM ) // ? seems tile data - AM_RANGE(0x600000, 0x600001) AM_READ(input_port_0_word_r ) // DSW 1 - AM_RANGE(0x600002, 0x600003) AM_READ(input_port_1_word_r ) // DSW 2 - AM_RANGE(0x700000, 0x700001) AM_READ(input_port_2_word_r ) // P1 - AM_RANGE(0x700002, 0x700003) AM_READ(input_port_3_word_r ) // P2 - AM_RANGE(0x700004, 0x700005) AM_READ(input_port_4_word_r ) // Coins + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x304000, 0x30ffff) AM_READ(SMH_RAM ) // ? seems tile data + AM_RANGE(0x600000, 0x600001) AM_READ_PORT("DSW1") // DSW 1 + AM_RANGE(0x600002, 0x600003) AM_READ_PORT("DSW2") // DSW 2 + AM_RANGE(0x700000, 0x700001) AM_READ_PORT("P1") // P1 + AM_RANGE(0x700002, 0x700003) AM_READ_PORT("P2") // P2 + AM_RANGE(0x700004, 0x700005) AM_READ_PORT("SYSTEM") // Coins AM_RANGE(0x70000c, 0x70000d) AM_READ(watchdog_reset16_r ) // Watchdog AM_RANGE(0xb00000, 0xb03fff) AM_READ(seta_sound_word_r ) // Sound - AM_RANGE(0xc00000, 0xc3ffff) AM_READ(SMH_RAM ) // Sprites - AM_RANGE(0xc40000, 0xc4ffff) AM_READ(SMH_RAM ) // Palette - AM_RANGE(0xfffc00, 0xffffff) AM_READ(SMH_RAM ) // TMP68301 Registers + AM_RANGE(0xc00000, 0xc3ffff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0xc40000, 0xc4ffff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0xfffc00, 0xffffff) AM_READ(SMH_RAM ) // TMP68301 Registers ADDRESS_MAP_END static ADDRESS_MAP_START( grdians_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -523,16 +523,16 @@ static WRITE16_HANDLER( gundamex_eeprom_w ) } static ADDRESS_MAP_START( gundamex_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0x500000, 0x57ffff) AM_READ(SMH_ROM ) // ROM - AM_RANGE(0x600000, 0x600001) AM_READ(input_port_0_word_r ) // DSW 1 - AM_RANGE(0x600002, 0x600003) AM_READ(input_port_1_word_r ) // DSW 2 - AM_RANGE(0x700000, 0x700001) AM_READ(input_port_2_word_r ) // P1 - AM_RANGE(0x700002, 0x700003) AM_READ(input_port_3_word_r ) // P2 - AM_RANGE(0x700004, 0x700005) AM_READ(input_port_4_word_r ) // Coins - AM_RANGE(0x700008, 0x700009) AM_READ(input_port_5_word_r ) // P1 - AM_RANGE(0x70000a, 0x70000b) AM_READ(input_port_6_word_r ) // P2 + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x500000, 0x57ffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x600000, 0x600001) AM_READ_PORT("DSW1") // DSW 1 + AM_RANGE(0x600002, 0x600003) AM_READ_PORT("DSW2") // DSW 2 + AM_RANGE(0x700000, 0x700001) AM_READ_PORT("P1") // P1 + AM_RANGE(0x700002, 0x700003) AM_READ_PORT("P2") // P2 + AM_RANGE(0x700004, 0x700005) AM_READ_PORT("SYSTEM") // Coins + AM_RANGE(0x700008, 0x700009) AM_READ_PORT("IN0") // P1 + AM_RANGE(0x70000a, 0x70000b) AM_READ_PORT("IN1") // P2 AM_RANGE(0xb00000, 0xb03fff) AM_READ(seta_sound_word_r ) // Sound AM_RANGE(0xfffd0a, 0xfffd0b) AM_READ(gundamex_eeprom_r ) // parallel data register ADDRESS_MAP_END @@ -563,11 +563,11 @@ static READ16_HANDLER( mj4simai_p1_r ) { switch (keyboard_row) { - case 0x01: return input_port_read_indexed(machine, 3); - case 0x02: return input_port_read_indexed(machine, 4); - case 0x04: return input_port_read_indexed(machine, 5); - case 0x08: return input_port_read_indexed(machine, 6); - case 0x10: return input_port_read_indexed(machine, 7); + case 0x01: return input_port_read(machine, "KEY0"); + case 0x02: return input_port_read(machine, "KEY1"); + case 0x04: return input_port_read(machine, "KEY2"); + case 0x08: return input_port_read(machine, "KEY3"); + case 0x10: return input_port_read(machine, "KEY4"); default: logerror("p1_r with keyboard_row = %02x\n",keyboard_row); return 0xffff; } } @@ -579,18 +579,18 @@ static WRITE16_HANDLER( mj4simai_keyboard_w ) } static ADDRESS_MAP_START( mj4simai_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0x600000, 0x600001) AM_READ(mj4simai_p1_r ) // P1 - AM_RANGE(0x600002, 0x600003) AM_READ(mj4simai_p1_r ) // P2, but I'm using P1 again + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x600000, 0x600001) AM_READ(mj4simai_p1_r ) // P1 + AM_RANGE(0x600002, 0x600003) AM_READ(mj4simai_p1_r ) // P2, but I'm using P1 again AM_RANGE(0x600006, 0x600007) AM_READ(watchdog_reset16_r ) // Watchdog - AM_RANGE(0x600100, 0x600101) AM_READ(input_port_2_word_r ) // - AM_RANGE(0x600300, 0x600301) AM_READ(input_port_0_word_r ) // DSW 1 - AM_RANGE(0x600302, 0x600303) AM_READ(input_port_1_word_r ) // DSW 2 + AM_RANGE(0x600100, 0x600101) AM_READ_PORT("SYSTEM") // + AM_RANGE(0x600300, 0x600301) AM_READ_PORT("DSW1") // DSW 1 + AM_RANGE(0x600302, 0x600303) AM_READ_PORT("DSW2") // DSW 2 AM_RANGE(0xb00000, 0xb03fff) AM_READ(seta_sound_word_r ) // Sound - AM_RANGE(0xc00000, 0xc3ffff) AM_READ(SMH_RAM ) // Sprites - AM_RANGE(0xc40000, 0xc4ffff) AM_READ(SMH_RAM ) // Palette - AM_RANGE(0xfffc00, 0xffffff) AM_READ(SMH_RAM ) // TMP68301 Registers + AM_RANGE(0xc00000, 0xc3ffff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0xc40000, 0xc4ffff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0xfffc00, 0xffffff) AM_READ(SMH_RAM ) // TMP68301 Registers ADDRESS_MAP_END static ADDRESS_MAP_START( mj4simai_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -612,18 +612,18 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( myangel_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0x700000, 0x700001) AM_READ(input_port_2_word_r ) // P1 - AM_RANGE(0x700002, 0x700003) AM_READ(input_port_3_word_r ) // P2 - AM_RANGE(0x700004, 0x700005) AM_READ(input_port_4_word_r ) // Coins + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x700000, 0x700001) AM_READ_PORT("P1") // P1 + AM_RANGE(0x700002, 0x700003) AM_READ_PORT("P2") // P2 + AM_RANGE(0x700004, 0x700005) AM_READ_PORT("SYSTEM") // Coins AM_RANGE(0x700006, 0x700007) AM_READ(watchdog_reset16_r ) // Watchdog - AM_RANGE(0x700300, 0x700301) AM_READ(input_port_0_word_r ) // DSW 1 - AM_RANGE(0x700302, 0x700303) AM_READ(input_port_1_word_r ) // DSW 2 + AM_RANGE(0x700300, 0x700301) AM_READ_PORT("DSW1") // DSW 1 + AM_RANGE(0x700302, 0x700303) AM_READ_PORT("DSW2") // DSW 2 AM_RANGE(0xb00000, 0xb03fff) AM_READ(seta_sound_word_r ) // Sound - AM_RANGE(0xc00000, 0xc3ffff) AM_READ(SMH_RAM ) // Sprites - AM_RANGE(0xc40000, 0xc4ffff) AM_READ(SMH_RAM ) // Palette - AM_RANGE(0xfffc00, 0xffffff) AM_READ(SMH_RAM ) // TMP68301 Registers + AM_RANGE(0xc00000, 0xc3ffff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0xc40000, 0xc4ffff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0xfffc00, 0xffffff) AM_READ(SMH_RAM ) // TMP68301 Registers ADDRESS_MAP_END static ADDRESS_MAP_START( myangel_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -644,18 +644,18 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( myangel2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0x600000, 0x600001) AM_READ(input_port_2_word_r ) // P1 - AM_RANGE(0x600002, 0x600003) AM_READ(input_port_3_word_r ) // P2 - AM_RANGE(0x600004, 0x600005) AM_READ(input_port_4_word_r ) // Coins + AM_RANGE(0x000000, 0x1fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x600000, 0x600001) AM_READ_PORT("P1") // P1 + AM_RANGE(0x600002, 0x600003) AM_READ_PORT("P2") // P2 + AM_RANGE(0x600004, 0x600005) AM_READ_PORT("SYSTEM") // Coins AM_RANGE(0x600006, 0x600007) AM_READ(watchdog_reset16_r ) // Watchdog - AM_RANGE(0x600300, 0x600301) AM_READ(input_port_0_word_r ) // DSW 1 - AM_RANGE(0x600302, 0x600303) AM_READ(input_port_1_word_r ) // DSW 2 + AM_RANGE(0x600300, 0x600301) AM_READ_PORT("DSW1") // DSW 1 + AM_RANGE(0x600302, 0x600303) AM_READ_PORT("DSW0") // DSW 2 AM_RANGE(0xb00000, 0xb03fff) AM_READ(seta_sound_word_r ) // Sound - AM_RANGE(0xd00000, 0xd3ffff) AM_READ(SMH_RAM ) // Sprites - AM_RANGE(0xd40000, 0xd4ffff) AM_READ(SMH_RAM ) // Palette - AM_RANGE(0xfffc00, 0xffffff) AM_READ(SMH_RAM ) // TMP68301 Registers + AM_RANGE(0xd00000, 0xd3ffff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0xd40000, 0xd4ffff) AM_READ(SMH_RAM ) // Palette + AM_RANGE(0xfffc00, 0xffffff) AM_READ(SMH_RAM ) // TMP68301 Registers ADDRESS_MAP_END static ADDRESS_MAP_START( myangel2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -685,7 +685,7 @@ static READ16_HANDLER( pzlbowl_protection_r ) static READ16_HANDLER( pzlbowl_coins_r ) { - return input_port_read_indexed(machine, 4) | (mame_rand(machine) & 0x80 ); + return input_port_read(machine, "SYSTEM") | (mame_rand(machine) & 0x80 ); } static WRITE16_HANDLER( pzlbowl_coin_counter_w ) @@ -700,10 +700,10 @@ static WRITE16_HANDLER( pzlbowl_coin_counter_w ) static ADDRESS_MAP_START( pzlbowl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0x400300, 0x400301) AM_READ(input_port_0_word_r ) // DSW 1 - AM_RANGE(0x400302, 0x400303) AM_READ(input_port_1_word_r ) // DSW 2 - AM_RANGE(0x500000, 0x500001) AM_READ(input_port_2_word_r ) // P1 - AM_RANGE(0x500002, 0x500003) AM_READ(input_port_3_word_r ) // P2 + AM_RANGE(0x400300, 0x400301) AM_READ_PORT("DSW1") // DSW 1 + AM_RANGE(0x400302, 0x400303) AM_READ_PORT("DSW2") // DSW 2 + AM_RANGE(0x500000, 0x500001) AM_READ_PORT("P1") // P1 + AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P2") // P2 AM_RANGE(0x500004, 0x500005) AM_READ(pzlbowl_coins_r ) // Coins + Protection? AM_RANGE(0x500006, 0x500007) AM_READ(watchdog_reset16_r ) // Watchdog AM_RANGE(0x700000, 0x700001) AM_READ(pzlbowl_protection_r ) // Protection @@ -731,21 +731,21 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( penbros_readmem, ADDRESS_SPACE_PROGRAM, 16 ) - AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM - AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0x210000, 0x23ffff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0x300000, 0x30ffff) AM_READ(SMH_RAM ) // RAM - AM_RANGE(0x500300, 0x500301) AM_READ(input_port_0_word_r ) // DSW 1 - AM_RANGE(0x500302, 0x500303) AM_READ(input_port_1_word_r ) // DSW 2 - AM_RANGE(0x600000, 0x600001) AM_READ(input_port_2_word_r ) // P1 - AM_RANGE(0x600002, 0x600003) AM_READ(input_port_3_word_r ) // P2 - AM_RANGE(0x600004, 0x600005) AM_READ(input_port_4_word_r ) // Coins + AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x200000, 0x20ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x210000, 0x23ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x300000, 0x30ffff) AM_READ(SMH_RAM ) // RAM + AM_RANGE(0x500300, 0x500301) AM_READ_PORT("DSW1") // DSW 1 + AM_RANGE(0x500302, 0x500303) AM_READ_PORT("DSW2") // DSW 2 + AM_RANGE(0x600000, 0x600001) AM_READ_PORT("P1") // P1 + AM_RANGE(0x600002, 0x600003) AM_READ_PORT("P2") // P2 + AM_RANGE(0x600004, 0x600005) AM_READ_PORT("SYSTEM") // Coins AM_RANGE(0x600006, 0x600007) AM_READ(watchdog_reset16_r ) // Watchdog -// AM_RANGE(0x700000, 0x700001) AM_READ(pzlbowl_protection_r ) // Protection - AM_RANGE(0xb00000, 0xb3ffff) AM_READ(SMH_RAM ) // Sprites - AM_RANGE(0xb40000, 0xb4ffff) AM_READ(SMH_RAM ) // Palette +// AM_RANGE(0x700000, 0x700001) AM_READ(pzlbowl_protection_r ) // Protection + AM_RANGE(0xb00000, 0xb3ffff) AM_READ(SMH_RAM ) // Sprites + AM_RANGE(0xb40000, 0xb4ffff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0xa00000, 0xa03fff) AM_READ(seta_sound_word_r ) // Sound - AM_RANGE(0xfffc00, 0xffffff) AM_READ(SMH_RAM ) // TMP68301 Registers + AM_RANGE(0xfffc00, 0xffffff) AM_READ(SMH_RAM ) // TMP68301 Registers ADDRESS_MAP_END static ADDRESS_MAP_START( penbros_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -769,12 +769,12 @@ ADDRESS_MAP_END static READ16_HANDLER( samshoot_lightgun1_r ) { -// popmessage("%02x %02x",input_port_read_indexed(machine, 3),input_port_read_indexed(machine, 2)); - return (input_port_read_indexed(machine, 2) << 8) | input_port_read_indexed(machine, 3); +// popmessage("%02x %02x",input_port_read(machine, "GUN1X"),input_port_read(machine, "GUN1Y")); + return (input_port_read(machine, "GUN1Y") << 8) | input_port_read(machine, "GUN1X"); } static READ16_HANDLER( samshoot_lightgun2_r ) { - return (input_port_read_indexed(machine, 4) << 8) | input_port_read_indexed(machine, 5); + return (input_port_read(machine, "GUN2Y") << 8) | input_port_read(machine, "GUN2X"); } static WRITE16_HANDLER( samshoot_coin_w ) @@ -795,17 +795,17 @@ static ADDRESS_MAP_START( samshoot_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x200000, 0x20ffff ) AM_RAM AM_RANGE( 0x300000, 0x30ffff ) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) - AM_RANGE( 0x400000, 0x400001 ) AM_READ( input_port_0_word_r ) // DSW 1 - AM_RANGE( 0x400002, 0x400003 ) AM_READ( input_port_9_word_r ) // Buttons + AM_RANGE( 0x400000, 0x400001 ) AM_READ_PORT("DSW1") // DSW 1 + AM_RANGE( 0x400002, 0x400003 ) AM_READ_PORT("BUTTONS") // Buttons AM_RANGE( 0x400300, 0x40030f ) AM_WRITE( seta2_sound_bank_w ) // Samples Banks AM_RANGE( 0x500000, 0x500001 ) AM_READ( samshoot_lightgun1_r ) // P1 AM_RANGE( 0x580000, 0x580001 ) AM_READ( samshoot_lightgun2_r ) // P2 - AM_RANGE( 0x700000, 0x700001 ) AM_READ( input_port_6_word_r ) // Trigger - AM_RANGE( 0x700002, 0x700003 ) AM_READ( input_port_7_word_r ) // Pump - AM_RANGE( 0x700004, 0x700005 ) AM_READWRITE( input_port_8_word_r, samshoot_coin_w ) // Coins + AM_RANGE( 0x700000, 0x700001 ) AM_READ_PORT("TRIGGER") // Trigger + AM_RANGE( 0x700002, 0x700003 ) AM_READ_PORT("PUMP") // Pump + AM_RANGE( 0x700004, 0x700005 ) AM_READ_PORT("COIN") AM_WRITE( samshoot_coin_w ) // Coins AM_RANGE( 0x700006, 0x700007 ) AM_READ( watchdog_reset16_r ) // Watchdog? AM_RANGE( 0x800000, 0x83ffff ) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // Sprites @@ -814,7 +814,7 @@ static ADDRESS_MAP_START( samshoot_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x900000, 0x903fff ) AM_READWRITE( seta_sound_word_r, seta_sound_word_w ) // Sound - AM_RANGE( 0xfffd0a, 0xfffd0b ) AM_READ( input_port_1_word_r ) // parallel data register (DSW 2) + AM_RANGE( 0xfffd0a, 0xfffd0b ) AM_READ_PORT("DSW2") // parallel data register (DSW 2) AM_RANGE( 0xfffc00, 0xffffff ) AM_READWRITE( SMH_RAM, tmp68301_regs_w) AM_BASE(&tmp68301_regs ) // TMP68301 Registers ADDRESS_MAP_END @@ -831,7 +831,7 @@ ADDRESS_MAP_END ***************************************************************************/ static INPUT_PORTS_START( gundamex ) - PORT_START_TAG("IN0") // $600000.w + PORT_START_TAG("DSW1") // $600000.w PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1") PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0001, DEF_STR( On ) ) @@ -853,7 +853,7 @@ static INPUT_PORTS_START( gundamex ) PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN1") // $600002.w + PORT_START_TAG("DSW2") // $600002.w PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3") PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) ) @@ -880,7 +880,7 @@ static INPUT_PORTS_START( gundamex ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN2") // $700000.w + PORT_START_TAG("P1") // $700000.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) @@ -891,7 +891,7 @@ static INPUT_PORTS_START( gundamex ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN3") // $700002.w + PORT_START_TAG("P2") // $700002.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) @@ -902,7 +902,7 @@ static INPUT_PORTS_START( gundamex ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN4") // $700004.w + PORT_START_TAG("SYSTEM") // $700004.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -915,7 +915,7 @@ static INPUT_PORTS_START( gundamex ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN5") // $700008.w + PORT_START_TAG("IN0") // $700008.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -926,7 +926,7 @@ static INPUT_PORTS_START( gundamex ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN6") // $70000a.w + PORT_START_TAG("IN1") // $70000a.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -943,7 +943,7 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( grdians ) - PORT_START_TAG("IN0") // $600000.w + PORT_START_TAG("DSW1") // $600000.w PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:1,2") PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) ) // 0 PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) ) // 1 @@ -966,7 +966,7 @@ static INPUT_PORTS_START( grdians ) PORT_DIPSETTING( 0x0080, DEF_STR( On ) ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN1") // $600002.w + PORT_START_TAG("DSW2") // $600002.w PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3,4") PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0005, DEF_STR( 3C_1C ) ) @@ -1003,7 +1003,7 @@ static INPUT_PORTS_START( grdians ) PORT_DIPSETTING( 0x0000, DEF_STR( Free_Play ) ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN2") // $700000.w + PORT_START_TAG("P1") // $700000.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) @@ -1014,7 +1014,7 @@ static INPUT_PORTS_START( grdians ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN3") // $700002.w + PORT_START_TAG("P2") // $700002.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) @@ -1025,7 +1025,7 @@ static INPUT_PORTS_START( grdians ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN4") // $700004.w + PORT_START_TAG("SYSTEM") // $700004.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -1043,7 +1043,7 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( mj4simai ) - PORT_START_TAG("IN0") // $600300.w + PORT_START_TAG("DSW1") // $600300.w PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3") PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) ) @@ -1068,7 +1068,7 @@ static INPUT_PORTS_START( mj4simai ) PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN1") // $600302.w + PORT_START_TAG("DSW2") // $600302.w PORT_DIPNAME( 0x0007, 0x0004, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2,3") PORT_DIPSETTING( 0x0004, "0" ) PORT_DIPSETTING( 0x0003, "1" ) @@ -1095,7 +1095,7 @@ static INPUT_PORTS_START( mj4simai ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN2") // $600100.w + PORT_START_TAG("SYSTEM") // $600100.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -1106,7 +1106,7 @@ static INPUT_PORTS_START( mj4simai ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN3") // $600000(0) + PORT_START_TAG("KEY0") // $600000(0) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_I ) @@ -1115,7 +1115,7 @@ static INPUT_PORTS_START( mj4simai ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN4") // $600000(1) + PORT_START_TAG("KEY1") // $600000(1) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_J ) @@ -1124,7 +1124,7 @@ static INPUT_PORTS_START( mj4simai ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN) - PORT_START_TAG("IN5") // $600000(2) + PORT_START_TAG("KEY2") // $600000(2) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_K ) @@ -1132,14 +1132,14 @@ static INPUT_PORTS_START( mj4simai ) PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_BIT( 0xffe0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN6") // $600000(3) + PORT_START_TAG("KEY3") // $600000(3) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) PORT_BIT( 0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN7") // $600000(4) + PORT_START_TAG("KEY4") // $600000(4) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) @@ -1156,7 +1156,7 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( myangel ) - PORT_START_TAG("IN0") // $700300.w + PORT_START_TAG("DSW1") // $700300.w PORT_SERVICE_DIPLOC( 0x0001, IP_ACTIVE_LOW, "SW1:1" ) PORT_DIPUNUSED_DIPLOC( 0x0002, 0x0002, "SW1:2" ) /* Listed as "Unused" */ PORT_DIPUNUSED_DIPLOC( 0x0004, 0x0004, "SW1:3" ) /* Listed as "Unused" */ @@ -1176,7 +1176,7 @@ static INPUT_PORTS_START( myangel ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN1") // $700302.w + PORT_START_TAG("DSW2") // $700302.w PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW2:1,2,3,4") PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0005, DEF_STR( 3C_1C ) ) @@ -1202,7 +1202,7 @@ static INPUT_PORTS_START( myangel ) PORT_DIPSETTING( 0x0000, DEF_STR( Yes ) ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN2") //$700000.w + PORT_START_TAG("P1") //$700000.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1213,7 +1213,7 @@ static INPUT_PORTS_START( myangel ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN3") //$700002.w + PORT_START_TAG("P2") //$700002.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1224,7 +1224,7 @@ static INPUT_PORTS_START( myangel ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN4") //$700004.w + PORT_START_TAG("SYSTEM") //$700004.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -1242,7 +1242,7 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( myangel2 ) - PORT_START_TAG("IN0") //$600300.w + PORT_START_TAG("DSW1") //$600300.w PORT_SERVICE_DIPLOC( 0x0001, IP_ACTIVE_LOW, "SW1:1" ) PORT_DIPUNUSED_DIPLOC( 0x0002, 0x0002, "SW1:2" ) /* Listed as "Unused" */ PORT_DIPUNUSED_DIPLOC( 0x0004, 0x0004, "SW1:3" ) /* Listed as "Unused" */ @@ -1260,10 +1260,9 @@ static INPUT_PORTS_START( myangel2 ) PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:8") PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN1") //$600302.w + PORT_START_TAG("DSW2") //$600302.w PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW2:1,2,3,4") PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0005, DEF_STR( 3C_1C ) ) @@ -1287,7 +1286,7 @@ static INPUT_PORTS_START( myangel2 ) PORT_DIPUNUSED_DIPLOC( 0x0080, 0x0080, "SW2:8" ) /* Listed as "Unused" */ PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN2") //$600000.w + PORT_START_TAG("P1") //$600000.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1298,7 +1297,7 @@ static INPUT_PORTS_START( myangel2 ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN3") //$600002.w + PORT_START_TAG("P2") //$600002.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1309,7 +1308,7 @@ static INPUT_PORTS_START( myangel2 ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN4") //$600004.w + PORT_START_TAG("SYSTEM") //$600004.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -1327,7 +1326,7 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( pzlbowl ) - PORT_START_TAG("IN0") //$400300.w + PORT_START_TAG("DSW1") //$400300.w PORT_SERVICE_DIPLOC( 0x0001, IP_ACTIVE_LOW, "SW1:1" ) PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:2") PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) @@ -1351,7 +1350,7 @@ static INPUT_PORTS_START( pzlbowl ) PORT_DIPSETTING( 0x0000, "5" ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN1") //$400302.w + PORT_START_TAG("DSW2") //$400302.w PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW2:1,2,3,4") PORT_DIPSETTING( 0x0005, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x0008, DEF_STR( 2C_1C ) ) @@ -1381,7 +1380,7 @@ static INPUT_PORTS_START( pzlbowl ) PORT_DIPSETTING( 0x0080, DEF_STR( Japanese ) ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN2") //$500000.w + PORT_START_TAG("P1") //$500000.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) @@ -1392,7 +1391,7 @@ static INPUT_PORTS_START( pzlbowl ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN3") //$500002.w + PORT_START_TAG("P2") //$500002.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) @@ -1403,7 +1402,7 @@ static INPUT_PORTS_START( pzlbowl ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN4") //$500004.w + PORT_START_TAG("SYSTEM") //$500004.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) // unused, test mode shows it PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -1421,7 +1420,7 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( penbros ) - PORT_START_TAG("IN0") //$500300.w + PORT_START_TAG("DSW1") //$500300.w PORT_SERVICE_DIPLOC( 0x0001, IP_ACTIVE_LOW, "SW1:1" ) PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:2") PORT_DIPSETTING( 0x0002, DEF_STR( Off ) ) @@ -1442,7 +1441,7 @@ static INPUT_PORTS_START( penbros ) PORT_DIPSETTING( 0x0000, DEF_STR( 1C_2C ) ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN1") //$500302.w + PORT_START_TAG("DSW2") //$500302.w PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x0002, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) ) @@ -1465,7 +1464,7 @@ static INPUT_PORTS_START( penbros ) PORT_DIPSETTING( 0x0000, "5" ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN2") //$600000.w + PORT_START_TAG("P1") //$600000.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) @@ -1476,7 +1475,7 @@ static INPUT_PORTS_START( penbros ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN3") //$600002.w + PORT_START_TAG("P2") //$600002.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) @@ -1487,7 +1486,7 @@ static INPUT_PORTS_START( penbros ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN4") //$600004.w + PORT_START_TAG("SYSTEM") //$600004.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5) // unused, test mode shows it PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c index 2aa377b1334..7012ebfd48f 100644 --- a/src/mame/drivers/sf.c +++ b/src/mame/drivers/sf.c @@ -165,12 +165,12 @@ static const int scale[8] = { 0x00, 0x40, 0xe0, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe }; static READ16_HANDLER( button1_r ) { - return (scale[input_port_read_indexed(machine, 7)]<<8)|scale[input_port_read_indexed(machine, 5)]; + return (scale[input_port_read(machine, "IN3")]<<8) | scale[input_port_read(machine, "IN1")]; } static READ16_HANDLER( button2_r ) { - return (scale[input_port_read_indexed(machine, 8)]<<8)|scale[input_port_read_indexed(machine, 6)]; + return (scale[input_port_read(machine, "IN4")]<<8) | scale[input_port_read(machine, "IN2")]; } @@ -194,13 +194,13 @@ static WRITE8_HANDLER( msm5205_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x04ffff) AM_READ(SMH_ROM) AM_RANGE(0x800000, 0x800fff) AM_READ(SMH_RAM) - AM_RANGE(0xc00000, 0xc00001) AM_READ(input_port_3_word_r) - AM_RANGE(0xc00002, 0xc00003) AM_READ(input_port_4_word_r) + AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("COINS") + AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("IN0") AM_RANGE(0xc00004, 0xc00005) AM_READ(button1_r) AM_RANGE(0xc00006, 0xc00007) AM_READ(button2_r) - AM_RANGE(0xc00008, 0xc00009) AM_READ(input_port_0_word_r) - AM_RANGE(0xc0000a, 0xc0000b) AM_READ(input_port_1_word_r) - AM_RANGE(0xc0000c, 0xc0000d) AM_READ(input_port_2_word_r) + AM_RANGE(0xc00008, 0xc00009) AM_READ_PORT("DSW1") + AM_RANGE(0xc0000a, 0xc0000b) AM_READ_PORT("DSW2") + AM_RANGE(0xc0000c, 0xc0000d) AM_READ_PORT("SYSTEM") AM_RANGE(0xc0000e, 0xc0000f) AM_READ(dummy_r) AM_RANGE(0xff8000, 0xffdfff) AM_READ(SMH_RAM) AM_RANGE(0xffe000, 0xffffff) AM_READ(SMH_RAM) @@ -209,13 +209,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readmemus, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x04ffff) AM_READ(SMH_ROM) AM_RANGE(0x800000, 0x800fff) AM_READ(SMH_RAM) - AM_RANGE(0xc00000, 0xc00001) AM_READ(input_port_3_word_r) - AM_RANGE(0xc00002, 0xc00003) AM_READ(input_port_4_word_r) + AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("IN0") + AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("IN1") AM_RANGE(0xc00004, 0xc00005) AM_READ(dummy_r) AM_RANGE(0xc00006, 0xc00007) AM_READ(dummy_r) - AM_RANGE(0xc00008, 0xc00009) AM_READ(input_port_0_word_r) - AM_RANGE(0xc0000a, 0xc0000b) AM_READ(input_port_1_word_r) - AM_RANGE(0xc0000c, 0xc0000d) AM_READ(input_port_2_word_r) + AM_RANGE(0xc00008, 0xc00009) AM_READ_PORT("DSW1") + AM_RANGE(0xc0000a, 0xc0000b) AM_READ_PORT("DSW2") + AM_RANGE(0xc0000c, 0xc0000d) AM_READ_PORT("SYSTEM") AM_RANGE(0xc0000e, 0xc0000f) AM_READ(dummy_r) AM_RANGE(0xff8000, 0xffdfff) AM_READ(SMH_RAM) AM_RANGE(0xffe000, 0xffffff) AM_READ(SMH_RAM) @@ -224,13 +224,13 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readmemjp, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x04ffff) AM_READ(SMH_ROM) AM_RANGE(0x800000, 0x800fff) AM_READ(SMH_RAM) - AM_RANGE(0xc00000, 0xc00001) AM_READ(input_port_3_word_r) - AM_RANGE(0xc00002, 0xc00003) AM_READ(input_port_4_word_r) - AM_RANGE(0xc00004, 0xc00005) AM_READ(input_port_5_word_r) + AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("COINS") + AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("P1") + AM_RANGE(0xc00004, 0xc00005) AM_READ_PORT("P2") AM_RANGE(0xc00006, 0xc00007) AM_READ(dummy_r) - AM_RANGE(0xc00008, 0xc00009) AM_READ(input_port_0_word_r) - AM_RANGE(0xc0000a, 0xc0000b) AM_READ(input_port_1_word_r) - AM_RANGE(0xc0000c, 0xc0000d) AM_READ(input_port_2_word_r) + AM_RANGE(0xc00008, 0xc00009) AM_READ_PORT("DSW1") + AM_RANGE(0xc0000a, 0xc0000b) AM_READ_PORT("DSW2") + AM_RANGE(0xc0000c, 0xc0000d) AM_READ_PORT("SYSTEM") AM_RANGE(0xc0000e, 0xc0000f) AM_READ(dummy_r) AM_RANGE(0xff8000, 0xffdfff) AM_READ(SMH_RAM) AM_RANGE(0xffe000, 0xffffff) AM_READ(SMH_RAM) @@ -291,7 +291,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( sf ) - PORT_START + PORT_START_TAG("DSW1") PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) ) @@ -339,7 +339,7 @@ static INPUT_PORTS_START( sf ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_SERVICE( 0x8000, IP_ACTIVE_LOW ) - PORT_START + PORT_START_TAG("DSW2") PORT_DIPNAME( 0x0007, 0x0007, "Continuation max stage" ) PORT_DIPSETTING( 0x0007, "5th" ) PORT_DIPSETTING( 0x0006, "4th" ) @@ -373,7 +373,7 @@ static INPUT_PORTS_START( sf ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("SYSTEM") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -391,7 +391,7 @@ static INPUT_PORTS_START( sf ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("COINS") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -409,7 +409,7 @@ static INPUT_PORTS_START( sf ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("IN0") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) @@ -427,7 +427,7 @@ static INPUT_PORTS_START( sf ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) @@ -437,7 +437,7 @@ static INPUT_PORTS_START( sf ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("IN2") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_PLAYER(1) @@ -447,7 +447,7 @@ static INPUT_PORTS_START( sf ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("IN3") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) @@ -457,7 +457,7 @@ static INPUT_PORTS_START( sf ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("IN4") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_PLAYER(2) @@ -469,7 +469,7 @@ static INPUT_PORTS_START( sf ) INPUT_PORTS_END static INPUT_PORTS_START( sfus ) - PORT_START + PORT_START_TAG("DSW1") PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) ) @@ -517,7 +517,7 @@ static INPUT_PORTS_START( sfus ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_SERVICE( 0x8000, IP_ACTIVE_LOW ) - PORT_START + PORT_START_TAG("DSW2") PORT_DIPNAME( 0x0007, 0x0007, "Continuation max stage" ) PORT_DIPSETTING( 0x0007, "5th" ) PORT_DIPSETTING( 0x0006, "4th" ) @@ -551,7 +551,7 @@ static INPUT_PORTS_START( sfus ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("SYSTEM") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -569,7 +569,7 @@ static INPUT_PORTS_START( sfus ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("IN0") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) @@ -587,7 +587,7 @@ static INPUT_PORTS_START( sfus ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("IN1") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) @@ -607,7 +607,7 @@ static INPUT_PORTS_START( sfus ) INPUT_PORTS_END static INPUT_PORTS_START( sfjp ) - PORT_START + PORT_START_TAG("DSW1") PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) ) @@ -655,7 +655,7 @@ static INPUT_PORTS_START( sfjp ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_SERVICE( 0x8000, IP_ACTIVE_LOW ) - PORT_START + PORT_START_TAG("DSW2") PORT_DIPNAME( 0x0007, 0x0007, "Continuation max stage" ) PORT_DIPSETTING( 0x0007, "5th" ) PORT_DIPSETTING( 0x0006, "4th" ) @@ -689,7 +689,7 @@ static INPUT_PORTS_START( sfjp ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("SYSTEM") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -707,7 +707,7 @@ static INPUT_PORTS_START( sfjp ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("COINS") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -725,7 +725,7 @@ static INPUT_PORTS_START( sfjp ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("P1") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) @@ -743,7 +743,7 @@ static INPUT_PORTS_START( sfjp ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("P2") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c index 7be901d9518..78b403dc20f 100644 --- a/src/mame/drivers/shadfrce.c +++ b/src/mame/drivers/shadfrce.c @@ -191,16 +191,16 @@ static READ16_HANDLER( shadfrce_input_ports_r ) switch (offset) { case 0 : - data = (input_port_read_indexed(machine, 0) & 0xff) | ((input_port_read_indexed(machine, 7) & 0xc0) << 6) | ((input_port_read_indexed(machine, 4) & 0x0f) << 8); + data = (input_port_read(machine, "P1") & 0xff) | ((input_port_read(machine, "DSW2") & 0xc0) << 6) | ((input_port_read(machine, "SYSTEM") & 0x0f) << 8); break; case 1 : - data = (input_port_read_indexed(machine, 1) & 0xff) | ((input_port_read_indexed(machine, 7) & 0x3f) << 8); + data = (input_port_read(machine, "P2") & 0xff) | ((input_port_read(machine, "DSW2") & 0x3f) << 8); break; case 2 : - data = (input_port_read_indexed(machine, 2) & 0xff) | ((input_port_read_indexed(machine, 6) & 0x3f) << 8); + data = (input_port_read(machine, "EXTRA") & 0xff) | ((input_port_read(machine, "DSW1") & 0x3f) << 8); break; case 3 : - data = (input_port_read_indexed(machine, 3) & 0xff) | ((input_port_read_indexed(machine, 6) & 0xc0) << 2) | ((input_port_read_indexed(machine, 5) & 0x3c) << 8); + data = (input_port_read(machine, "OTHER") & 0xff) | ((input_port_read(machine, "DSW1") & 0xc0) << 2) | ((input_port_read(machine, "MISC") & 0x3c) << 8); break; } @@ -242,10 +242,10 @@ static ADDRESS_MAP_START( shadfrce_readmem, ADDRESS_SPACE_PROGRAM, 16 ) #if USE_SHADFRCE_FAKE_INPUT_PORTS AM_RANGE(0x1d0020, 0x1d0027) AM_READ(shadfrce_input_ports_r) #else - AM_RANGE(0x1d0020, 0x1d0021) AM_READ(input_port_0_word_r) - AM_RANGE(0x1d0022, 0x1d0023) AM_READ(input_port_1_word_r) - AM_RANGE(0x1d0024, 0x1d0025) AM_READ(input_port_2_word_r) - AM_RANGE(0x1d0026, 0x1d0027) AM_READ(input_port_3_word_r) + AM_RANGE(0x1d0020, 0x1d0021) AM_READ_PORT("IN0") + AM_RANGE(0x1d0022, 0x1d0023) AM_READ_PORT("IN1") + AM_RANGE(0x1d0024, 0x1d0025) AM_READ_PORT("IN2") + AM_RANGE(0x1d0026, 0x1d0027) AM_READ_PORT("IN3") #endif AM_RANGE(0x1F0000, 0x1FFFFF) AM_READ(SMH_RAM) ADDRESS_MAP_END @@ -323,13 +323,13 @@ ADDRESS_MAP_END #if USE_SHADFRCE_FAKE_INPUT_PORTS static INPUT_PORTS_START( shadfrce ) - PORT_START /* Fake IN0 (player 1 inputs) */ + PORT_START_TAG("P1") /* Fake IN0 (player 1 inputs) */ SHADFRCE_PLAYER_INPUT( 1, IPT_START1 ) - PORT_START /* Fake IN1 (player 2 inputs) */ + PORT_START_TAG("P2") /* Fake IN1 (player 2 inputs) */ SHADFRCE_PLAYER_INPUT( 2, IPT_START2 ) - PORT_START /* Fake IN2 (players 1 & 2 extra inputs */ + PORT_START_TAG("EXTRA") /* Fake IN2 (players 1 & 2 extra inputs */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) @@ -339,21 +339,21 @@ static INPUT_PORTS_START( shadfrce ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* Fake IN3 (other extra inputs ?) */ + PORT_START_TAG("OTHER") /* Fake IN3 (other extra inputs ?) */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* Fake IN4 (system inputs) */ + PORT_START_TAG("SYSTEM") /* Fake IN4 (system inputs) */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) /* only in "test mode" ? */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) /* only in "test mode" ? */ PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* Fake IN5 (misc) */ + PORT_START_TAG("MISC") /* Fake IN5 (misc) */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_VBLANK ) /* guess */ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* must be ACTIVE_LOW or 'shadfrcj' jumps to the end (code at 0x04902e) */ PORT_BIT( 0xeb, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* Fake IN6 (DIP1) */ + PORT_START_TAG("DSW1") /* Fake IN6 (DIP1) */ PORT_DIPNAME( 0x01, 0x01, "Unused DIP 1-1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -376,7 +376,7 @@ static INPUT_PORTS_START( shadfrce ) PORT_DIPSETTING( 0x40, DEF_STR( On ) ) PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) - PORT_START /* Fake IN7 (DIP2) */ + PORT_START_TAG("DSW2") /* Fake IN7 (DIP2) */ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x01, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x03, DEF_STR( Normal ) ) @@ -402,7 +402,7 @@ static INPUT_PORTS_START( shadfrce ) INPUT_PORTS_END #else static INPUT_PORTS_START( shadfrce ) - PORT_START /* IN0 - $1d0020.w */ + PORT_START_TAG("IN0") /* IN0 - $1d0020.w */ SHADFRCE_PLAYER_INPUT( 1, IPT_START1 ) PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN2 ) /* only in "test mode" ? */ @@ -417,7 +417,7 @@ static INPUT_PORTS_START( shadfrce ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN1 - $1d0022.w */ + PORT_START_TAG("IN1") /* IN1 - $1d0022.w */ SHADFRCE_PLAYER_INPUT( 2, IPT_START2 ) PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x0100, DEF_STR( Easy ) ) @@ -438,7 +438,7 @@ static INPUT_PORTS_START( shadfrce ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN2 - $1d0024.w */ + PORT_START_TAG("IN2") /* IN2 - $1d0024.w */ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) @@ -467,7 +467,7 @@ static INPUT_PORTS_START( shadfrce ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN3 - $1d0026.w */ + PORT_START_TAG("IN3") /* IN3 - $1d0026.w */ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED ) diff --git a/src/mame/drivers/shisen.c b/src/mame/drivers/shisen.c index 11e7cab4766..c0082b9b52b 100644 --- a/src/mame/drivers/shisen.c +++ b/src/mame/drivers/shisen.c @@ -20,18 +20,18 @@ extern VIDEO_UPDATE( sichuan2 ); static READ8_HANDLER( sichuan2_dsw1_r ) { - int ret = input_port_read_indexed(machine,3); + int ret = input_port_read(machine, "DSW1"); /* Based on the coin mode fill in the upper bits */ - if (input_port_read_indexed(machine,4) & 0x04) + if (input_port_read(machine, "DSW2") & 0x04) { /* Mode 1 */ - ret |= (input_port_read_indexed(machine,5) << 4); + ret |= (input_port_read(machine, "DSW1") << 4); } else { /* Mode 2 */ - ret |= (input_port_read_indexed(machine,5) & 0xf0); + ret |= (input_port_read(machine, "DSW1") & 0xf0); } return ret; @@ -64,10 +64,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READ(sichuan2_dsw1_r) - AM_RANGE(0x01, 0x01) AM_READ(input_port_4_r) - AM_RANGE(0x02, 0x02) AM_READ(input_port_0_r) - AM_RANGE(0x03, 0x03) AM_READ(input_port_1_r) - AM_RANGE(0x04, 0x04) AM_READ(input_port_2_r) + AM_RANGE(0x01, 0x01) AM_READ_PORT("DSW2") + AM_RANGE(0x02, 0x02) AM_READ_PORT("P1") + AM_RANGE(0x03, 0x03) AM_READ_PORT("P2") + AM_RANGE(0x04, 0x04) AM_READ_PORT("COIN") ADDRESS_MAP_END static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) @@ -105,7 +105,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( shisen ) - PORT_START_TAG("IN0") + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY @@ -115,7 +115,7 @@ static INPUT_PORTS_START( shisen ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN1") + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c index f317c8e8728..2c21e90d144 100644 --- a/src/mame/drivers/shootout.c +++ b/src/mame/drivers/shootout.c @@ -78,10 +78,10 @@ static WRITE8_HANDLER( shootout_coin_counter_w ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) - AM_RANGE(0x1000, 0x1000) AM_READ(input_port_0_r) - AM_RANGE(0x1001, 0x1001) AM_READ(input_port_1_r) - AM_RANGE(0x1002, 0x1002) AM_READ(input_port_2_r) - AM_RANGE(0x1003, 0x1003) AM_READ(input_port_3_r) + AM_RANGE(0x1000, 0x1000) AM_READ_PORT("DSW1") + AM_RANGE(0x1001, 0x1001) AM_READ_PORT("P1") + AM_RANGE(0x1002, 0x1002) AM_READ_PORT("P2") + AM_RANGE(0x1003, 0x1003) AM_READ_PORT("DSW2") AM_RANGE(0x2000, 0x27ff) AM_READ(SMH_RAM) /* foreground */ AM_RANGE(0x2800, 0x2fff) AM_READ(SMH_RAM) /* background */ AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) @@ -168,7 +168,7 @@ static INPUT_PORTS_START( shootout ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START_TAG("IN0") + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY @@ -178,7 +178,7 @@ static INPUT_PORTS_START( shootout ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("IN1") + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL @@ -299,7 +299,7 @@ static INTERRUPT_GEN( shootout_interrupt ) { static int coin = 0; - if ( input_port_read_indexed(machine, 2 ) & 0xc0 ) { + if ( input_port_read(machine, "P2") & 0xc0 ) { if ( coin == 0 ) { coin = 1; nmi_line_pulse(machine, cpunum); diff --git a/src/mame/drivers/shuuz.c b/src/mame/drivers/shuuz.c index 7bfc7b85e62..389dc6c6256 100644 --- a/src/mame/drivers/shuuz.c +++ b/src/mame/drivers/shuuz.c @@ -99,8 +99,8 @@ static READ16_HANDLER( leta_r ) /* when reading the even ports, do a real analog port update */ if (which == 0) { - int dx = (INT8)input_port_read_indexed(machine, 2); - int dy = (INT8)input_port_read_indexed(machine, 3); + int dx = (INT8)input_port_read(machine, "TRACKX"); + int dy = (INT8)input_port_read(machine, "TRACKY"); cur[0] = dx + dy; cur[1] = dx - dy; @@ -140,7 +140,7 @@ static WRITE16_HANDLER( adpcm_w ) static READ16_HANDLER( special_port0_r ) { - int result = input_port_read_indexed(machine, 0); + int result = input_port_read(machine, "SYSTEM"); if ((result & 0x0800) && atarigen_get_hblank(machine->primary_screen)) result &= ~0x0800; @@ -163,7 +163,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x102000, 0x102001) AM_WRITE(watchdog_reset16_w) AM_RANGE(0x103000, 0x103003) AM_READ(leta_r) AM_RANGE(0x105000, 0x105001) AM_READWRITE(special_port0_r, latch_w) - AM_RANGE(0x105002, 0x105003) AM_READ(input_port_1_word_r) + AM_RANGE(0x105002, 0x105003) AM_READ_PORT("BUTTONS") AM_RANGE(0x106000, 0x106001) AM_READWRITE(adpcm_r, adpcm_w) AM_RANGE(0x107000, 0x107007) AM_NOP AM_RANGE(0x3e0000, 0x3e087f) AM_RAM_WRITE(atarigen_666_paletteram_w) AM_BASE(&paletteram16) @@ -186,32 +186,32 @@ ADDRESS_MAP_END *************************************/ static INPUT_PORTS_START( shuuz ) - PORT_START + PORT_START_TAG("SYSTEM") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x07fc, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_VBLANK ) PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + PORT_START_TAG("BUTTONS") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x07fc, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_SERVICE( 0x0800, IP_ACTIVE_LOW ) PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + PORT_START_TAG("TRACKX") PORT_BIT( 0xff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(30) PORT_PLAYER(1) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + PORT_START_TAG("TRACKY") PORT_BIT( 0xff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(30) PORT_REVERSE PORT_PLAYER(1) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END static INPUT_PORTS_START( shuuz2 ) - PORT_START + PORT_START_TAG("SYSTEM") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x00fc, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -223,7 +223,7 @@ static INPUT_PORTS_START( shuuz2 ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Crosshair Debug SW") PORT_CODE(KEYCODE_C) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Freeze Debug SW") PORT_CODE(KEYCODE_F) - PORT_START + PORT_START_TAG("BUTTONS") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x00fc, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -235,11 +235,11 @@ static INPUT_PORTS_START( shuuz2 ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) - PORT_START + PORT_START_TAG("TRACKX") PORT_BIT( 0xff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(30) PORT_PLAYER(1) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + PORT_START_TAG("TRACKY") PORT_BIT( 0xff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(30) PORT_REVERSE PORT_PLAYER(1) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c index 87fddd09a03..9bf9691041a 100644 --- a/src/mame/drivers/sidearms.c +++ b/src/mame/drivers/sidearms.c @@ -74,11 +74,11 @@ static WRITE8_HANDLER( sidearms_bankswitch_w ) static READ8_HANDLER( turtship_ports_r ) { int i,res; - + static const char *portnames[] = { "SYSTEM", "P1", "P2", "DSW0", "DSW1", "NOT_PRESENT", "NOT_PRESENT", "NOT_PRESENT" }; // only inputs 0-4 are present res = 0; for (i = 0;i < 8;i++) - res |= ((input_port_read_indexed(machine, i) >> offset) & 1) << i; + res |= ((input_port_read_safe(machine, portnames[i], 0) >> offset) & 1) << i; return res; } @@ -87,12 +87,12 @@ static READ8_HANDLER( turtship_ports_r ) static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) - AM_RANGE(0xc800, 0xc800) AM_READ(input_port_0_r) - AM_RANGE(0xc801, 0xc801) AM_READ(input_port_1_r) - AM_RANGE(0xc802, 0xc802) AM_READ(input_port_2_r) - AM_RANGE(0xc803, 0xc803) AM_READ(input_port_3_r) - AM_RANGE(0xc804, 0xc804) AM_READ(input_port_4_r) - AM_RANGE(0xc805, 0xc805) AM_READ(input_port_5_r) + AM_RANGE(0xc800, 0xc800) AM_READ_PORT("SYSTEM") + AM_RANGE(0xc801, 0xc801) AM_READ_PORT("P1") + AM_RANGE(0xc802, 0xc802) AM_READ_PORT("P2") + AM_RANGE(0xc803, 0xc803) AM_READ_PORT("DSW0") + AM_RANGE(0xc804, 0xc804) AM_READ_PORT("DSW1") + AM_RANGE(0xc805, 0xc805) AM_READ_PORT("DSW2") AM_RANGE(0xd000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END @@ -184,14 +184,14 @@ static WRITE8_HANDLER( whizz_bankswitch_w ) static ADDRESS_MAP_START( whizz_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) - AM_RANGE(0xc800, 0xc800) AM_READ(input_port_0_r) - AM_RANGE(0xc801, 0xc801) AM_READ(input_port_1_r) - AM_RANGE(0xc802, 0xc802) AM_READ(input_port_2_r) - AM_RANGE(0xc803, 0xc803) AM_READ(input_port_3_r) - AM_RANGE(0xc804, 0xc804) AM_READ(input_port_4_r) - AM_RANGE(0xc805, 0xc805) AM_READ(input_port_5_r) - AM_RANGE(0xc806, 0xc806) AM_READ(input_port_6_r) - AM_RANGE(0xc807, 0xc807) AM_READ(input_port_7_r) + AM_RANGE(0xc800, 0xc800) AM_READ_PORT("DSW0") + AM_RANGE(0xc801, 0xc801) AM_READ_PORT("DSW1") + AM_RANGE(0xc802, 0xc802) AM_READ_PORT("DSW2") + AM_RANGE(0xc803, 0xc803) AM_READ_PORT("IN0") + AM_RANGE(0xc804, 0xc804) AM_READ_PORT("IN1") + AM_RANGE(0xc805, 0xc805) AM_READ_PORT("IN2") + AM_RANGE(0xc806, 0xc806) AM_READ_PORT("IN3") + AM_RANGE(0xc807, 0xc807) AM_READ_PORT("IN4") AM_RANGE(0xd000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END @@ -241,7 +241,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( sidearms ) - PORT_START_TAG("IN0") + PORT_START_TAG("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -253,7 +253,7 @@ static INPUT_PORTS_START( sidearms ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_START_TAG("IN1") + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY @@ -263,7 +263,7 @@ static INPUT_PORTS_START( sidearms ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN2") + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL @@ -328,7 +328,7 @@ static INPUT_PORTS_START( sidearms ) INPUT_PORTS_END static INPUT_PORTS_START( turtship ) - PORT_START_TAG("IN0") + PORT_START_TAG("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -338,7 +338,7 @@ static INPUT_PORTS_START( turtship ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_START_TAG("IN1") + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY @@ -348,7 +348,7 @@ static INPUT_PORTS_START( turtship ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN2") + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL @@ -409,7 +409,7 @@ static INPUT_PORTS_START( turtship ) INPUT_PORTS_END static INPUT_PORTS_START( dyger ) - PORT_START_TAG("IN0") + PORT_START_TAG("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* seems to be 1-player only */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -419,7 +419,7 @@ static INPUT_PORTS_START( dyger ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN1") + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY @@ -429,7 +429,7 @@ static INPUT_PORTS_START( dyger ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN2") + PORT_START_TAG("P2") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* seems to be 1-player only */ PORT_START_TAG("DSW0") @@ -560,7 +560,7 @@ static INPUT_PORTS_START( whizz ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START_TAG("IN3") + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) @@ -578,7 +578,7 @@ static INPUT_PORTS_START( whizz ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START_TAG("IN4") /* 8-bit */ + PORT_START_TAG("IN1") /* 8-bit */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) @@ -586,14 +586,14 @@ static INPUT_PORTS_START( whizz ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN5") /* 8-bit */ + PORT_START_TAG("IN2") /* 8-bit */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN6") + PORT_START_TAG("IN3") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -603,7 +603,7 @@ static INPUT_PORTS_START( whizz ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN7") + PORT_START_TAG("IN4") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c index bd4005e7809..b5e9b8e2d10 100644 --- a/src/mame/drivers/silkroad.c +++ b/src/mame/drivers/silkroad.c @@ -147,13 +147,13 @@ static WRITE32_HANDLER( paletteram32_xRRRRRGGGGGBBBBB_dword_w ) /* player inputs */ static READ32_HANDLER(io32_r) { - return ((input_port_read_indexed(machine, 0) << 16) | (input_port_read_indexed(machine, 1) << 0)); + return ((input_port_read(machine, "PLAYERS") << 16) | (input_port_read(machine, "SYSTEM") << 0)); } /* dipswitches */ static READ32_HANDLER(io32_1_r) { - return input_port_read_indexed(machine, 2)<<16; + return input_port_read(machine, "DSW")<<16; } /* sound I/O */ @@ -217,7 +217,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x808000, 0x80bfff) AM_READ(SMH_RAM) AM_RANGE(0xC00000, 0xC00003) AM_READ(io32_r) // player inputs - AM_RANGE(0xC00004, 0xC00007) AM_READ(io32_1_r) // dip switches + AM_RANGE(0xC00004, 0xC00007) AM_READ(io32_1_r) // dip switches AM_RANGE(0xC00024, 0xC00027) AM_READ(silk_6295_0_r) AM_RANGE(0xC0002C, 0xC0002f) AM_READ(silk_ym_r) AM_RANGE(0xC00030, 0xC00033) AM_READ(silk_6295_1_r) @@ -259,7 +259,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( silkroad ) - PORT_START /* Players inputs */ + PORT_START_TAG("PLAYERS") /* Players inputs */ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) @@ -277,7 +277,7 @@ static INPUT_PORTS_START( silkroad ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) - PORT_START /* System inputs */ + PORT_START_TAG("SYSTEM") /* System inputs */ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 ) @@ -295,7 +295,7 @@ static INPUT_PORTS_START( silkroad ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* DSW */ + PORT_START_TAG("DSW") /* DSW */ PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Lives ) ) PORT_DIPSETTING( 0x0001, "1" ) PORT_DIPSETTING( 0x0000, "2" ) @@ -345,7 +345,7 @@ static INPUT_PORTS_START( silkroad ) PORT_DIPSETTING( 0xa000, DEF_STR(1C_3C)) PORT_DIPSETTING( 0x8000, DEF_STR(1C_4C)) -// PORT_START /* Misc inputs */ +// PORT_START_TAG("MISC") /* Misc inputs */ // PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* VBLANK ? */ // PORT_BIT( 0xff7f, IP_ACTIVE_LOW, IPT_UNUSED ) /* unknown / unused */ INPUT_PORTS_END diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c index de10736ed56..37ffc215798 100644 --- a/src/mame/drivers/simpl156.c +++ b/src/mame/drivers/simpl156.c @@ -104,7 +104,7 @@ extern VIDEO_UPDATE( simpl156 ); static INPUT_PORTS_START( simpl156 ) - PORT_START /* 16bit */ + PORT_START_TAG("IN0") /* 16bit */ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -113,7 +113,7 @@ static INPUT_PORTS_START( simpl156 ) PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_SPECIAL ) // eeprom?.. - PORT_START /* 16bit */ + PORT_START_TAG("IN1") /* 16bit */ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -138,7 +138,7 @@ static READ32_HANDLER( simpl156_inputs_read ) int eep = eeprom_read_bit(); UINT32 returndata; - returndata = input_port_read_indexed(machine, 0)^0xffff0000; + returndata = input_port_read(machine, "IN0") ^ 0xffff0000; returndata^= ( (eep<<8) ); return returndata; @@ -169,7 +169,7 @@ static READ32_HANDLER( simpl156_system_r ) { UINT32 returndata; - returndata = input_port_read_indexed(machine, 1); + returndata = input_port_read(machine, "IN1"); return returndata; } diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c index 9fe7965daa4..2f76e02e4cd 100644 --- a/src/mame/drivers/simpsons.c +++ b/src/mame/drivers/simpsons.c @@ -25,12 +25,12 @@ someone@secureshell.com static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM - AM_RANGE(0x1f80, 0x1f80) AM_READ(input_port_4_r) + AM_RANGE(0x1f80, 0x1f80) AM_READ_PORT("COIN") AM_RANGE(0x1f81, 0x1f81) AM_READ(simpsons_eeprom_r) - AM_RANGE(0x1f90, 0x1f90) AM_READ(input_port_0_r) - AM_RANGE(0x1f91, 0x1f91) AM_READ(input_port_1_r) - AM_RANGE(0x1f92, 0x1f92) AM_READ(input_port_2_r) - AM_RANGE(0x1f93, 0x1f93) AM_READ(input_port_3_r) + AM_RANGE(0x1f90, 0x1f90) AM_READ_PORT("P1") + AM_RANGE(0x1f91, 0x1f91) AM_READ_PORT("P2") + AM_RANGE(0x1f92, 0x1f92) AM_READ_PORT("P3") + AM_RANGE(0x1f93, 0x1f93) AM_READ_PORT("P4") AM_RANGE(0x1fa0, 0x1fa7) AM_WRITE(K053246_w) AM_RANGE(0x1fb0, 0x1fbf) AM_WRITE(K053251_w) AM_RANGE(0x1fc0, 0x1fc0) AM_WRITE(simpsons_coin_counter_w) @@ -92,7 +92,7 @@ ADDRESS_MAP_END ***************************************************************************/ static INPUT_PORTS_START( simpsons ) - PORT_START /* IN0 - Player 1 */ + PORT_START_TAG("P1") /* IN0 - Player 1 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) @@ -102,7 +102,7 @@ static INPUT_PORTS_START( simpsons ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) //BUTTON3 Unused PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START /* IN1 - Player 2 */ + PORT_START_TAG("P2") /* IN1 - Player 2 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) @@ -112,7 +112,7 @@ static INPUT_PORTS_START( simpsons ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) //BUTTON3 Unused PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START /* IN2 - Player 3 - Used on the 4p version */ + PORT_START_TAG("P3") /* IN2 - Player 3 - Used on the 4p version */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3) @@ -122,7 +122,7 @@ static INPUT_PORTS_START( simpsons ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) //BUTTON3 Unused PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 ) - PORT_START /* IN3 - Player 4 - Used on the 4p version */ + PORT_START_TAG("P4") /* IN3 - Player 4 - Used on the 4p version */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4) @@ -132,7 +132,7 @@ static INPUT_PORTS_START( simpsons ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) //BUTTON3 Unused PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4 ) - PORT_START /* 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_COIN3 ) @@ -142,13 +142,13 @@ static INPUT_PORTS_START( simpsons ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) //SERVICE3 Unused PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) //SERVICE4 Unused - PORT_START /* IN5 */ + PORT_START_TAG("TEST") /* IN5 */ PORT_SERVICE_NO_TOGGLE( 0x01, IP_ACTIVE_LOW ) PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNKNOWN ) INPUT_PORTS_END static INPUT_PORTS_START( simpsn2p ) - PORT_START /* IN0 - Player 1 */ + PORT_START_TAG("P1") /* IN0 - Player 1 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) @@ -158,7 +158,7 @@ static INPUT_PORTS_START( simpsn2p ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) //BUTTON3 Unused PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START /* IN1 - Player 2 */ + PORT_START_TAG("P2") /* IN1 - Player 2 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) @@ -168,7 +168,7 @@ static INPUT_PORTS_START( simpsn2p ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) //BUTTON3 Unused PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START /* IN2 - Player 3 - Used on the 4p version */ + PORT_START_TAG("P3") /* IN2 - Player 3 - Used on the 4p version */ // PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3) // PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3) @@ -178,7 +178,7 @@ static INPUT_PORTS_START( simpsn2p ) // PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) //BUTTON3 Unused // PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 ) - PORT_START /* IN3 - Player 4 - Used on the 4p version */ + PORT_START_TAG("P4") /* IN3 - Player 4 - Used on the 4p version */ // PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4) // PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4) // PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4) @@ -188,7 +188,7 @@ static INPUT_PORTS_START( simpsn2p ) // PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) //BUTTON3 Unused // PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4 ) - PORT_START /* IN4 */ + PORT_START_TAG("COINS") /* IN4 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) //COIN3 Unused @@ -198,7 +198,7 @@ static INPUT_PORTS_START( simpsn2p ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) //SERVICE3 Unused PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) //SERVICE4 Unused - PORT_START /* IN5 */ + PORT_START_TAG("TEST") /* IN5 */ PORT_SERVICE_NO_TOGGLE( 0x01, IP_ACTIVE_LOW ) PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNKNOWN ) INPUT_PORTS_END diff --git a/src/mame/drivers/skykid.c b/src/mame/drivers/skykid.c index e799ab042fa..2559df8c041 100644 --- a/src/mame/drivers/skykid.c +++ b/src/mame/drivers/skykid.c @@ -52,19 +52,19 @@ static READ8_HANDLER( inputport_r ) switch (inputport_selected) { case 0x00: /* DSW B (bits 0-4) */ - return (input_port_read_indexed(machine, 1) & 0xf8) >> 3; break; + return (input_port_read(machine, "DSWB") & 0xf8) >> 3; break; case 0x01: /* DSW B (bits 5-7), DSW A (bits 0-1) */ - return ((input_port_read_indexed(machine, 1) & 0x07) << 2) | ((input_port_read_indexed(machine, 0) & 0xc0) >> 6); break; + return ((input_port_read(machine, "DSWB") & 0x07) << 2) | ((input_port_read(machine, "DSWA") & 0xc0) >> 6); break; case 0x02: /* DSW A (bits 2-6) */ - return (input_port_read_indexed(machine, 0) & 0x3e) >> 1; break; + return (input_port_read(machine, "DSWA") & 0x3e) >> 1; break; case 0x03: /* DSW A (bit 7), DSW C (bits 0-3) */ - return ((input_port_read_indexed(machine, 0) & 0x01) << 4) | (input_port_read_indexed(machine, 2) & 0x0f); break; + return ((input_port_read(machine, "DSWA") & 0x01) << 4) | (input_port_read(machine, "BUTTON2") & 0x0f); break; case 0x04: /* coins, start */ - return input_port_read_indexed(machine, 3); break; + return input_port_read(machine, "SYSTEM"); break; case 0x05: /* 2P controls */ - return input_port_read_indexed(machine, 5); break; + return input_port_read(machine, "P2"); break; case 0x06: /* 1P controls */ - return input_port_read_indexed(machine, 4); break; + return input_port_read(machine, "P1"); break; default: return 0xff; } @@ -156,7 +156,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( skykid ) - PORT_START /* DSW A */ + PORT_START_TAG("DSWA") /* DSW A */ PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) PORT_DIPNAME( 0x60, 0x60, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) ) @@ -178,7 +178,7 @@ static INPUT_PORTS_START( skykid ) PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) ) - PORT_START /* DSW B */ + PORT_START_TAG("DSWB") /* DSW B */ PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) ) PORT_DIPSETTING( 0x80, "1" ) PORT_DIPSETTING( 0x40, "2" ) @@ -202,14 +202,14 @@ static INPUT_PORTS_START( skykid ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("BUTTON2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN 0 */ + PORT_START_TAG("SYSTEM") /* IN 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 ) @@ -217,7 +217,7 @@ static INPUT_PORTS_START( skykid ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN 1 */ + PORT_START_TAG("P1") /* IN 1 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) @@ -225,7 +225,7 @@ static INPUT_PORTS_START( skykid ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN 2 */ + PORT_START_TAG("P2") /* IN 2 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) @@ -235,7 +235,7 @@ static INPUT_PORTS_START( skykid ) INPUT_PORTS_END static INPUT_PORTS_START( skykids ) - PORT_START /* DSW A */ + PORT_START_TAG("DSWA") /* DSW A */ PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) PORT_DIPNAME( 0x60, 0x60, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) ) @@ -257,7 +257,7 @@ static INPUT_PORTS_START( skykids ) PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) ) - PORT_START /* DSW B */ + PORT_START_TAG("DSWB") /* DSW B */ PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) ) PORT_DIPSETTING( 0x80, "1" ) PORT_DIPSETTING( 0x40, "2" ) @@ -281,14 +281,14 @@ static INPUT_PORTS_START( skykids ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("BUTTON2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN 0 */ + PORT_START_TAG("SYSTEM") /* IN 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 ) @@ -296,7 +296,7 @@ static INPUT_PORTS_START( skykids ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN 1 */ + PORT_START_TAG("P1") /* IN 1 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) @@ -304,7 +304,7 @@ static INPUT_PORTS_START( skykids ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN 2 */ + PORT_START_TAG("P2") /* IN 2 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) @@ -314,7 +314,7 @@ static INPUT_PORTS_START( skykids ) INPUT_PORTS_END static INPUT_PORTS_START( drgnbstr ) - PORT_START /* DSW A */ + PORT_START_TAG("DSWA") /* DSW A */ PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) PORT_DIPNAME( 0x60, 0x60, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) ) @@ -336,7 +336,7 @@ static INPUT_PORTS_START( drgnbstr ) PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) ) - PORT_START /* DSW B */ + PORT_START_TAG("DSWB") /* DSW B */ PORT_DIPNAME( 0x80, 0x80, "Spurt Time" ) PORT_DIPSETTING( 0x80, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x00, "Difficult" ) @@ -360,7 +360,7 @@ static INPUT_PORTS_START( drgnbstr ) PORT_DIPSETTING( 0x01, DEF_STR( No ) ) PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) - PORT_START + PORT_START_TAG("BUTTON2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_DIPNAME( 0x02, 0x02, DEF_STR( Cabinet ) ) PORT_DIPSETTING( 0x02, DEF_STR( Upright ) ) @@ -369,7 +369,7 @@ static INPUT_PORTS_START( drgnbstr ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN 0 */ + PORT_START_TAG("SYSTEM") /* IN 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 ) @@ -377,7 +377,7 @@ static INPUT_PORTS_START( drgnbstr ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN 1 */ + PORT_START_TAG("P1") /* IN 1 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY @@ -385,7 +385,7 @@ static INPUT_PORTS_START( drgnbstr ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN 2 */ + PORT_START_TAG("P2") /* IN 2 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL diff --git a/src/mame/drivers/skyraid.c b/src/mame/drivers/skyraid.c index c6ad2a09a34..109ed002605 100644 --- a/src/mame/drivers/skyraid.c +++ b/src/mame/drivers/skyraid.c @@ -52,11 +52,11 @@ static READ8_HANDLER( skyraid_alpha_num_r) static READ8_HANDLER( skyraid_port_0_r ) { - UINT8 val = input_port_read_indexed(machine, 0); + UINT8 val = input_port_read(machine, "LANGUAGE"); - if (input_port_read_indexed(machine, 4) > analog_range) + if (input_port_read(machine, "STICKY") > analog_range) val |= 0x40; - if (input_port_read_indexed(machine, 5) > analog_range) + if (input_port_read(machine, "STICKX") > analog_range) val |= 0x80; return val; @@ -105,9 +105,9 @@ static ADDRESS_MAP_START( skyraid_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0800, 0x087f) AM_READ(SMH_RAM) AM_RANGE(0x0880, 0x0bff) AM_READ(skyraid_alpha_num_r) AM_RANGE(0x1000, 0x1000) AM_READ(skyraid_port_0_r) - AM_RANGE(0x1000, 0x1001) AM_READ(input_port_1_r) - AM_RANGE(0x1400, 0x1400) AM_READ(input_port_2_r) - AM_RANGE(0x1400, 0x1401) AM_READ(input_port_3_r) + AM_RANGE(0x1000, 0x1001) AM_READ_PORT("DSW") + AM_RANGE(0x1400, 0x1400) AM_READ_PORT("COIN") + AM_RANGE(0x1400, 0x1401) AM_READ_PORT("SYSTEM") AM_RANGE(0x7000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0xf000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END @@ -130,7 +130,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( skyraid ) - PORT_START + PORT_START_TAG("LANGUAGE") PORT_DIPNAME( 0x30, 0x00, DEF_STR( Language ) ) PORT_DIPSETTING( 0x00, DEF_STR( English ) ) PORT_DIPSETTING( 0x10, DEF_STR( French ) ) @@ -139,7 +139,7 @@ static INPUT_PORTS_START( skyraid ) PORT_BIT (0x40, IP_ACTIVE_HIGH, IPT_UNUSED) /* POT1 */ PORT_BIT (0x80, IP_ACTIVE_HIGH, IPT_UNUSED) /* POT0 */ - PORT_START + PORT_START_TAG("DSW") PORT_DIPNAME( 0x30, 0x10, "Play Time" ) PORT_DIPSETTING( 0x00, "60 Seconds" ) PORT_DIPSETTING( 0x10, "80 Seconds" ) @@ -154,7 +154,7 @@ static INPUT_PORTS_START( skyraid ) /* coinage settings are insane, refer to the manual */ - PORT_START + PORT_START_TAG("COIN") PORT_DIPNAME( 0x0F, 0x01, DEF_STR( Coinage )) /* dial */ PORT_DIPSETTING( 0x00, "Mode 0" ) PORT_DIPSETTING( 0x01, "Mode 1" ) @@ -179,16 +179,16 @@ static INPUT_PORTS_START( skyraid ) PORT_BIT (0x40, IP_ACTIVE_HIGH, IPT_COIN1) PORT_BIT (0x80, IP_ACTIVE_HIGH, IPT_COIN2) - PORT_START + PORT_START_TAG("SYSTEM") PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_TILT) PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Hiscore Reset") PORT_CODE(KEYCODE_H) PORT_BIT (0x40, IP_ACTIVE_LOW, IPT_START1) PORT_SERVICE(0x80, IP_ACTIVE_LOW) - PORT_START + PORT_START_TAG("STICKY") PORT_BIT( 0x3f, 0x20, IPT_AD_STICK_Y ) PORT_MINMAX(0,63) PORT_SENSITIVITY(10) PORT_KEYDELTA(10) PORT_REVERSE - PORT_START + PORT_START_TAG("STICKX") PORT_BIT( 0x3f, 0x20, IPT_AD_STICK_X ) PORT_MINMAX(0,63) PORT_SENSITIVITY(10) PORT_KEYDELTA(10) INPUT_PORTS_END diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c index 70f1af654cf..e59e3fa4545 100644 --- a/src/mame/drivers/slapshot.c +++ b/src/mame/drivers/slapshot.c @@ -201,8 +201,8 @@ static READ16_HANDLER( slapshot_service_input_r ) switch (offset) { case 0x03: - return ((input_port_read_indexed(machine,3) & 0xef) | - (input_port_read_indexed(machine,5) & 0x10)) << 8; /* IN3 + service switch */ + return ((input_port_read(machine, "IN3") & 0xef) | + (input_port_read(machine, "IN5") & 0x10)) << 8; /* IN3 + service switch */ default: return TC0640FIO_r(machine,offset) << 8; @@ -211,7 +211,9 @@ static READ16_HANDLER( slapshot_service_input_r ) static READ16_HANDLER( opwolf3_adc_r ) { - return input_port_read_indexed(machine, 6 + offset)<<8; + static const char *adcnames[] = { "GUN1X", "GUN1Y", "GUN2X", "GUN2Y" }; + + return input_port_read(machine, adcnames[offset]) << 8; } static WRITE16_HANDLER( opwolf3_adc_req_w ) @@ -475,16 +477,16 @@ static INPUT_PORTS_START( opwolf3 ) PORT_START_TAG("IN5") /* IN5, so we can OR in service switch */ PORT_SERVICE_NO_TOGGLE(0x10, IP_ACTIVE_LOW) - PORT_START_TAG("IN6") /* IN 6, P1X */ + PORT_START_TAG("GUN1X") /* IN 6, P1X */ PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_REVERSE PORT_PLAYER(1) - PORT_START_TAG("IN7") /* IN 7, P1Y */ + PORT_START_TAG("GUN1Y") /* IN 7, P1Y */ PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_PLAYER(1) - PORT_START_TAG("IN8") /* IN 8, P2X */ + PORT_START_TAG("GUN2X") /* IN 8, P2X */ PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_REVERSE PORT_PLAYER(2) - PORT_START_TAG("IN9") /* IN 9, P2Y */ + PORT_START_TAG("GUN2Y") /* IN 9, P2Y */ PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_PLAYER(2) INPUT_PORTS_END diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c index d99c653412e..57319d117c3 100644 --- a/src/mame/drivers/snk68.c +++ b/src/mame/drivers/snk68.c @@ -81,12 +81,12 @@ static WRITE8_HANDLER( sound_status_w ) static READ16_HANDLER( control_1_r ) { - return (input_port_read(machine, "IN0") | (input_port_read(machine, "IN1") << 8)); + return (input_port_read(machine, "P1") + (input_port_read(machine, "P2") << 8)); } static READ16_HANDLER( control_2_r ) { - return input_port_read(machine, "IN2"); + return input_port_read(machine, "SYSTEM"); } static READ16_HANDLER( rotary_1_r ) @@ -107,7 +107,8 @@ static READ16_HANDLER( rotary_lsb_r ) static READ16_HANDLER( protcontrols_r ) { - return input_port_read_indexed(machine, offset) ^ invert_controls; + static const char *portnames[] = { "P1", "P2", "SYSTEM" }; + return input_port_read(machine, portnames[offset]) ^ invert_controls; } static WRITE16_HANDLER( protection_w ) @@ -194,7 +195,7 @@ ADDRESS_MAP_END /******************************************************************************/ static INPUT_PORTS_START( pow ) - PORT_START_TAG("IN0") /* Player 1 controls */ + PORT_START_TAG("P1") /* Player 1 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY @@ -204,7 +205,7 @@ static INPUT_PORTS_START( pow ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START_TAG("IN1") /* Player 2 controls */ + PORT_START_TAG("P2") /* Player 2 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -214,7 +215,7 @@ static INPUT_PORTS_START( pow ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("IN2") + PORT_START_TAG("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) /* same as the service mode dsw */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -284,7 +285,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( searchar ) - PORT_START_TAG("IN0") /* Player 1 controls */ + PORT_START_TAG("P1") /* Player 1 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY @@ -294,7 +295,7 @@ static INPUT_PORTS_START( searchar ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START_TAG("IN1") /* Player 2 controls */ + PORT_START_TAG("P2") /* Player 2 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -304,7 +305,7 @@ static INPUT_PORTS_START( searchar ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("IN2") + PORT_START_TAG("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) /* same as the service mode dsw */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -370,7 +371,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( streetsm ) - PORT_START_TAG("IN0") /* Player 1 controls */ + PORT_START_TAG("P1") /* Player 1 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY @@ -380,7 +381,7 @@ static INPUT_PORTS_START( streetsm ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START_TAG("IN1") /* Player 2 controls */ + PORT_START_TAG("P2") /* Player 2 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -390,7 +391,7 @@ static INPUT_PORTS_START( streetsm ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("IN2") + PORT_START_TAG("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) /* same as the service mode dsw */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -468,7 +469,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( ikari3 ) - PORT_START_TAG("IN0") /* Player 1 controls, maybe all are active_high? */ + PORT_START_TAG("P1") /* Player 1 controls, maybe all are active_high? */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY @@ -478,7 +479,7 @@ static INPUT_PORTS_START( ikari3 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START_TAG("IN1") /* Player 2 controls */ + PORT_START_TAG("P2") /* Player 2 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -488,7 +489,7 @@ static INPUT_PORTS_START( ikari3 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("IN2") + PORT_START_TAG("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) /* same as the service mode dsw */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) diff --git a/src/mame/drivers/snookr10.c b/src/mame/drivers/snookr10.c index 75a02052263..7b55ed4b9e7 100644 --- a/src/mame/drivers/snookr10.c +++ b/src/mame/drivers/snookr10.c @@ -388,7 +388,7 @@ static READ8_HANDLER( dsw_port_1_r ) BIT 7 = Complement of DS1, bit 7 ------------------------------------*/ { -return input_port_read_indexed(machine,3); +return input_port_read(machine, "SW1"); } /********************** @@ -431,7 +431,7 @@ static WRITE8_HANDLER( output_port_0_w ) bit1 = (data >> 3) & 1; bit2 = (data >> 5) & 1; bit3 = (data >> 7) & 1; - bit4 = (input_port_read_indexed(machine,5) & 1); + bit4 = (input_port_read_safe(machine, "IN5", 0) & 1); /* "IN5" has yet to be implemented! */ output_set_lamp_value(1, (bit1 & bit3)); /* Lamp 1 - START */ output_set_lamp_value(2, (bit0 & bit3)); /* Lamp 2 - CANCEL */ @@ -456,8 +456,8 @@ static WRITE8_HANDLER( output_port_1_w ) { int bit0, bit1, bit4; - bit0 = (input_port_read_indexed(machine,4) >> 1) & 1; - bit1 = (input_port_read_indexed(machine,4) >> 3) & 1; + bit0 = (input_port_read_safe(machine, "IN4", 0) >> 1) & 1; /* "IN4" has yet to be implemented! */ + bit1 = (input_port_read_safe(machine, "IN4", 0) >> 3) & 1; /* "IN4" has yet to be implemented! */ bit4 = (data & 1); output_set_lamp_value(6, (bit1 & bit4)); /* Lamp 6 - STOP4 */ @@ -472,10 +472,10 @@ static WRITE8_HANDLER( output_port_1_w ) static ADDRESS_MAP_START( snookr10_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0x1000, 0x1000) AM_READWRITE(OKIM6295_status_0_r, OKIM6295_data_0_w) - AM_RANGE(0x3000, 0x3000) AM_READ(input_port_0_r) /* IN0 */ - AM_RANGE(0x3001, 0x3001) AM_READ(input_port_1_r) /* IN1 */ - AM_RANGE(0x3002, 0x3002) AM_READ(input_port_2_r) /* IN2 */ - AM_RANGE(0x3003, 0x3003) AM_READ(input_port_3_r) /* DS1 */ + AM_RANGE(0x3000, 0x3000) AM_READ_PORT("IN0") /* IN0 */ + AM_RANGE(0x3001, 0x3001) AM_READ_PORT("IN1") /* IN1 */ + AM_RANGE(0x3002, 0x3002) AM_READ_PORT("IN2") /* IN2 */ + AM_RANGE(0x3003, 0x3003) AM_READ_PORT("SW1") /* DS1 */ AM_RANGE(0x3004, 0x3004) AM_READ(dsw_port_1_r) /* complement of DS1, bit 7 */ AM_RANGE(0x5000, 0x5000) AM_WRITE(output_port_0_w) /* OUT0 */ AM_RANGE(0x5001, 0x5001) AM_WRITE(output_port_1_w) /* OUT1 */ @@ -487,10 +487,10 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( tenballs_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) AM_RANGE(0x1000, 0x1000) AM_READWRITE(OKIM6295_status_0_r, OKIM6295_data_0_w) - AM_RANGE(0x4000, 0x4000) AM_READ(input_port_0_r) /* IN0 */ - AM_RANGE(0x4001, 0x4001) AM_READ(input_port_1_r) /* IN1 */ - AM_RANGE(0x4002, 0x4002) AM_READ(input_port_2_r) /* IN2 */ - AM_RANGE(0x4003, 0x4003) AM_READ(input_port_3_r) /* DS1 */ + AM_RANGE(0x4000, 0x4000) AM_READ_PORT("IN0") /* IN0 */ + AM_RANGE(0x4001, 0x4001) AM_READ_PORT("IN1") /* IN1 */ + AM_RANGE(0x4002, 0x4002) AM_READ_PORT("IN2") /* IN2 */ + AM_RANGE(0x4003, 0x4003) AM_READ_PORT("SW1") /* DS1 */ AM_RANGE(0x5000, 0x5000) AM_WRITE(output_port_0_w) /* OUT0 */ AM_RANGE(0x5001, 0x5001) AM_WRITE(output_port_1_w) /* OUT1 */ AM_RANGE(0x6000, 0x6fff) AM_RAM_WRITE(snookr10_videoram_w) AM_BASE(&videoram) diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c index 5490c10699b..3ee7f4d8afb 100644 --- a/src/mame/drivers/spdodgeb.c +++ b/src/mame/drivers/spdodgeb.c @@ -111,13 +111,13 @@ static void mcu63705_update_inputs(running_machine *machine) int p,j; /* update running state */ - for (p = 0;p <= 1;p++) + for (p = 0; p <= 1; p++) { static int prev[2][2],countup[2][2],countdown[2][2]; int curr[2][2]; - curr[p][0] = input_port_read_indexed(machine, 2+p) & 0x01; - curr[p][1] = input_port_read_indexed(machine, 2+p) & 0x02; + curr[p][0] = input_port_read(machine, p ? "P2" : "P1") & 0x01; + curr[p][1] = input_port_read(machine, p ? "P2" : "P1") & 0x02; for (j = 0;j <= 1;j++) { @@ -147,12 +147,12 @@ static void mcu63705_update_inputs(running_machine *machine) } /* update jumping and buttons state */ - for (p = 0;p <= 1;p++) + for (p = 0; p <= 1; p++) { static int prev[2]; int curr[2]; - curr[p] = input_port_read_indexed(machine, 2+p) & 0x30; + curr[p] = input_port_read(machine, p ? "P2" : "P1") & 0x30; if (jumped[p]) buttons[p] = 0; /* jump only momentarily flips the buttons */ else buttons[p] = curr[p]; @@ -163,8 +163,8 @@ static void mcu63705_update_inputs(running_machine *machine) prev[p] = curr[p]; } - inputs[0] = input_port_read_indexed(machine, 2) & 0xcf; - inputs[1] = input_port_read_indexed(machine, 3) & 0x0f; + inputs[0] = input_port_read(machine, "P1") & 0xcf; + inputs[1] = input_port_read(machine, "P2") & 0x0f; inputs[2] = running[0] | buttons[0]; inputs[3] = running[1] | buttons[1]; } @@ -187,7 +187,7 @@ static void mcu63705_update_inputs(running_machine *machine) for (p=0; p<=1; p++) { - curr_port[p] = input_port_read_indexed(machine, p+2); + curr_port[p] = input_port_read(machine, p ? "P2" : "P1"); curr_dash[p] = 0; if (curr_port[p] & R) @@ -242,7 +242,7 @@ static READ8_HANDLER( mcu63701_r ) case 1: return inputs[1]; case 2: return inputs[2]; case 3: return inputs[3]; - case 4: return input_port_read_indexed(machine, 4); + case 4: return input_port_read(machine, "IN1"); } } @@ -256,7 +256,7 @@ static WRITE8_HANDLER( mcu63701_w ) static READ8_HANDLER( port_0_r ) { - int port = input_port_read_indexed(machine, 0); + int port = input_port_read(machine, "IN0"); toggle^=0x02; /* mcu63701_busy flag */ @@ -269,7 +269,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM) AM_RANGE(0x2000, 0x2fff) AM_READ(SMH_RAM) AM_RANGE(0x3000, 0x3000) AM_READ(port_0_r) - AM_RANGE(0x3001, 0x3001) AM_READ(input_port_1_r) /* DIPs */ + AM_RANGE(0x3001, 0x3001) AM_READ_PORT("DSW") /* DIPs */ AM_RANGE(0x3801, 0x3805) AM_READ(mcu63701_r) AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1) AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) @@ -284,7 +284,7 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3002, 0x3002) AM_WRITE(sound_command_w) // AM_RANGE(0x3003, 0x3003) AM_WRITE(SMH_RAM) AM_RANGE(0x3004, 0x3004) AM_WRITE(spdodgeb_scrollx_lo_w) -// AM_RANGE(0x3005, 0x3005) AM_WRITE(SMH_RAM) /* mcu63701_output_w */ +// AM_RANGE(0x3005, 0x3005) AM_WRITE(SMH_RAM) /* mcu63701_output_w */ AM_RANGE(0x3006, 0x3006) AM_WRITE(spdodgeb_ctrl_w) /* scroll hi, flip screen, bank switch, palette select */ AM_RANGE(0x3800, 0x3800) AM_WRITE(mcu63701_w) AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM) @@ -306,7 +306,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( spdodgeb ) - PORT_START + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_VBLANK ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* mcu63701_busy flag */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -319,7 +319,7 @@ static INPUT_PORTS_START( spdodgeb ) PORT_DIPSETTING( 0x40, DEF_STR( Hard )) PORT_DIPSETTING( 0x00, DEF_STR( Very_Hard )) - PORT_START + PORT_START_TAG("DSW") PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) ) @@ -345,7 +345,7 @@ static INPUT_PORTS_START( spdodgeb ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x80, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) @@ -355,7 +355,7 @@ static INPUT_PORTS_START( spdodgeb ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 ) - PORT_START + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) @@ -365,7 +365,7 @@ static INPUT_PORTS_START( spdodgeb ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) diff --git a/src/mame/drivers/speedatk.c b/src/mame/drivers/speedatk.c index 47f07099ada..a2302f70474 100644 --- a/src/mame/drivers/speedatk.c +++ b/src/mame/drivers/speedatk.c @@ -96,7 +96,7 @@ static READ8_HANDLER( key_matrix_r ) { case 0x02: { - switch(input_port_read_indexed(machine, 1)) + switch(input_port_read(machine, "P1")) { case 0x002: return 0x02; case 0x001: return 0x01; @@ -115,7 +115,7 @@ static READ8_HANDLER( key_matrix_r ) } case 0x04: { - switch(input_port_read_indexed(machine, 2)) + switch(input_port_read(machine, "P2")) { case 0x002: return 0x02; case 0x001: return 0x01; @@ -171,7 +171,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x40, 0x40) AM_READ(input_port_0_r) + AM_RANGE(0x40, 0x40) AM_READ_PORT("DSW") /* are these not used? after they're read it sets bit 7 */ AM_RANGE(0x60, 0x60) AM_READ(SMH_NOP) AM_RANGE(0x61, 0x61) AM_READ(SMH_NOP) @@ -186,7 +186,7 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static INPUT_PORTS_START( speedatk ) - PORT_START + PORT_START_TAG("DSW") PORT_SERVICE( 0x01, IP_ACTIVE_HIGH ) PORT_DIPNAME( 0x02, 0x00, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) @@ -209,7 +209,7 @@ static INPUT_PORTS_START( speedatk ) PORT_DIPSETTING( 0x80, DEF_STR( 1C_5C ) ) PORT_DIPSETTING( 0xc0, "1 Coin/10 Credits" ) - PORT_START + PORT_START_TAG("P1") PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) //P1 A PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) //P1 B PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) //P1 C @@ -223,7 +223,7 @@ static INPUT_PORTS_START( speedatk ) PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x800, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(2) - PORT_START + PORT_START_TAG("P2") PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) //P2 A PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) //P2 B PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) //P2 C diff --git a/src/mame/drivers/spiders.c b/src/mame/drivers/spiders.c index 594d724548e..9724f78d45c 100644 --- a/src/mame/drivers/spiders.c +++ b/src/mame/drivers/spiders.c @@ -272,13 +272,13 @@ static INTERRUPT_GEN( update_pia_1 ) /* update the different PIA pins from the input ports */ /* CA1 - copy of PA1 (COIN1) */ - pia_1_ca1_w(machine, 0, input_port_read_indexed(machine,0) & 0x02); + pia_1_ca1_w(machine, 0, input_port_read(machine, "IN0") & 0x02); /* CA2 - copy of PA0 (SERVICE1) */ - pia_1_ca2_w(machine, 0, input_port_read_indexed(machine,0) & 0x01); + pia_1_ca2_w(machine, 0, input_port_read(machine, "IN0") & 0x01); /* CB1 - (crosshatch) */ - pia_1_cb1_w(machine, 0, input_port_read_indexed(machine,5)); + pia_1_cb1_w(machine, 0, input_port_read(machine, "XHATCH")); /* CB2 - NOT CONNECTED */ } @@ -573,9 +573,9 @@ static ADDRESS_MAP_START( spiders_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc044, 0xc047) AM_READWRITE(pia_1_r, pia_1_w) AM_RANGE(0xc048, 0xc04b) AM_READWRITE(pia_2_alt_r, pia_2_alt_w) AM_RANGE(0xc050, 0xc053) AM_READWRITE(pia_3_r, pia_3_w) - AM_RANGE(0xc060, 0xc060) AM_READ(input_port_2_r) - AM_RANGE(0xc080, 0xc080) AM_READ(input_port_3_r) - AM_RANGE(0xc0a0, 0xc0a0) AM_READ(input_port_4_r) + AM_RANGE(0xc060, 0xc060) AM_READ_PORT("DSW1") + AM_RANGE(0xc080, 0xc080) AM_READ_PORT("DSW2") + AM_RANGE(0xc0a0, 0xc0a0) AM_READ_PORT("DSW3") AM_RANGE(0xc100, 0xffff) AM_ROM ADDRESS_MAP_END @@ -596,7 +596,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( spiders ) /* PIA1 PA0 - PA7 */ - PORT_START /* IN0 */ + PORT_START_TAG("IN0") /* IN0 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_HIGH ) @@ -607,14 +607,14 @@ static INPUT_PORTS_START( spiders ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* PIA1 PB0 - PB7 */ - PORT_START /* IN1 */ + PORT_START_TAG("IN1") /* IN1 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1) PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START /* IN2, DSW1 */ + PORT_START_TAG("DSW1") /* IN2, DSW1 */ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3") PORT_DIPSETTING( 0x01, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) ) @@ -624,7 +624,7 @@ static INPUT_PORTS_START( spiders ) PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) ) PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN3, DSW2 */ + PORT_START_TAG("DSW2") /* IN3, DSW2 */ PORT_DIPNAME( 0x03, 0x03, "Play Mode" ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x00, "A A'" ) PORT_DIPSETTING( 0x01, "A B'" ) @@ -647,7 +647,7 @@ static INPUT_PORTS_START( spiders ) PORT_DIPSETTING( 0x00, "First Screen" ) PORT_DIPSETTING( 0x80, "Every Screen" ) - PORT_START /* IN4, DSW3 */ + PORT_START_TAG("DSW3") /* IN4, DSW3 */ PORT_DIPNAME( 0x01, 0x00, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW3:1") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x01, DEF_STR( On ) ) @@ -673,7 +673,7 @@ static INPUT_PORTS_START( spiders ) PORT_DIPSETTING( 0xc0, "6" ) PORT_DIPSETTING( 0xe0, "7" ) - PORT_START /* connected to PIA1 CB1 input */ + PORT_START_TAG("XHATCH") /* connected to PIA1 CB1 input */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("PS1 (Crosshatch)") PORT_CODE(KEYCODE_F1) INPUT_PORTS_END diff --git a/src/mame/drivers/sprint2.c b/src/mame/drivers/sprint2.c index 64c044a97c5..5138d9abec6 100644 --- a/src/mame/drivers/sprint2.c +++ b/src/mame/drivers/sprint2.c @@ -49,7 +49,7 @@ static DRIVER_INIT( dominos ) static int service_mode(running_machine *machine) { - UINT8 v = input_port_read_indexed(machine, 2); + UINT8 v = input_port_read(machine, "INB"); if (GAME_IS_SPRINT1) { @@ -80,7 +80,7 @@ static INTERRUPT_GEN( sprint2 ) for (i = 0; i < 2; i++) { - signed char delta = input_port_read_indexed(machine, 6 + i) - dial[i]; + signed char delta = input_port_read(machine, i ? "DIAL_P2" : "DIAL_P1") - dial[i]; if (delta < 0) { @@ -93,7 +93,7 @@ static INTERRUPT_GEN( sprint2 ) dial[i] += delta; - switch (input_port_read_indexed(machine, 4 + i) & 15) + switch (input_port_read(machine, i ? "GEAR_P2" : "GEAR_P1") & 15) { case 1: gear[i] = 1; break; case 2: gear[i] = 2; break; @@ -124,13 +124,13 @@ static READ8_HANDLER( sprint2_wram_r ) static READ8_HANDLER( sprint2_dip_r ) { - return (input_port_read_indexed(machine, 0) << (2 * ((offset & 3) ^ 3))) & 0xc0; + return (input_port_read(machine, "DSW") << (2 * ((offset & 3) ^ 3))) & 0xc0; } static READ8_HANDLER( sprint2_input_A_r ) { - UINT8 val = input_port_read_indexed(machine, 1); + UINT8 val = input_port_read(machine, "INA"); if (GAME_IS_SPRINT2) { @@ -148,7 +148,7 @@ static READ8_HANDLER( sprint2_input_A_r ) static READ8_HANDLER( sprint2_input_B_r ) { - UINT8 val = input_port_read_indexed(machine, 2); + UINT8 val = input_port_read(machine, "INB"); if (GAME_IS_SPRINT1) { @@ -250,7 +250,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0818, 0x081f) AM_READ(sprint2_input_A_r) AM_RANGE(0x0828, 0x082f) AM_READ(sprint2_input_B_r) AM_RANGE(0x0830, 0x0837) AM_READ(sprint2_dip_r) - AM_RANGE(0x0840, 0x087f) AM_READ(input_port_3_r) + AM_RANGE(0x0840, 0x087f) AM_READ_PORT("COIN") AM_RANGE(0x0880, 0x08bf) AM_READ(sprint2_steering1_r) AM_RANGE(0x08c0, 0x08ff) AM_READ(sprint2_steering2_r) AM_RANGE(0x0c00, 0x0fff) AM_READ(sprint2_sync_r) @@ -283,7 +283,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( sprint2 ) - PORT_START + PORT_START_TAG("DSW") PORT_DIPNAME( 0x01, 0x00, "Tracks on Demo" ) PORT_DIPSETTING( 0x00, "Easy Track Only" ) PORT_DIPSETTING( 0x01, "Cycle 12 Tracks" ) @@ -307,7 +307,7 @@ static INPUT_PORTS_START( sprint2 ) PORT_DIPSETTING( 0x40, "120 seconds" ) PORT_DIPSETTING( 0x00, "150 seconds" ) - PORT_START /* input A */ + PORT_START_TAG("INA") /* input A */ PORT_BIT (0x01, IP_ACTIVE_LOW, IPT_UNUSED ) /* P1 1st gear */ PORT_BIT (0x02, IP_ACTIVE_LOW, IPT_UNUSED ) /* P2 1st gear */ PORT_BIT (0x04, IP_ACTIVE_LOW, IPT_UNUSED ) /* P1 2nd gear */ @@ -315,7 +315,7 @@ static INPUT_PORTS_START( sprint2 ) PORT_BIT (0x10, IP_ACTIVE_LOW, IPT_UNUSED ) /* P1 3rd gear */ PORT_BIT (0x20, IP_ACTIVE_LOW, IPT_UNUSED ) /* P2 3rd gear */ - PORT_START /* input B */ + PORT_START_TAG("INB") /* input B */ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Player 1 Gas") PORT_PLAYER(1) PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Player 2 Gas") PORT_PLAYER(2) PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) @@ -324,26 +324,26 @@ static INPUT_PORTS_START( sprint2 ) PORT_BIT (0x20, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Track Select") PORT_CODE(KEYCODE_SPACE) - PORT_START + PORT_START_TAG("COIN") PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_START + PORT_START_TAG("GEAR_P1") PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Player 1 Gear 1") PORT_CODE(KEYCODE_Z) PORT_PLAYER(1) PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Player 1 Gear 2") PORT_CODE(KEYCODE_X) PORT_PLAYER(1) PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Player 1 Gear 3") PORT_CODE(KEYCODE_C) PORT_PLAYER(1) PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Player 1 Gear 4") PORT_CODE(KEYCODE_V) PORT_PLAYER(1) - PORT_START + PORT_START_TAG("GEAR_P2") PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Player 2 Gear 1") PORT_CODE(KEYCODE_Q) PORT_PLAYER(2) PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Player 2 Gear 2") PORT_CODE(KEYCODE_W) PORT_PLAYER(2) PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Player 2 Gear 3") PORT_CODE(KEYCODE_E) PORT_PLAYER(2) PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Player 2 Gear 4") PORT_CODE(KEYCODE_R) PORT_PLAYER(2) - PORT_START + PORT_START_TAG("DIAL_P1") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1) - PORT_START + PORT_START_TAG("DIAL_P2") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2) PORT_START_TAG("MOTOR1") @@ -355,7 +355,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( sprint1 ) - PORT_START + PORT_START_TAG("DSW") PORT_DIPNAME( 0x01, 0x00, "Change Track" ) PORT_DIPSETTING( 0x01, "Every Lap" ) PORT_DIPSETTING( 0x00, "Every 2 Laps" ) @@ -379,9 +379,9 @@ static INPUT_PORTS_START( sprint1 ) PORT_DIPSETTING( 0x40, "120 seconds" ) PORT_DIPSETTING( 0x00, "150 seconds" ) - PORT_START /* input A */ + PORT_START_TAG("INA") /* input A */ - PORT_START /* input B */ + PORT_START_TAG("INB") /* input B */ PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) /* 1st gear */ PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) /* 2nd gear */ PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) /* 3rd gear */ @@ -389,22 +389,22 @@ static INPUT_PORTS_START( sprint1 ) PORT_SERVICE( 0x10, IP_ACTIVE_LOW ) PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START + PORT_START_TAG("COIN") PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_START + PORT_START_TAG("GEAR_P1") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Gear 1") PORT_CODE(KEYCODE_Z) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Gear 2") PORT_CODE(KEYCODE_X) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Gear 3") PORT_CODE(KEYCODE_C) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Gear 4") PORT_CODE(KEYCODE_V) - PORT_START + PORT_START_TAG("GEAR_P2") - PORT_START + PORT_START_TAG("DIAL_P1") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) - PORT_START + PORT_START_TAG("DIAL_P2") PORT_START_TAG("MOTOR") PORT_ADJUSTER( 30, "Motor RPM" ) @@ -412,7 +412,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( dominos ) - PORT_START + PORT_START_TAG("DSW") PORT_DIPNAME( 0x03, 0x01, "Points to Win" ) PORT_DIPSETTING( 0x03, "6" ) PORT_DIPSETTING( 0x02, "5" ) @@ -435,13 +435,13 @@ static INPUT_PORTS_START( dominos ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* input A */ + PORT_START_TAG("INA") /* input A */ PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(2) PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(2) PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2) PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2) - PORT_START /* input B */ + PORT_START_TAG("INB") /* input B */ PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_PLAYER(1) PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_PLAYER(1) PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(1) @@ -450,7 +450,7 @@ static INPUT_PORTS_START( dominos ) PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_START2 ) PORT_SERVICE( 0x40, IP_ACTIVE_LOW ) - PORT_START + PORT_START_TAG("COIN") PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) diff --git a/src/mame/drivers/sprint4.c b/src/mame/drivers/sprint4.c index 778158fc705..2a3fc8a23c7 100644 --- a/src/mame/drivers/sprint4.c +++ b/src/mame/drivers/sprint4.c @@ -115,9 +115,9 @@ static TIMER_CALLBACK( nmi_callback ) /* NMI and watchdog are disabled during service mode */ - watchdog_enable(machine, input_port_read_indexed(machine, 0) & 0x40); + watchdog_enable(machine, input_port_read(machine, "IN0") & 0x40); - if (input_port_read_indexed(machine, 0) & 0x40) + if (input_port_read(machine, "IN0") & 0x40) cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, PULSE_LINE); timer_set(video_screen_get_time_until_pos(machine->primary_screen, scanline, 0), NULL, scanline, nmi_callback); diff --git a/src/mame/drivers/sprint8.c b/src/mame/drivers/sprint8.c index 294fc7abb76..bc97520d7cd 100644 --- a/src/mame/drivers/sprint8.c +++ b/src/mame/drivers/sprint8.c @@ -28,12 +28,13 @@ void sprint8_set_collision(running_machine *machine, int n) static TIMER_CALLBACK( input_callback ) { static UINT8 dial[8]; + static const char *dialnames[] = { "DIAL1", "DIAL2", "DIAL3", "DIAL4", "DIAL5", "DIAL6", "DIAL7", "DIAL8" }; int i; for (i = 0; i < 8; i++) { - UINT8 val = input_port_read_indexed(machine, 8 + i) >> 4; + UINT8 val = input_port_read(machine, dialnames[i]) >> 4; signed char delta = (val - dial[i]) & 15; @@ -70,7 +71,8 @@ static READ8_HANDLER( sprint8_collision_r ) static READ8_HANDLER( sprint8_input_r ) { - UINT8 val = input_port_read_indexed(machine, offset); + static const char *portnames[] = { "P1", "P2", "P3", "P4", "P5", "P6", "P7", "P8" }; + UINT8 val = input_port_read(machine, portnames[offset]); if (steer_dir[offset]) { @@ -114,9 +116,9 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x00ff) AM_READ(SMH_RAM) AM_RANGE(0x1c00, 0x1c00) AM_READ(sprint8_collision_r) AM_RANGE(0x1c01, 0x1c08) AM_READ(sprint8_input_r) - AM_RANGE(0x1c09, 0x1c09) AM_READ(input_port_16_r) - AM_RANGE(0x1c0a, 0x1c0a) AM_READ(input_port_17_r) - AM_RANGE(0x1c0f, 0x1c0f) AM_READ(input_port_18_r) + AM_RANGE(0x1c09, 0x1c09) AM_READ_PORT("IN0") + AM_RANGE(0x1c0a, 0x1c0a) AM_READ_PORT("IN1") + AM_RANGE(0x1c0f, 0x1c0f) AM_READ_PORT("VBLANK") AM_RANGE(0x2000, 0x3fff) AM_READ(SMH_ROM) AM_RANGE(0xf800, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END @@ -145,111 +147,111 @@ ADDRESS_MAP_END static INPUT_PORTS_START( sprint8 ) - PORT_START - PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P1 */ - PORT_BIT ( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P1 */ - PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) - PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) - PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START - PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P2 */ - PORT_BIT ( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P2 */ - PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) - PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START - PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN3 ) - PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P3 */ - PORT_BIT ( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P3 */ - PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) - PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3) - PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START - PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN4 ) - PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P4 */ - PORT_BIT ( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P4 */ - PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4) - PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4) - PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START - PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN5 ) - PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P5 */ - PORT_BIT ( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P5 */ - PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(5) - PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(5) - PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_START_TAG("P1") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P1 */ + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P1 */ + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("P2") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 ) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P2 */ + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P2 */ + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("P3") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 ) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P3 */ + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P3 */ + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("P4") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN4 ) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P4 */ + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P4 */ + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("P5") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN5 ) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P5 */ + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P5 */ + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(5) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(5) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) - PORT_START - PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN6 ) - PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P6 */ - PORT_BIT ( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P6 */ - PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(6) - PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(6) - PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START - PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN7 ) - PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P7 */ - PORT_BIT ( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P7 */ - PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(7) - PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(7) - PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START - PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN8 ) - PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P8 */ - PORT_BIT ( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P8 */ - PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(8) - PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(8) - PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START + PORT_START_TAG("P6") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN6 ) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P6 */ + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P6 */ + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(6) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(6) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("P7") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN7 ) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P7 */ + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P7 */ + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(7) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(7) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("P8") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN8 ) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P8 */ + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P8 */ + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(8) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(8) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("DIAL1") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1) - PORT_START + PORT_START_TAG("DIAL2") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2) - PORT_START + PORT_START_TAG("DIAL3") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(3) - PORT_START + PORT_START_TAG("DIAL4") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(4) - PORT_START + PORT_START_TAG("DIAL5") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(5) - PORT_START + PORT_START_TAG("DIAL6") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(6) - PORT_START + PORT_START_TAG("DIAL7") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(7) - PORT_START + PORT_START_TAG("DIAL8") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(8) - PORT_START + PORT_START_TAG("IN0") PORT_DIPNAME( 0x0f, 0x08, "Play Time" ) PORT_DIPSETTING( 0x0f, "60 seconds" ) PORT_DIPSETTING( 0x0e, "69 seconds" ) @@ -267,137 +269,137 @@ static INPUT_PORTS_START( sprint8 ) PORT_DIPSETTING( 0x02, "172 seconds" ) PORT_DIPSETTING( 0x01, "181 seconds" ) PORT_DIPSETTING( 0x00, "189 seconds" ) - PORT_BIT ( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + PORT_START_TAG("IN1") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Track Select") PORT_CODE(KEYCODE_SPACE) - PORT_START - PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_VBLANK ) + PORT_START_TAG("VBLANK") + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK ) INPUT_PORTS_END static INPUT_PORTS_START( sprint8p ) - PORT_START - PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P1 */ - PORT_BIT ( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P1 */ - PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) - PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) - PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START - PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P2 */ - PORT_BIT ( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P2 */ - PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) - PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START - PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN3 ) - PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P3 */ - PORT_BIT ( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P3 */ - PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) - PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3) - PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START - PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN4 ) - PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P4 */ - PORT_BIT ( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P4 */ - PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4) - PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4) - PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START - PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN5 ) - PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P5 */ - PORT_BIT ( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P5 */ - PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(5) - PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(5) - PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_START_TAG("P1") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P1 */ + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P1 */ + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("P2") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 ) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P2 */ + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P2 */ + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("P3") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 ) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P3 */ + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P3 */ + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("P4") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN4 ) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P4 */ + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P4 */ + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("P5") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN5 ) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P5 */ + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P5 */ + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(5) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(5) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) - PORT_START - PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN6 ) - PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P6 */ - PORT_BIT ( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P6 */ - PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(6) - PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(6) - PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START - PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN7 ) - PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P7 */ - PORT_BIT ( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P7 */ - PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(7) - PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(7) - PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START - PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN8 ) - PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P8 */ - PORT_BIT ( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P8 */ - PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(8) - PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(8) - PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START + PORT_START_TAG("P6") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN6 ) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P6 */ + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P6 */ + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(6) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(6) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("P7") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN7 ) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P7 */ + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P7 */ + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(7) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(7) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("P8") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN8 ) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER DIR P8 */ + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* STEER FLAG P8 */ + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(8) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(8) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("DIAL1") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1) - PORT_START + PORT_START_TAG("DIAL2") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2) - PORT_START + PORT_START_TAG("DIAL3") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(3) - PORT_START + PORT_START_TAG("DIAL4") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(4) - PORT_START + PORT_START_TAG("DIAL5") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(5) - PORT_START + PORT_START_TAG("DIAL6") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(6) - PORT_START + PORT_START_TAG("DIAL7") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(7) - PORT_START + PORT_START_TAG("DIAL8") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(8) - PORT_START + PORT_START_TAG("IN0") PORT_DIPNAME( 0x03, 0x03, "Play Time" ) PORT_DIPSETTING( 0x00, "54 seconds" ) PORT_DIPSETTING( 0x01, "108 seconds" ) PORT_DIPSETTING( 0x03, "216 seconds" ) - PORT_BIT ( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + PORT_START_TAG("IN1") PORT_DIPNAME( 0x01, 0x01, "Play Mode" ) PORT_DIPSETTING( 0x00, "Chase" ) PORT_DIPSETTING( 0x01, "Tag" ) - PORT_START - PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_VBLANK ) + PORT_START_TAG("VBLANK") + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_VBLANK ) INPUT_PORTS_END diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c index 62022425ce0..20901f68760 100644 --- a/src/mame/drivers/srmp2.c +++ b/src/mame/drivers/srmp2.c @@ -288,6 +288,7 @@ static READ16_HANDLER( srmp2_input_1_r ) ---x xxxx : Key code --x- ---- : Player 1 and 2 side flag */ + static const char *keynames[] = { "KEY0", "KEY1", "KEY2", "KEY3" }; if (!ACCESSING_BITS_0_7) { @@ -300,11 +301,11 @@ static READ16_HANDLER( srmp2_input_1_r ) for (i = 0x00 ; i < 0x20 ; i += 8) { - j = (i / 0x08) + 3; + j = (i / 0x08); for (t = 0 ; t < 8 ; t ++) { - if (!(input_port_read_indexed(machine, j) & ( 1 << t ))) + if (!(input_port_read(machine, keynames[j]) & ( 1 << t ))) { return (i + t); } @@ -313,7 +314,7 @@ static READ16_HANDLER( srmp2_input_1_r ) } else /* Analizer and memory reset keys */ { - return input_port_read(machine, "IN7"); + return input_port_read(machine, "SERVICE"); } return 0xffff; @@ -388,7 +389,7 @@ static ADDRESS_MAP_START( srmp2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0c0000, 0x0c3fff) AM_READ(SMH_RAM) AM_RANGE(0x140000, 0x143fff) AM_READ(SMH_RAM) /* Sprites Code + X + Attr */ AM_RANGE(0x180000, 0x180607) AM_READ(SMH_RAM) /* Sprites Y */ - AM_RANGE(0x900000, 0x900001) AM_READ(input_port_0_word_r) /* Coinage */ + AM_RANGE(0x900000, 0x900001) AM_READ_PORT("SYSTEM") /* Coinage */ AM_RANGE(0xa00000, 0xa00001) AM_READ(srmp2_input_1_r) /* I/O port 1 */ AM_RANGE(0xa00002, 0xa00003) AM_READ(srmp2_input_2_r) /* I/O port 2 */ AM_RANGE(0xb00000, 0xb00001) AM_READ(srmp2_cchip_status_0_r) /* Custom chip status ??? */ @@ -417,12 +418,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mjyuugi_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) - AM_RANGE(0x100000, 0x100001) AM_READ(input_port_0_word_r) /* Coinage */ + AM_RANGE(0x100000, 0x100001) AM_READ_PORT("SYSTEM") /* Coinage */ AM_RANGE(0x100010, 0x100011) AM_READ(SMH_NOP) /* ??? */ AM_RANGE(0x200000, 0x200001) AM_READ(SMH_NOP) /* ??? */ AM_RANGE(0x300000, 0x300001) AM_READ(SMH_NOP) /* ??? */ - AM_RANGE(0x500000, 0x500001) AM_READ(input_port_8_word_r) /* DSW 3-1 */ - AM_RANGE(0x500010, 0x500011) AM_READ(input_port_9_word_r) /* DSW 3-2 */ + AM_RANGE(0x500000, 0x500001) AM_READ_PORT("DSW3-1") /* DSW 3-1 */ + AM_RANGE(0x500010, 0x500011) AM_READ_PORT("DSW3-2") /* DSW 3-2 */ AM_RANGE(0x700000, 0x7003ff) AM_READ(SMH_RAM) AM_RANGE(0x800000, 0x800001) AM_READ(SMH_NOP) /* ??? */ AM_RANGE(0x900000, 0x900001) AM_READ(srmp2_input_1_r) /* I/O port 1 */ @@ -511,6 +512,7 @@ static READ8_HANDLER( srmp3_input_r ) /* Currently I/O port of srmp3 is fully understood. */ int keydata = 0xff; + static const char *keynames[] = { "KEY0", "KEY1", "KEY2", "KEY3" }; logerror("PC:%04X srmp3_input_r\n", activecpu_get_pc()); @@ -523,11 +525,11 @@ static READ8_HANDLER( srmp3_input_r ) for (i = 0x00 ; i < 0x20 ; i += 8) { - j = (i / 0x08) + 3; + j = (i / 0x08); for (t = 0 ; t < 8 ; t ++) { - if (!(input_port_read_indexed(machine, j) & ( 1 << t ))) + if (!(input_port_read(machine, keynames[j]) & ( 1 << t ))) { keydata = (i + t); } @@ -540,7 +542,7 @@ static READ8_HANDLER( srmp3_input_r ) if ((activecpu_get_pc() == 0x8926) || (activecpu_get_pc() == 0x7822)) /* Analizer and memory reset keys */ { - keydata = input_port_read_indexed(machine, 7); + keydata = input_port_read(machine, "SERVICE"); } return keydata; @@ -582,7 +584,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( srmp3_readport, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x40, 0x40) AM_READ(input_port_0_r) /* coin, service */ + AM_RANGE(0x40, 0x40) AM_READ_PORT("SYSTEM") /* coin, service */ AM_RANGE(0xa1, 0xa1) AM_READ(srmp3_cchip_status_0_r) /* custom chip status ??? */ AM_RANGE(0xc0, 0xc0) AM_READ(srmp3_input_r) /* key matrix */ AM_RANGE(0xc1, 0xc1) AM_READ(srmp3_cchip_status_1_r) /* custom chip status ??? */ @@ -608,65 +610,63 @@ ADDRESS_MAP_END ***************************************************************************/ -#define SETAMJCTRL_PORT3 \ - PORT_START_TAG("KMI3") /* KEY MATRIX INPUT (3) */ \ - PORT_BIT ( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) \ - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) \ - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_BIG ) \ - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) \ - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP ) \ - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) \ - PORT_BIT ( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT ( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - -#define SETAMJCTRL_PORT4 \ - PORT_START_TAG("KMI4") /* KEY MATRIX INPUT (4) */ \ - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_K ) \ - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) \ - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_G ) \ - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) \ - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_C ) \ - PORT_BIT ( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_MAHJONG_L ) \ - PORT_BIT ( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT ( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - -#define SETAMJCTRL_PORT5 \ - PORT_START_TAG("KMI5") /* KEY MATRIX INPUT (5) */ \ - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_H ) \ - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) \ - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_D ) \ - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_START1 ) \ - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_I ) \ - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) \ - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_MAHJONG_E ) \ - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_MAHJONG_M ) \ - PORT_BIT ( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) - -#define SETAMJCTRL_PORT6 \ - PORT_START_TAG("KMI6") /* KEY MATRIX INPUT (6) */ \ - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_A ) \ - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) \ - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_J ) \ - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) \ - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_F ) \ - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_N ) \ - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_MAHJONG_B ) \ - PORT_BIT ( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT ( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) +static INPUT_PORTS_START( seta_mjctrl ) + PORT_START_TAG("KEY0") /* KEY MATRIX INPUT (3) */ + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_BIG ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START_TAG("KEY1") /* KEY MATRIX INPUT (4) */ + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_K ) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_G ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_C ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_MAHJONG_L ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START_TAG("KEY2") /* KEY MATRIX INPUT (5) */ + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_H ) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_D ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_START1 ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_I ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_MAHJONG_E ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_MAHJONG_M ) + PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START_TAG("KEY3") /* KEY MATRIX INPUT (6) */ + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_A ) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_J ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_F ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_N ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_MAHJONG_B ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) +INPUT_PORTS_END static INPUT_PORTS_START( srmp2 ) - PORT_START_TAG("IN0") /* Coinage (0) */ - PORT_BIT ( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0010, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT ( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT ( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_START_TAG("SYSTEM") /* Coinage (0) */ + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_COIN1 ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START_TAG("DSW1") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) @@ -717,34 +717,31 @@ static INPUT_PORTS_START( srmp2 ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - SETAMJCTRL_PORT3 /* INPUT1 (3) */ - SETAMJCTRL_PORT4 /* INPUT1 (4) */ - SETAMJCTRL_PORT5 /* INPUT1 (5) */ - SETAMJCTRL_PORT6 /* INPUT1 (6) */ - - PORT_START_TAG("IN7") - PORT_BIT ( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE3 ) - PORT_BIT ( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0008, IP_ACTIVE_LOW, IPT_SERVICE2 ) - PORT_BIT ( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_INCLUDE( seta_mjctrl ) + + PORT_START_TAG("SERVICE") + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE3 ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SERVICE2 ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) INPUT_PORTS_END static INPUT_PORTS_START( srmp3 ) - PORT_START_TAG("IN0") /* Coinage (0) */ - PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_START_TAG("SYSTEM") /* Coinage (0) */ + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START_TAG("DSW1") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) @@ -795,34 +792,31 @@ static INPUT_PORTS_START( srmp3 ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - SETAMJCTRL_PORT3 /* INPUT1 (3) */ - SETAMJCTRL_PORT4 /* INPUT1 (4) */ - SETAMJCTRL_PORT5 /* INPUT1 (5) */ - SETAMJCTRL_PORT6 /* INPUT1 (6) */ - - PORT_START_TAG("IN7") - PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) - PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_SERVICE2 ) - PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_INCLUDE( seta_mjctrl ) + + PORT_START_TAG("SERVICE") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE2 ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) INPUT_PORTS_END static INPUT_PORTS_START( mjyuugi ) - PORT_START_TAG("IN0") /* Coinage (0) */ - PORT_BIT ( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0010, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT ( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT ( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_START_TAG("SYSTEM") /* Coinage (0) */ + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_COIN1 ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START_TAG("DSW1") PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) ) @@ -873,23 +867,20 @@ static INPUT_PORTS_START( mjyuugi ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - SETAMJCTRL_PORT3 /* INPUT1 (3) */ - SETAMJCTRL_PORT4 /* INPUT1 (4) */ - SETAMJCTRL_PORT5 /* INPUT1 (5) */ - SETAMJCTRL_PORT6 /* INPUT1 (6) */ + PORT_INCLUDE( seta_mjctrl ) - PORT_START_TAG("IN7") - PORT_BIT ( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE3 ) + PORT_START_TAG("SERVICE") + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_DIPNAME( 0x0004, 0x0004, "Debug Mode (Cheat)") PORT_DIPSETTING( 0x0004, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_BIT ( 0x0008, IP_ACTIVE_LOW, IPT_SERVICE2 ) - PORT_BIT ( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SERVICE2 ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START_TAG("DSW3-1") /* [Debug switch] */ PORT_DIPNAME( 0x0001, 0x0001, "Debug 0 (Cheat)") @@ -904,7 +895,7 @@ static INPUT_PORTS_START( mjyuugi ) PORT_DIPNAME( 0x0008, 0x0008, "Debug 3 (Cheat)") PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_BIT ( 0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START_TAG("DSW3-2") /* [Debug switch] */ PORT_DIPNAME( 0x0001, 0x0001, "Debug 4 (Cheat)") @@ -919,20 +910,20 @@ static INPUT_PORTS_START( mjyuugi ) PORT_DIPNAME( 0x0008, 0x0008, "Debug 7 (Cheat)") PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_BIT ( 0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN ) INPUT_PORTS_END static INPUT_PORTS_START( ponchin ) - PORT_START_TAG("IN0") /* Coinage (0) */ - PORT_BIT ( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0010, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT ( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT ( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_START_TAG("SYSTEM") /* Coinage (0) */ + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_COIN1 ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START_TAG("DSW1") PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) ) @@ -982,21 +973,18 @@ static INPUT_PORTS_START( ponchin ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - SETAMJCTRL_PORT3 /* INPUT1 (3) */ - SETAMJCTRL_PORT4 /* INPUT1 (4) */ - SETAMJCTRL_PORT5 /* INPUT1 (5) */ - SETAMJCTRL_PORT6 /* INPUT1 (6) */ - - PORT_START_TAG("IN7") - PORT_BIT ( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE3 ) - PORT_BIT ( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0008, IP_ACTIVE_LOW, IPT_SERVICE2 ) - PORT_BIT ( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT ( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_INCLUDE( seta_mjctrl ) + + PORT_START_TAG("SERVICE") + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE3 ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SERVICE2 ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START_TAG("DSW3-1") /* [Debug switch] */ PORT_DIPNAME( 0x0001, 0x0001, "Debug 0 (Cheat)") @@ -1011,7 +999,7 @@ static INPUT_PORTS_START( ponchin ) PORT_DIPNAME( 0x0008, 0x0008, "Debug 3 (Cheat)") PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_BIT ( 0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START_TAG("DSW3-2") /* [Debug switch] */ PORT_DIPNAME( 0x0001, 0x0001, "Debug 4 (Cheat)") @@ -1026,7 +1014,7 @@ static INPUT_PORTS_START( ponchin ) PORT_DIPNAME( 0x0008, 0x0008, "Debug 7 (Cheat)") PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_BIT ( 0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN ) INPUT_PORTS_END diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c index 31f20fa4740..5f20b3fc7ef 100644 --- a/src/mame/drivers/srmp6.c +++ b/src/mame/drivers/srmp6.c @@ -317,14 +317,14 @@ static WRITE16_HANDLER( srmp6_input_select_w ) static READ16_HANDLER( srmp6_inputs_r ) { if (offset == 0) // DSW - return input_port_read_indexed(machine, 4); + return input_port_read(machine, "DSW"); switch(srmp6_input_select) // inputs { - case 1<<0: return input_port_read_indexed(machine, 0); - case 1<<1: return input_port_read_indexed(machine, 1); - case 1<<2: return input_port_read_indexed(machine, 2); - case 1<<3: return input_port_read_indexed(machine, 3); + case 1<<0: return input_port_read(machine, "KEY0"); + case 1<<1: return input_port_read(machine, "KEY1"); + case 1<<2: return input_port_read(machine, "KEY2"); + case 1<<3: return input_port_read(machine, "KEY3"); } return 0; @@ -578,44 +578,44 @@ ADDRESS_MAP_END static INPUT_PORTS_START( srmp6 ) - PORT_START - PORT_BIT ( 0xfe01, IP_ACTIVE_LOW, IPT_UNUSED ) // explicitely discarded - PORT_BIT ( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_A ) - PORT_BIT ( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_E ) - PORT_BIT ( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_I ) - PORT_BIT ( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_M ) - PORT_BIT ( 0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) - PORT_BIT ( 0x0040, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT ( 0x0080, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2) + PORT_START_TAG("KEY0") + PORT_BIT( 0xfe01, IP_ACTIVE_LOW, IPT_UNUSED ) // explicitely discarded + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_A ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_E ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_I ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_M ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_START1 ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2) PORT_SERVICE_NO_TOGGLE( 0x0100, IP_ACTIVE_LOW ) - PORT_START - PORT_BIT ( 0xfe41, IP_ACTIVE_LOW, IPT_UNUSED ) // explicitely discarded - PORT_BIT ( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_B ) - PORT_BIT ( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_F ) - PORT_BIT ( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_J ) - PORT_BIT ( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_N ) - PORT_BIT ( 0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) - PORT_BIT ( 0x0180, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START - PORT_BIT ( 0xfe41, IP_ACTIVE_LOW, IPT_UNUSED ) // explicitely discarded - PORT_BIT ( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_C ) - PORT_BIT ( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_G ) - PORT_BIT ( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_K ) - PORT_BIT ( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) - PORT_BIT ( 0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) - PORT_BIT ( 0x0180, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START - PORT_BIT ( 0xfe61, IP_ACTIVE_LOW, IPT_UNUSED ) // explicitely discarded - PORT_BIT ( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_D ) - PORT_BIT ( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_H ) - PORT_BIT ( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_L ) - PORT_BIT ( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) - PORT_BIT ( 0x0180, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START /* 16-bit DSW1+DSW2 */ + PORT_START_TAG("KEY1") + PORT_BIT( 0xfe41, IP_ACTIVE_LOW, IPT_UNUSED ) // explicitely discarded + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_B ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_F ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_J ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_N ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) + PORT_BIT( 0x0180, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("KEY2") + PORT_BIT( 0xfe41, IP_ACTIVE_LOW, IPT_UNUSED ) // explicitely discarded + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_C ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_G ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_K ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) + PORT_BIT( 0x0180, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("KEY3") + PORT_BIT( 0xfe61, IP_ACTIVE_LOW, IPT_UNUSED ) // explicitely discarded + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_D ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_H ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_L ) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) + PORT_BIT( 0x0180, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("DSW") /* 16-bit DSW1+DSW2 */ PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) ) // DSW1 PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) ) @@ -741,4 +741,3 @@ ROM_END /*GAME( YEAR,NAME,PARENT,MACHINE,INPUT,INIT,MONITOR,COMPANY,FULLNAME,FLAGS)*/ GAME( 1995, srmp6, 0, srmp6, srmp6, 0, ROT0, "Seta", "Super Real Mahjong P6 (Japan)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND) - diff --git a/src/mame/drivers/ssfindo.c b/src/mame/drivers/ssfindo.c index 967a6ae345b..750223f33bc 100644 --- a/src/mame/drivers/ssfindo.c +++ b/src/mame/drivers/ssfindo.c @@ -319,25 +319,25 @@ static READ32_HANDLER(PS7500_IO_r) case IOLINES: //TODO: eeprom 24c01 #if 0 - mame_printf_debug("IOLINESR %i @%x\n",offset,activecpu_get_pc()); + mame_printf_debug("IOLINESR %i @%x\n", offset, activecpu_get_pc()); #endif - if(flashType==1) + if(flashType == 1) return 0; else return mame_rand(machine); case IRQSTA: - return (PS7500_IO[offset]&(~2))|0x80; + return (PS7500_IO[offset] & (~2)) | 0x80; case IRQRQA: - return (PS7500_IO[IRQSTA]&PS7500_IO[IRQMSKA])|0x80; + return (PS7500_IO[IRQSTA] & PS7500_IO[IRQMSKA]) | 0x80; case IOCR: //TODO: nINT1, OD[n] p.81 - return (input_port_read_indexed(machine, 0)&0x80)|0x34|3; + return (input_port_read(machine, "PS7500") & 0x80) | 0x34 | 3; case VIDCR: - return (PS7500_IO[offset]|0x50)&0xfffffff0; + return (PS7500_IO[offset] | 0x50) & 0xfffffff0; case T1low: case T0low: @@ -496,10 +496,10 @@ static ADDRESS_MAP_START( ssfindo_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x03012ff0, 0x03012ff3) AM_NOP AM_RANGE(0x03012ff4, 0x03012ff7) AM_WRITENOP AM_READ(ff4_r) //status flag ? AM_RANGE(0x03012ff8, 0x03012fff) AM_NOP - AM_RANGE(0x03240000, 0x03240003) AM_WRITENOP AM_READ(input_port_1_dword_r) - AM_RANGE(0x03241000, 0x03241003) AM_WRITENOP AM_READ(input_port_2_dword_r) + AM_RANGE(0x03240000, 0x03240003) AM_READ_PORT("IN0") AM_WRITENOP + AM_RANGE(0x03241000, 0x03241003) AM_READ_PORT("IN1") AM_WRITENOP AM_RANGE(0x03242000, 0x03242003) AM_READ(io_r) AM_WRITE(io_w) - AM_RANGE(0x03243000, 0x03243003) AM_WRITENOP AM_READ(input_port_3_dword_r) + AM_RANGE(0x03243000, 0x03243003) AM_READ_PORT("DSW") AM_WRITENOP AM_RANGE(0x0324f000, 0x0324f003) AM_READ(SIMPLEIO_r) AM_RANGE(0x03245000, 0x03245003) AM_WRITENOP /* sound ? */ AM_RANGE(0x03400000, 0x03400003) AM_WRITE(FIFO_w) @@ -511,8 +511,8 @@ static ADDRESS_MAP_START( ppcar_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x03200000, 0x032001ff) AM_READWRITE(PS7500_IO_r,PS7500_IO_w) AM_RANGE(0x03012b00, 0x03012bff) AM_READ(randomized_r) AM_WRITENOP AM_RANGE(0x03012e60, 0x03012e67) AM_WRITENOP - AM_RANGE(0x03012ff8 ,0x03012ffb) AM_WRITENOP AM_READ(input_port_1_dword_r) - AM_RANGE(0x032c0000, 0x032c0003) AM_WRITENOP AM_READ(input_port_2_dword_r) + AM_RANGE(0x03012ff8, 0x03012ffb) AM_READ_PORT("IN0") AM_WRITENOP + AM_RANGE(0x032c0000, 0x032c0003) AM_READ_PORT("IN1") AM_WRITENOP AM_RANGE(0x03340000, 0x03340007) AM_WRITENOP AM_RANGE(0x03341000, 0x0334101f) AM_WRITENOP AM_RANGE(0x033c0000, 0x033c0003) AM_READ(io_r) AM_WRITE(io_w) @@ -531,7 +531,7 @@ static INPUT_PORTS_START( ssfindo ) PORT_START_TAG("PS7500") PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK ) - PORT_START_TAG("IN 0") + PORT_START_TAG("IN0") PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED ) // IPT_START2 ?? PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) @@ -541,8 +541,7 @@ static INPUT_PORTS_START( ssfindo ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_START_TAG("IN 1") - + PORT_START_TAG("IN1") PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -551,39 +550,30 @@ static INPUT_PORTS_START( ssfindo ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 ) PORT_START_TAG("DSW") - PORT_DIPNAME( 0x01, 0x01, "Test Mode" ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - + PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x02, 0x02, DEF_STR( Free_Play ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - + PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x80, 0x80, DEF_STR( Service_Mode ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x04, 0x04, "DSW 2" ) - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - + PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x08, 0x08, "DSW 3" ) - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - + PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x10, 0x010, "DSW 4" ) - PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - + PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x20, 0x20, "DSW 5" ) - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - + PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x40, 0x040, "DSW 6" ) - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END @@ -591,18 +581,17 @@ static INPUT_PORTS_START( ppcar ) PORT_START_TAG("PS7500") PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK ) - PORT_START_TAG("IN 0") - PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_COIN1 ) - - PORT_START_TAG("IN 1") - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) - PORT_BIT( 0x008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x010, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x020, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x040, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) - PORT_BIT( 0x080, IP_ACTIVE_LOW, IPT_START1 ) - + PORT_START_TAG("IN0") + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN1 ) + + PORT_START_TAG("IN1") + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) INPUT_PORTS_END @@ -716,7 +705,5 @@ static DRIVER_INIT(ppcar) PS7500timer1 = timer_alloc(PS7500_Timer1_callback, NULL); } -GAME( 1999, ssfindo, 0, ssfindo, ssfindo, ssfindo, ROT0, "Icarus", "See See Find Out", GAME_NO_SOUND ) -GAME( 1999, ppcar, 0, ppcar, ppcar, ppcar, ROT0, "Icarus", "Pang Pang Car", GAME_NO_SOUND ) - - +GAME( 1999, ssfindo, 0, ssfindo, ssfindo, ssfindo, ROT0, "Icarus", "See See Find Out", GAME_NO_SOUND ) +GAME( 1999, ppcar, 0, ppcar, ppcar, ppcar, ROT0, "Icarus", "Pang Pang Car", GAME_NO_SOUND ) diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c index 4de45bfe7b4..8d5c5e61bbf 100644 --- a/src/mame/drivers/sshangha.c +++ b/src/mame/drivers/sshangha.c @@ -98,11 +98,11 @@ static READ16_HANDLER( sshangha_protection16_r ) switch (offset) { case 0x050 >> 1: /* Player 1 & Player 2 joysticks & fire buttons */ - return (input_port_read_indexed(machine, 0) + (input_port_read_indexed(machine, 1) << 8)); + return (input_port_read(machine, "P1") + (input_port_read(machine, "P2") << 8)); case 0x76a >> 1: /* Credits */ - return input_port_read_indexed(machine, 2); + return input_port_read(machine, "SYSTEM"); case 0x0ac >> 1: /* DIPS */ - return (input_port_read_indexed(machine, 3) + (input_port_read_indexed(machine, 4) << 8)); + return (input_port_read(machine, "DSW1") + (input_port_read(machine, "DSW2") << 8)); // Protection TODO } @@ -116,11 +116,11 @@ static READ16_HANDLER( sshanghb_protection16_r ) switch (offset) { case 0x050 >> 1: /* Player 1 & Player 2 joysticks & fire buttons */ - return (input_port_read_indexed(machine, 0) + (input_port_read_indexed(machine, 1) << 8)); + return (input_port_read(machine, "P1") + (input_port_read(machine, "P2") << 8)); case 0x76a >> 1: /* Credits */ - return input_port_read_indexed(machine, 2); + return input_port_read(machine, "SYSTEM"); case 0x0ac >> 1: /* DIPS */ - return (input_port_read_indexed(machine, 3) + (input_port_read_indexed(machine, 4) << 8)); + return (input_port_read(machine, "DSW1") + (input_port_read(machine, "DSW2") << 8)); } return sshangha_prot_data[offset]; } @@ -202,7 +202,7 @@ ADDRESS_MAP_END /******************************************************************************/ static INPUT_PORTS_START( sshangha ) - PORT_START_TAG("IN0") /* Player 1 controls (0xfec047.b) */ + PORT_START_TAG("P1") /* Player 1 controls (0xfec047.b) */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -212,7 +212,7 @@ static INPUT_PORTS_START( sshangha ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_NAME("P1 Help") PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START_TAG("IN1") /* Player 2 controls (0xfec046.b) */ + PORT_START_TAG("P2") /* Player 2 controls (0xfec046.b) */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -222,7 +222,7 @@ static INPUT_PORTS_START( sshangha ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("P2 Help") PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("IN2") /* Credits */ + PORT_START_TAG("SYSTEM") /* Credits */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) diff --git a/src/mame/drivers/ssingles.c b/src/mame/drivers/ssingles.c index f482ad28267..794699c8a17 100644 --- a/src/mame/drivers/ssingles.c +++ b/src/mame/drivers/ssingles.c @@ -147,17 +147,17 @@ static WRITE8_HANDLER(c001_w) static READ8_HANDLER(controls_r) { int data=7; - switch(input_port_read_indexed(machine, 1)) //multiplexed + switch(input_port_read(machine, "IN1")) //multiplexed { - case 0x01: data=1; break; - case 0x02: data=2; break; - case 0x04: data=3; break; - case 0x08: data=4; break; - case 0x10: data=5; break; - case 0x20: data=6; break; - case 0x40: data=0; break; + case 0x01: data = 1; break; + case 0x02: data = 2; break; + case 0x04: data = 3; break; + case 0x08: data = 4; break; + case 0x10: data = 5; break; + case 0x20: data = 6; break; + case 0x40: data = 0; break; } - return (input_port_read_indexed(machine, 0)&(~0x1c))|(data<<2); + return (input_port_read(machine, "IN0") & (~0x1c)) | (data << 2); } static ADDRESS_MAP_START( ssingles_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -177,8 +177,8 @@ static ADDRESS_MAP_START( ssingles_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x06, 0x06) AM_WRITE(AY8910_control_port_1_w) AM_RANGE(0x08, 0x08) AM_READNOP AM_RANGE(0x0a, 0x0a) AM_WRITE(AY8910_write_port_1_w) - AM_RANGE(0x16, 0x16) AM_READ(input_port_2_r) - AM_RANGE(0x18, 0x18) AM_READ(input_port_3_r) + AM_RANGE(0x16, 0x16) AM_READ_PORT("DSW0") + AM_RANGE(0x18, 0x18) AM_READ_PORT("DSW1") AM_RANGE(0x1c, 0x1c) AM_READ(controls_r) AM_RANGE(0x1a, 0x1a) AM_WRITENOP //video/crt related AM_RANGE(0xfe, 0xfe) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) @@ -187,15 +187,14 @@ static ADDRESS_MAP_START( ssingles_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_END static INPUT_PORTS_START( ssingles ) -PORT_START_TAG("IN0") + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN ) //must be LOW - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON3 ) -PORT_START_TAG("IN1") + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) @@ -204,57 +203,55 @@ PORT_START_TAG("IN1") PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START2 ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 ) -PORT_START_TAG("DSW0") -PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x02, DEF_STR( 1C_3C ) ) - PORT_DIPSETTING( 0x03, DEF_STR( Free_Play ) ) -PORT_DIPNAME( 0x20, 0x20, DEF_STR( Difficulty ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Hard ) ) - -PORT_DIPNAME( 0x04, 0x04, "Unk1" ) - PORT_DIPSETTING( 0x00, DEF_STR( No ) ) - PORT_DIPSETTING( 0x04, DEF_STR( Yes ) ) -PORT_DIPNAME( 0x08, 0x08, "Unk2" ) - PORT_DIPSETTING( 0x00, DEF_STR( No ) ) - PORT_DIPSETTING( 0x08, DEF_STR( Yes ) ) -PORT_DIPNAME( 0x10, 0x10, "Unk3" ) - PORT_DIPSETTING( 0x00, DEF_STR( No ) ) - PORT_DIPSETTING( 0x10, DEF_STR( Yes ) ) - -PORT_DIPNAME( 0x40, 0x40, "Unk4" ) //tested in game, every frame, could be difficulty related - PORT_DIPSETTING( 0x00, DEF_STR( No ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Yes ) ) -PORT_DIPNAME( 0x80, 0x80, "Unk5" ) - PORT_DIPSETTING( 0x00, DEF_STR( No ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Yes ) ) - -PORT_START_TAG("DSW1") -PORT_DIPNAME( 0x03, 0x03, "Unk 6" ) - PORT_DIPSETTING( 0x01, "Pos 1" ) - PORT_DIPSETTING( 0x03, "Pos 2" ) - PORT_DIPSETTING( 0x00, "Pos 3" ) - PORT_DIPSETTING( 0x02, "Pos 4" ) -PORT_DIPNAME( 0x04, 0x04, "Unk7" ) - PORT_DIPSETTING( 0x00, DEF_STR( No ) ) - PORT_DIPSETTING( 0x04, DEF_STR( Yes ) ) -PORT_DIPNAME( 0x08, 0x08, "Unk8" ) - PORT_DIPSETTING( 0x00, DEF_STR( No ) ) - PORT_DIPSETTING( 0x08, DEF_STR( Yes ) ) -PORT_DIPNAME( 0x10, 0x10, "Unk9" ) - PORT_DIPSETTING( 0x00, DEF_STR( No ) ) - PORT_DIPSETTING( 0x10, DEF_STR( Yes ) ) -PORT_DIPNAME( 0x20, 0x20, "UnkA" ) - PORT_DIPSETTING( 0x00, DEF_STR( No ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Yes ) ) -PORT_DIPNAME( 0x40, 0x40, "UnkB" ) - PORT_DIPSETTING( 0x00, DEF_STR( No ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Yes ) ) -PORT_DIPNAME( 0x80, 0x80, "UnkC" ) - PORT_DIPSETTING( 0x00, DEF_STR( No ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Yes ) ) + PORT_START_TAG("DSW0") + PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_A ) ) + PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x02, DEF_STR( 1C_3C ) ) + PORT_DIPSETTING( 0x03, DEF_STR( Free_Play ) ) + PORT_DIPNAME( 0x20, 0x20, DEF_STR( Difficulty ) ) + PORT_DIPSETTING( 0x20, DEF_STR( Easy ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Hard ) ) + PORT_DIPNAME( 0x04, 0x04, "Unk1" ) + PORT_DIPSETTING( 0x00, DEF_STR( No ) ) + PORT_DIPSETTING( 0x04, DEF_STR( Yes ) ) + PORT_DIPNAME( 0x08, 0x08, "Unk2" ) + PORT_DIPSETTING( 0x00, DEF_STR( No ) ) + PORT_DIPSETTING( 0x08, DEF_STR( Yes ) ) + PORT_DIPNAME( 0x10, 0x10, "Unk3" ) + PORT_DIPSETTING( 0x00, DEF_STR( No ) ) + PORT_DIPSETTING( 0x10, DEF_STR( Yes ) ) + PORT_DIPNAME( 0x40, 0x40, "Unk4" ) //tested in game, every frame, could be difficulty related + PORT_DIPSETTING( 0x00, DEF_STR( No ) ) + PORT_DIPSETTING( 0x40, DEF_STR( Yes ) ) + PORT_DIPNAME( 0x80, 0x80, "Unk5" ) + PORT_DIPSETTING( 0x00, DEF_STR( No ) ) + PORT_DIPSETTING( 0x80, DEF_STR( Yes ) ) + + PORT_START_TAG("DSW1") + PORT_DIPNAME( 0x03, 0x03, "Unk 6" ) + PORT_DIPSETTING( 0x01, "Pos 1" ) + PORT_DIPSETTING( 0x03, "Pos 2" ) + PORT_DIPSETTING( 0x00, "Pos 3" ) + PORT_DIPSETTING( 0x02, "Pos 4" ) + PORT_DIPNAME( 0x04, 0x04, "Unk7" ) + PORT_DIPSETTING( 0x00, DEF_STR( No ) ) + PORT_DIPSETTING( 0x04, DEF_STR( Yes ) ) + PORT_DIPNAME( 0x08, 0x08, "Unk8" ) + PORT_DIPSETTING( 0x00, DEF_STR( No ) ) + PORT_DIPSETTING( 0x08, DEF_STR( Yes ) ) + PORT_DIPNAME( 0x10, 0x10, "Unk9" ) + PORT_DIPSETTING( 0x00, DEF_STR( No ) ) + PORT_DIPSETTING( 0x10, DEF_STR( Yes ) ) + PORT_DIPNAME( 0x20, 0x20, "UnkA" ) + PORT_DIPSETTING( 0x00, DEF_STR( No ) ) + PORT_DIPSETTING( 0x20, DEF_STR( Yes ) ) + PORT_DIPNAME( 0x40, 0x40, "UnkB" ) + PORT_DIPSETTING( 0x00, DEF_STR( No ) ) + PORT_DIPSETTING( 0x40, DEF_STR( Yes ) ) + PORT_DIPNAME( 0x80, 0x80, "UnkC" ) + PORT_DIPSETTING( 0x00, DEF_STR( No ) ) + PORT_DIPSETTING( 0x80, DEF_STR( Yes ) ) INPUT_PORTS_END static MACHINE_DRIVER_START( ssingles ) diff --git a/src/mame/drivers/ssozumo.c b/src/mame/drivers/ssozumo.c index 7b0f4601cdf..9ac3018a695 100644 --- a/src/mame/drivers/ssozumo.c +++ b/src/mame/drivers/ssozumo.c @@ -34,7 +34,7 @@ static INTERRUPT_GEN( ssozumo_interrupt ) { static int coin; - if ((input_port_read_indexed(machine, 0) & 0xc0) != 0xc0) + if ((input_port_read(machine, "P1") & 0xc0) != 0xc0) { if (coin == 0) { @@ -62,10 +62,10 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x27ff) AM_READ(SMH_RAM) AM_RANGE(0x3000, 0x31ff) AM_READ(SMH_RAM) - AM_RANGE(0x4000, 0x4000) AM_READ(input_port_0_r) - AM_RANGE(0x4010, 0x4010) AM_READ(input_port_1_r) - AM_RANGE(0x4020, 0x4020) AM_READ(input_port_2_r) - AM_RANGE(0x4030, 0x4030) AM_READ(input_port_3_r) + AM_RANGE(0x4000, 0x4000) AM_READ_PORT("P1") + AM_RANGE(0x4010, 0x4010) AM_READ_PORT("P2") + AM_RANGE(0x4020, 0x4020) AM_READ_PORT("DSW2") + AM_RANGE(0x4030, 0x4030) AM_READ_PORT("DSW1") AM_RANGE(0x6000, 0xffff) AM_READ(SMH_ROM) ADDRESS_MAP_END @@ -112,7 +112,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( ssozumo ) - PORT_START /* IN0 */ + PORT_START_TAG("P1") /* IN0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY @@ -122,7 +122,7 @@ static INPUT_PORTS_START( ssozumo ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_START /* IN1 */ + PORT_START_TAG("P2") /* IN1 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) @@ -132,7 +132,7 @@ static INPUT_PORTS_START( ssozumo ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START /* DSW2 */ + PORT_START_TAG("DSW2") /* DSW2 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x01, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x00, DEF_STR( Hard ) ) @@ -158,7 +158,7 @@ static INPUT_PORTS_START( ssozumo ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* DSW1 */ + PORT_START_TAG("DSW1") /* DSW1 */ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_B ) ) PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) ) diff --git a/src/mame/drivers/ssrj.c b/src/mame/drivers/ssrj.c index 92192eaa6af..2f2c69bc821 100644 --- a/src/mame/drivers/ssrj.c +++ b/src/mame/drivers/ssrj.c @@ -50,15 +50,15 @@ static int oldport=0x80; static MACHINE_RESET(ssrj) { UINT8 *rom = memory_region(machine, REGION_CPU1); - memset(&rom[0xc000],0,0x3fff); /* req for some control types */ - oldport=0x80; + memset(&rom[0xc000], 0 ,0x3fff); /* req for some control types */ + oldport = 0x80; } static READ8_HANDLER(ssrj_wheel_r) { - int port= input_port_read_indexed(machine, 1) -0x80; - int retval=port-oldport; - oldport=port; + int port = input_port_read(machine, "IN1") - 0x80; + int retval = port-oldport; + oldport = port; return retval; } @@ -70,9 +70,9 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd800, 0xdfff) AM_READ(ssrj_vram4_r) AM_RANGE(0xe000, 0xe7ff) AM_READ(SMH_RAM) AM_RANGE(0xe800, 0xefff) AM_READ(SMH_RAM) - AM_RANGE(0xf000, 0xf000) AM_READ(input_port_0_r) + AM_RANGE(0xf000, 0xf000) AM_READ_PORT("IN0") AM_RANGE(0xf001, 0xf001) AM_READ(ssrj_wheel_r) - AM_RANGE(0xf002, 0xf002) AM_READ(input_port_2_r) + AM_RANGE(0xf002, 0xf002) AM_READ_PORT("IN2") AM_RANGE(0xf401, 0xf401) AM_READ(AY8910_read_port_0_r) ADDRESS_MAP_END @@ -92,58 +92,47 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static INPUT_PORTS_START( ssrj ) - -PORT_START + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_TILT ) PORT_BIT( 0xe0, 0x00, IPT_PEDAL ) PORT_MINMAX(0,0xe0) PORT_SENSITIVITY(50) PORT_KEYDELTA(0x20) - PORT_START + PORT_START_TAG("IN1") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(4) PORT_REVERSE - - PORT_START - - PORT_BIT( 0xf, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* code @ $eef , tested when controls = type4 */ - - PORT_DIPNAME(0x30, 0x00, DEF_STR( Difficulty ) ) /* ??? code @ $62c */ - PORT_DIPSETTING( 0x10, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Normal ) ) - PORT_DIPSETTING( 0x20, "Difficult" ) - PORT_DIPSETTING( 0x30, "Very Difficult" ) - - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Free_Play ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - - PORT_DIPNAME( 0x80, 0x80, "No Hit" ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - - PORT_START - + PORT_START_TAG("IN2") + PORT_BIT( 0xf, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* code @ $eef , tested when controls = type4 */ + PORT_DIPNAME( 0x30, 0x00, DEF_STR( Difficulty ) ) /* ??? code @ $62c */ + PORT_DIPSETTING( 0x10, DEF_STR( Easy ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Normal ) ) + PORT_DIPSETTING( 0x20, "Difficult" ) + PORT_DIPSETTING( 0x30, "Very Difficult" ) + PORT_DIPNAME( 0x40, 0x40, DEF_STR( Free_Play ) ) + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x80, 0x80, "No Hit" ) + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + + PORT_START_TAG("IN3") PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coinage ) ) - PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) ) - PORT_DIPSETTING( 0x06, DEF_STR( 3C_1C ) ) - PORT_DIPSETTING( 0x05, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x02, DEF_STR( 1C_3C ) ) - PORT_DIPSETTING( 0x03, DEF_STR( 1C_4C ) ) + PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) ) + PORT_DIPSETTING( 0x06, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x05, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x02, DEF_STR( 1C_3C ) ) + PORT_DIPSETTING( 0x03, DEF_STR( 1C_4C ) ) PORT_DIPNAME( 0x08, 0x08, "Freeze" ) - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - - PORT_DIPNAME( 0x030, 0x000, DEF_STR( Controls ) ) /* 'press button to start' message, and wait for button2 */ - PORT_DIPSETTING( 0x00, "Type 1" ) - PORT_DIPSETTING( 0x10, "Type 2" ) - PORT_DIPSETTING( 0x20, "Type 3" ) - PORT_DIPSETTING( 0x30, "Type 4" ) - + PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x30, 0x00, DEF_STR( Controls ) ) /* 'press button to start' message, and wait for button2 */ + PORT_DIPSETTING( 0x00, "Type 1" ) + PORT_DIPSETTING( 0x10, "Type 2" ) + PORT_DIPSETTING( 0x20, "Type 3" ) + PORT_DIPSETTING( 0x30, "Type 4" ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* sometimes hangs after game over ($69b) */ - - INPUT_PORTS_END static const gfx_layout charlayout = diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c index ad94c6c4ee2..3227c1454a2 100644 --- a/src/mame/drivers/ssv.c +++ b/src/mame/drivers/ssv.c @@ -491,7 +491,9 @@ static UINT16 *gdfs_blitram; static READ16_HANDLER( gdfs_eeprom_r ) { - return (((gdfs_lightgun_select & 1) ? 0 : 0xff) ^ input_port_read_indexed(machine, 5 + gdfs_lightgun_select)) | (eeprom_read_bit() << 8); + static const char *gunnames[] = { "GUNX1", "GUNY1", "GUNX2", "GUNY2" }; + + return (((gdfs_lightgun_select & 1) ? 0 : 0xff) ^ input_port_read(machine, gunnames[gdfs_lightgun_select])) | (eeprom_read_bit() << 8); } static WRITE16_HANDLER( gdfs_eeprom_w ) @@ -644,10 +646,10 @@ ADDRESS_MAP_END static READ16_HANDLER( hypreact_input_r ) { UINT16 input_sel = *ssv_input_sel; - if (input_sel & 0x0001) return input_port_read_indexed(machine, 5); - if (input_sel & 0x0002) return input_port_read_indexed(machine, 6); - if (input_sel & 0x0004) return input_port_read_indexed(machine, 7); - if (input_sel & 0x0008) return input_port_read_indexed(machine, 8); + if (input_sel & 0x0001) return input_port_read(machine, "KEY0"); + if (input_sel & 0x0002) return input_port_read(machine, "KEY1"); + if (input_sel & 0x0004) return input_port_read(machine, "KEY2"); + if (input_sel & 0x0008) return input_port_read(machine, "KEY3"); logerror("CPU #0 PC %06X: unknown input read: %04X\n",activecpu_get_pc(),input_sel); return 0xffff; } @@ -792,10 +794,10 @@ ADDRESS_MAP_END static READ16_HANDLER( srmp4_input_r ) { UINT16 input_sel = *ssv_input_sel; - if (input_sel & 0x0002) return input_port_read_indexed(machine, 5); - if (input_sel & 0x0004) return input_port_read_indexed(machine, 6); - if (input_sel & 0x0008) return input_port_read_indexed(machine, 7); - if (input_sel & 0x0010) return input_port_read_indexed(machine, 8); + if (input_sel & 0x0002) return input_port_read(machine, "KEY0"); + if (input_sel & 0x0004) return input_port_read(machine, "KEY1"); + if (input_sel & 0x0008) return input_port_read(machine, "KEY2"); + if (input_sel & 0x0010) return input_port_read(machine, "KEY3"); logerror("CPU #0 PC %06X: unknown input read: %04X\n",activecpu_get_pc(),input_sel); return 0xffff; } @@ -841,10 +843,10 @@ static WRITE16_HANDLER( srmp7_sound_bank_w ) static READ16_HANDLER( srmp7_input_r ) { UINT16 input_sel = *ssv_input_sel; - if (input_sel & 0x0002) return input_port_read_indexed(machine, 5); - if (input_sel & 0x0004) return input_port_read_indexed(machine, 6); - if (input_sel & 0x0008) return input_port_read_indexed(machine, 7); - if (input_sel & 0x0010) return input_port_read_indexed(machine, 8); + if (input_sel & 0x0002) return input_port_read(machine, "KEY0"); + if (input_sel & 0x0004) return input_port_read(machine, "KEY1"); + if (input_sel & 0x0008) return input_port_read(machine, "KEY2"); + if (input_sel & 0x0010) return input_port_read(machine, "KEY3"); logerror("CPU #0 PC %06X: unknown input read: %04X\n",activecpu_get_pc(),input_sel); return 0xffff; } @@ -874,17 +876,17 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( survarts_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r ) // Watchdog -// AM_RANGE(0x290000, 0x290001) AM_READ(SMH_NOP ) // ? -// AM_RANGE(0x2a0000, 0x2a0001) AM_READ(SMH_NOP ) // ? +// AM_RANGE(0x290000, 0x290001) AM_READ(SMH_NOP ) // ? +// AM_RANGE(0x2a0000, 0x2a0001) AM_READ(SMH_NOP ) // ? - AM_RANGE(0x400000, 0x43ffff) AM_READ(SMH_RAM) // dyna + AM_RANGE(0x400000, 0x43ffff) AM_READ(SMH_RAM) // dyna - AM_RANGE(0x500008, 0x500009) AM_READ(input_port_5_word_r ) // Extra Buttons + AM_RANGE(0x500008, 0x500009) AM_READ_PORT("ADD_BUTTONS") // Extra Buttons SSV_READMEM( 0xf00000 ) ADDRESS_MAP_END static ADDRESS_MAP_START( survarts_writemem, ADDRESS_SPACE_PROGRAM, 16 ) -// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP ) // ? 0,4 at the start - AM_RANGE(0x400000, 0x43ffff) AM_WRITE(SMH_RAM) // dyna +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP ) // ? 0,4 at the start + AM_RANGE(0x400000, 0x43ffff) AM_WRITE(SMH_RAM) // dyna SSV_WRITEMEM ADDRESS_MAP_END @@ -898,7 +900,7 @@ static UINT16 serial; static READ16_HANDLER( sxyreact_ballswitch_r ) { - return input_port_read_indexed(machine, 5); + return input_port_read_safe(machine, "SERVICE", 0); } static READ16_HANDLER( sxyreact_dial_r ) @@ -913,7 +915,7 @@ static WRITE16_HANDLER( sxyreact_dial_w ) static int old; if (data & 0x20) - serial = input_port_read_indexed(machine, 6) & 0xff; + serial = input_port_read_safe(machine, "PADDLE", 0) & 0xff; if ( (old & 0x40) && !(data & 0x40) ) // $40 -> $00 serial <<= 1; // shift 1 bit @@ -1071,11 +1073,11 @@ static READ16_HANDLER( eaglshot_trackball_r ) { switch(trackball_select) { - case 0x60: return (input_port_read_indexed(machine, 5) >> 8) & 0xff; - case 0x40: return (input_port_read_indexed(machine, 5) >> 0) & 0xff; + case 0x60: return (input_port_read(machine, "TRACKX") >> 8) & 0xff; + case 0x40: return (input_port_read(machine, "TRACKX") >> 0) & 0xff; - case 0x70: return (input_port_read_indexed(machine, 6) >> 8) & 0xff; - case 0x50: return (input_port_read_indexed(machine, 6) >> 0) & 0xff; + case 0x70: return (input_port_read(machine, "TRACKY") >> 8) & 0xff; + case 0x50: return (input_port_read(machine, "TRACKY") >> 0) & 0xff; } return 0; } @@ -1192,7 +1194,7 @@ static INPUT_PORTS_START( ssv_joystick ) PORT_START_TAG("DSW2") // IN1 - $210004 PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Modified below */ - PORT_START_TAG("IN2") // IN2 - $210008 + PORT_START_TAG("P1") // IN2 - $210008 PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) @@ -1202,7 +1204,7 @@ static INPUT_PORTS_START( ssv_joystick ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) - PORT_START_TAG("IN3") // IN3 - $21000a + PORT_START_TAG("P2") // IN3 - $21000a PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) @@ -1212,7 +1214,7 @@ static INPUT_PORTS_START( ssv_joystick ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) - PORT_START_TAG("IN4") // IN4 - $21000c + PORT_START_TAG("SYSTEM") // IN4 - $21000c PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(10) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(10) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -1229,7 +1231,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( ssv_mahjong ) PORT_INCLUDE(ssv_joystick) - PORT_START_TAG("IN5") // IN5 - $800002(0) + PORT_START_TAG("KEY0") // IN5 - $800002(0) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) @@ -1239,7 +1241,7 @@ static INPUT_PORTS_START( ssv_mahjong ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN6") // IN6 - $800002(1) + PORT_START_TAG("KEY1") // IN6 - $800002(1) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) @@ -1249,7 +1251,7 @@ static INPUT_PORTS_START( ssv_mahjong ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN7") // IN7 - $800002(2) + PORT_START_TAG("KEY2") // IN7 - $800002(2) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_N ) @@ -1259,7 +1261,7 @@ static INPUT_PORTS_START( ssv_mahjong ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN8") // IN8 - $800002(3) + PORT_START_TAG("KEY3") // IN8 - $800002(3) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_M ) @@ -1296,7 +1298,7 @@ static INPUT_PORTS_START( ssv_quiz ) PORT_DIPSETTING( 0x0000, DEF_STR( Hardest ) ) /* 8 sec */ PORT_BIT( 0x00fc, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Modified below */ - PORT_START_TAG("IN2") // IN2 - $210008 + PORT_START_TAG("P1") // IN2 - $210008 PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1306,7 +1308,7 @@ static INPUT_PORTS_START( ssv_quiz ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) - PORT_START_TAG("IN3") // IN3 - $21000a + PORT_START_TAG("P2") // IN3 - $21000a PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1316,7 +1318,7 @@ static INPUT_PORTS_START( ssv_quiz ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_START_TAG("IN4") // IN4 - $21000c + PORT_START_TAG("SYSTEM") // IN4 - $21000c PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(10) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(10) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -1486,10 +1488,10 @@ static INPUT_PORTS_START( eaglshot ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "DSW2:8" ) - PORT_START // IN5 - trackball x ($d00000) + PORT_START_TAG("TRACKX") // IN5 - trackball x ($d00000) PORT_BIT( 0x0fff, 0x0000, IPT_TRACKBALL_X ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_RESET PORT_PLAYER(1) - PORT_START // IN6 - trackball y ($d00000) + PORT_START_TAG("TRACKY") // IN6 - trackball y ($d00000) PORT_BIT( 0x0fff, 0x0000, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(30) PORT_KEYDELTA(30) PORT_RESET PORT_PLAYER(1) INPUT_PORTS_END @@ -1552,16 +1554,16 @@ static INPUT_PORTS_START( gdfs ) PORT_DIPSETTING( 0x0080, "Light" ) PORT_DIPSETTING( 0x0000, "Heavy" ) - PORT_START // IN5 - $540000(0) + PORT_START_TAG("GUNX1") // IN5 - $540000(0) PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_SENSITIVITY(35) PORT_KEYDELTA(10) PORT_PLAYER(1) - PORT_START // IN6 - $540000(1) + PORT_START_TAG("GUNY1") // IN6 - $540000(1) PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_SENSITIVITY(35) PORT_KEYDELTA(10) PORT_PLAYER(1) - PORT_START // IN7 - $540000(2) + PORT_START_TAG("GUNX2") // IN7 - $540000(2) PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_SENSITIVITY(35) PORT_KEYDELTA(10) PORT_PLAYER(2) - PORT_START // IN8 - $540000(3) + PORT_START_TAG("GUNY2") // IN8 - $540000(3) PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_SENSITIVITY(35) PORT_KEYDELTA(10) PORT_PLAYER(2) INPUT_PORTS_END @@ -1571,7 +1573,7 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( hypreact ) - PORT_START // IN0 - $210002 + PORT_START_TAG("DSW1") // IN0 - $210002 SSV_COINAGE_STANDARD( 0, 0x07, DEF_STR( Coin_A ), "DSWA:1,2,3" ) SSV_COINAGE_STANDARD( 3, 0x07, DEF_STR( Coin_B ), "DSWA:4,5,6" ) PORT_DIPNAME( 0x0040, 0x0040, "Half Coins To Continue" ) PORT_DIPLOCATION( "DSWA:7" ) @@ -1581,7 +1583,7 @@ static INPUT_PORTS_START( hypreact ) PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_START // IN1 - $210004 + PORT_START_TAG("DSW2") // IN1 - $210004 PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION( "DSWB:1" ) PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -1604,7 +1606,7 @@ static INPUT_PORTS_START( hypreact ) PORT_DIPSETTING( 0x0040, DEF_STR( Yes ) ) PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "DSWB:8" ) - PORT_START // IN2 - $210008 (used in joystick mode) + PORT_START_TAG("P1") // IN2 - $210008 (used in joystick mode) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) @@ -1614,7 +1616,7 @@ static INPUT_PORTS_START( hypreact ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) - PORT_START // IN3 - $21000a (used in joystick mode) + PORT_START_TAG("P2") // IN3 - $21000a (used in joystick mode) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) @@ -1624,45 +1626,45 @@ static INPUT_PORTS_START( hypreact ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN4 - $21000c + PORT_START_TAG("SYSTEM") // IN4 - $21000c PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(10) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(10) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) // service coin & bet PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) PORT_BIT( 0x00f0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN5 - $c00000(0) + PORT_START_TAG("KEY0") // IN5 - $c00000(0) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_M ) PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN6 - $c00000(1) + PORT_START_TAG("KEY1") // IN6 - $c00000(1) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_N ) PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) - PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN7 - $c00000(2) + PORT_START_TAG("KEY2") // IN7 - $c00000(2) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_K ) PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) - PORT_BIT( 0xffe0, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0xffe0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN8 - $c00000(3) + PORT_START_TAG("KEY3") // IN8 - $c00000(3) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) - PORT_BIT( 0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN ) INPUT_PORTS_END @@ -1706,37 +1708,37 @@ static INPUT_PORTS_START( hypreac2 ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "DSWB:8" ) - PORT_START // IN5 - $500000(0) + PORT_START_TAG("KEY0") // IN5 - $500000(0) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_M ) PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN6 - $500000(1) + PORT_START_TAG("KEY1") // IN6 - $500000(1) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_N ) PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) - PORT_BIT( 0xffe0, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0xffe0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN7 - $500000(2) + PORT_START_TAG("KEY2") // IN7 - $500000(2) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_K ) PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) - PORT_BIT( 0xffe0, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0xffe0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN8 - $500000(3) + PORT_START_TAG("KEY3") // IN8 - $500000(3) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) - PORT_BIT( 0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0xfff0, IP_ACTIVE_LOW, IPT_UNKNOWN ) INPUT_PORTS_END @@ -1965,7 +1967,7 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( meosism ) - PORT_START // IN0 - $210002 + PORT_START_TAG("DSW1") // IN0 - $210002 PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Coinage ) ) PORT_DIPLOCATION( "DSW1:1,2" ) PORT_DIPSETTING( 0x0003, "1 Medal/1 Credit" ) PORT_DIPSETTING( 0x0001, "1 Medal/5 Credits" ) @@ -1990,7 +1992,7 @@ static INPUT_PORTS_START( meosism ) PORT_DIPSETTING( 0x0080, DEF_STR( Low ) ) PORT_DIPSETTING( 0x0000, DEF_STR( High ) ) - PORT_START // IN1 - $210004 + PORT_START_TAG("DSW2") // IN1 - $210004 PORT_DIPNAME( 0x0003, 0x0003, "Game Rate" ) PORT_DIPLOCATION( "DSW2:1,2" ) PORT_DIPSETTING( 0x0000, "80%" ) PORT_DIPSETTING( 0x0002, "85%" ) @@ -2009,7 +2011,7 @@ static INPUT_PORTS_START( meosism ) PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_START // IN2 - $210008 + PORT_START_TAG("P1") // IN2 - $210008 PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON4 ) //bet PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) //stop/r PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) //stop/c @@ -2019,7 +2021,7 @@ static INPUT_PORTS_START( meosism ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_START1 ) //start PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) //- - PORT_START // IN3 - $21000a + PORT_START_TAG("P2") // IN3 - $21000a PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) //- PORT_SERVICE_NO_TOGGLE( 0x0002, IP_ACTIVE_LOW ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) //- @@ -2029,7 +2031,7 @@ static INPUT_PORTS_START( meosism ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) //- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) //- - PORT_START // IN4 - $21000c + PORT_START_TAG("SYSTEM") // IN4 - $21000c PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(10) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(10) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) //service coin @@ -2155,7 +2157,7 @@ INPUT_PORTS_END ***************************************************************************/ static INPUT_PORTS_START( srmp7 ) - PORT_START // IN0 - $210002 + PORT_START_TAG("DSW1") // IN0 - $210002 PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) ) PORT_DIPLOCATION( "DSW1:1,2,3" ) PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) ) @@ -2175,7 +2177,7 @@ static INPUT_PORTS_START( srmp7 ) PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0080, DEF_STR( On ) ) - PORT_START // IN1 - $210004 + PORT_START_TAG("DSW2") // IN1 - $210004 PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Difficulty ) ) PORT_DIPLOCATION( "DSW2:1,2,3" ) PORT_DIPSETTING( 0x0006, DEF_STR( Easiest ) ) PORT_DIPSETTING( 0x0005, DEF_STR( Easier ) ) @@ -2199,13 +2201,13 @@ static INPUT_PORTS_START( srmp7 ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "DSW2:8" ) - PORT_START // IN2 - $210008 + PORT_START_TAG("P1") // IN2 - $210008 PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN3 - $21000a + PORT_START_TAG("P2") // IN3 - $21000a PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN4 - $21000c + PORT_START_TAG("SYSTEM") // IN4 - $21000c PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(10) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(10) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -2213,7 +2215,7 @@ static INPUT_PORTS_START( srmp7 ) PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) // tested PORT_BIT( 0x00e0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN6 - $600000(0) + PORT_START_TAG("KEY0") // IN6 - $600000(0) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) @@ -2223,7 +2225,7 @@ static INPUT_PORTS_START( srmp7 ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN7 - $600000(1) + PORT_START_TAG("KEY1") // IN7 - $600000(1) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_N ) @@ -2233,7 +2235,7 @@ static INPUT_PORTS_START( srmp7 ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN8 - $600000(2) + PORT_START_TAG("KEY2") // IN8 - $600000(2) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_M ) @@ -2243,7 +2245,7 @@ static INPUT_PORTS_START( srmp7 ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN5 - $600000(3) + PORT_START_TAG("KEY3") // IN5 - $600000(3) PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) @@ -2331,7 +2333,7 @@ static INPUT_PORTS_START( survarts ) PORT_DIPSETTING( 0x0080, "Heavy" ) PORT_DIPSETTING( 0x0000, "Heaviest" ) - PORT_START // IN5 - $500008 + PORT_START_TAG("ADD_BUTTONS") // IN5 - $500008 PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) @@ -2384,10 +2386,10 @@ static INPUT_PORTS_START( sxyreact ) PORT_SERVICE_DIPLOC( 0x0040, IP_ACTIVE_LOW, "DSW2:7" ) PORT_DIPUNUSED_DIPLOC( 0x0080, 0x0080, "DSW2:8" ) - PORT_START // IN5 - $500002 + PORT_START_TAG("SERVICE") // IN5 - $500002 PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_SERVICE2 ) // ball switch on -> handle motor off - PORT_START // IN6 - $500004 + PORT_START_TAG("PADDLE") // IN6 - $500004 PORT_BIT( 0xff, 0x00, IPT_PADDLE ) PORT_MINMAX(0,0xcf) PORT_SENSITIVITY(15) PORT_KEYDELTA(15) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M) INPUT_PORTS_END @@ -2429,7 +2431,7 @@ static INPUT_PORTS_START( twineag2 ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "DSW2:8" ) - PORT_MODIFY("IN4") // IN4 - $21000c + PORT_MODIFY("SYSTEM") // IN4 - $21000c PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE4 ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_START3 ) diff --git a/src/mame/drivers/st0016.c b/src/mame/drivers/st0016.c index ac8c323f950..fdbf4ee4657 100644 --- a/src/mame/drivers/st0016.c +++ b/src/mame/drivers/st0016.c @@ -44,13 +44,17 @@ static READ8_HANDLER(mux_r) xxxx - input port #2 xxxx - dip switches (2x8 bits) (multiplexed) */ - int retval=input_port_read_indexed(machine, 2)&0x0f; - switch(mux_port&0x30) + int retval = input_port_read(machine, "SYSTEM") & 0x0f; + switch(mux_port & 0x30) { - case 0x00: retval|=((input_port_read_indexed(machine, 4)&1)<<4)|((input_port_read_indexed(machine, 4)&0x10)<<1)|((input_port_read_indexed(machine, 5)&1)<<6)|((input_port_read_indexed(machine, 5)&0x10)<<3);break; - case 0x10: retval|=((input_port_read_indexed(machine, 4)&2)<<3)|((input_port_read_indexed(machine, 4)&0x20) )|((input_port_read_indexed(machine, 5)&2)<<5)|((input_port_read_indexed(machine, 5)&0x20)<<2);break; - case 0x20: retval|=((input_port_read_indexed(machine, 4)&4)<<2)|((input_port_read_indexed(machine, 4)&0x40)>>1)|((input_port_read_indexed(machine, 5)&4)<<4)|((input_port_read_indexed(machine, 5)&0x40)<<1);break; - case 0x30: retval|=((input_port_read_indexed(machine, 4)&8)<<1)|((input_port_read_indexed(machine, 4)&0x80)>>2)|((input_port_read_indexed(machine, 5)&8)<<3)|((input_port_read_indexed(machine, 5)&0x80) );break; + case 0x00: retval |= ((input_port_read(machine, "DSW1") & 1) << 4) | ((input_port_read(machine, "DSW1") & 0x10) << 1) + | ((input_port_read(machine, "DSW2") & 1) << 6) | ((input_port_read(machine, "DSW2") & 0x10) <<3); break; + case 0x10: retval |= ((input_port_read(machine, "DSW1") & 2) << 3) | ((input_port_read(machine, "DSW1") & 0x20) ) + | ((input_port_read(machine, "DSW2") & 2) << 5) | ((input_port_read(machine, "DSW2") & 0x20) <<2); break; + case 0x20: retval |= ((input_port_read(machine, "DSW1") & 4) << 2) | ((input_port_read(machine, "DSW1") & 0x40) >> 1) + | ((input_port_read(machine, "DSW2") & 4) << 4) | ((input_port_read(machine, "DSW2") & 0x40) <<1); break; + case 0x30: retval |= ((input_port_read(machine, "DSW1") & 8) << 1) | ((input_port_read(machine, "DSW1") & 0x80) >> 2) + | ((input_port_read(machine, "DSW2") & 8) << 3) | ((input_port_read(machine, "DSW2") & 0x80) ); break; } return retval; } @@ -71,10 +75,10 @@ READ8_HANDLER(st0016_dma_r); static ADDRESS_MAP_START( st0016_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0xbf) AM_READ(st0016_vregs_r) AM_WRITE(st0016_vregs_w) /* video/crt regs ? */ - AM_RANGE(0xc0, 0xc0) AM_READ(input_port_0_r) AM_WRITE(mux_select_w) - AM_RANGE(0xc1, 0xc1) AM_READ(input_port_1_r) AM_WRITENOP + AM_RANGE(0xc0, 0xc0) AM_READ_PORT("P1") AM_WRITE(mux_select_w) + AM_RANGE(0xc1, 0xc1) AM_READ_PORT("P2") AM_WRITENOP AM_RANGE(0xc2, 0xc2) AM_READ(mux_r) AM_WRITENOP - AM_RANGE(0xc3, 0xc3) AM_READ(input_port_1_r) AM_WRITENOP + AM_RANGE(0xc3, 0xc3) AM_READ_PORT("P2") AM_WRITENOP AM_RANGE(0xe0, 0xe0) AM_WRITENOP /* renju = $40, neratte = 0 */ AM_RANGE(0xe1, 0xe1) AM_WRITE(st0016_rom_bank_w) AM_RANGE(0xe2, 0xe2) AM_WRITE(st0016_sprite_bank_w) @@ -135,12 +139,11 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( st0016_m2_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0xbf) AM_READ(st0016_vregs_r) AM_WRITE(st0016_vregs_w) - AM_RANGE(0xc0, 0xc3) AM_READ(latch8_r) AM_WRITE(latch8_w) - - AM_RANGE(0xd0, 0xd0) AM_READ(input_port_0_r) AM_WRITE(mux_select_w) - AM_RANGE(0xd1, 0xd1) AM_READ(input_port_1_r) AM_WRITENOP + AM_RANGE(0xc0, 0xc3) AM_READ(latch8_r) AM_WRITE(latch8_w) + AM_RANGE(0xd0, 0xd0) AM_READ_PORT("P1") AM_WRITE(mux_select_w) + AM_RANGE(0xd1, 0xd1) AM_READ_PORT("P2") AM_WRITENOP AM_RANGE(0xd2, 0xd2) AM_READ(mux_r) AM_WRITENOP - AM_RANGE(0xd3, 0xd3) AM_READ(input_port_1_r) AM_WRITENOP + AM_RANGE(0xd3, 0xd3) AM_READ_PORT("P2") AM_WRITENOP AM_RANGE(0xe0, 0xe0) AM_WRITENOP AM_RANGE(0xe1, 0xe1) AM_WRITE(st0016_rom_bank_w) AM_RANGE(0xe2, 0xe2) AM_WRITE(st0016_sprite_bank_w) @@ -157,7 +160,7 @@ ADDRESS_MAP_END * *************************************/ static INPUT_PORTS_START( st0016 ) - PORT_START_TAG("IN0") + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) @@ -167,7 +170,7 @@ static INPUT_PORTS_START( st0016 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START_TAG("IN1") + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) @@ -177,66 +180,66 @@ static INPUT_PORTS_START( st0016 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("IN2") + PORT_START_TAG("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_SERVICE( 0x08, IP_ACTIVE_LOW) - PORT_START_TAG("IN3") + PORT_START_TAG("UNK") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused ? */ PORT_START_TAG("DSW1") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START_TAG("DSW2") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END /************************************* @@ -248,75 +251,74 @@ INPUT_PORTS_END static INPUT_PORTS_START( renju ) PORT_INCLUDE( st0016 ) - PORT_MODIFY("IN2") + PORT_MODIFY("SYSTEM") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_MODIFY("DSW1") /* Dip switch A */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x08, DEF_STR( On ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x08, DEF_STR( On ) ) PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) ) - PORT_DIPSETTING( 0x20, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) - PORT_DIPSETTING( 0x10, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x20, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) + PORT_DIPSETTING( 0x10, DEF_STR( 1C_2C ) ) PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_B ) ) - PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) - PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) + PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) ) PORT_MODIFY("DSW2") /* Dip switch B */ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Very_Hard ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Hard ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x03, DEF_STR( Normal ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Very_Hard ) ) + PORT_DIPSETTING( 0x01, DEF_STR( Hard ) ) + PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) + PORT_DIPSETTING( 0x03, DEF_STR( Normal ) ) INPUT_PORTS_END static INPUT_PORTS_START( koikois ) PORT_INCLUDE( st0016 ) - - PORT_MODIFY("IN0") + PORT_MODIFY("P1") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_MODIFY("IN2") + PORT_MODIFY("SYSTEM") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_MODIFY("DSW1") /* Dip switch A */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_DIPNAME( 0x02, 0x02, "Crt Mode" ) //flip screen ? - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x08, DEF_STR( On ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x08, DEF_STR( On ) ) PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) ) - PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) - PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) + PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) ) PORT_DIPNAME( 0x40, 0x40, DEF_STR( Controls ) ) - PORT_DIPSETTING( 0x00, "Majyan Panel" ) - PORT_DIPSETTING( 0x40, DEF_STR( Joystick ) ) + PORT_DIPSETTING( 0x00, "Majyan Panel" ) + PORT_DIPSETTING( 0x40, DEF_STR( Joystick ) ) PORT_MODIFY("DSW2") /* Dip switch B */ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Very_Hard ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Hard ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x03, DEF_STR( Normal ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Very_Hard ) ) + PORT_DIPSETTING( 0x01, DEF_STR( Hard ) ) + PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) + PORT_DIPSETTING( 0x03, DEF_STR( Normal ) ) INPUT_PORTS_END static INPUT_PORTS_START( nratechu ) @@ -324,34 +326,34 @@ static INPUT_PORTS_START( nratechu ) PORT_MODIFY("DSW1") /* Dip switch A */ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) - PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) ) - PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) ) - PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x06, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x05, DEF_STR( 1C_3C ) ) - PORT_DIPSETTING( 0x04, DEF_STR( 1C_4C ) ) + PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) ) + PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x06, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x05, DEF_STR( 1C_3C ) ) + PORT_DIPSETTING( 0x04, DEF_STR( 1C_4C ) ) PORT_DIPNAME( 0x80, 0x00, DEF_STR( Language ) ) - PORT_DIPSETTING( 0x00, DEF_STR( English ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Japanese ) ) + PORT_DIPSETTING( 0x00, DEF_STR( English ) ) + PORT_DIPSETTING( 0x80, DEF_STR( Japanese ) ) PORT_MODIFY("DSW2") /* Dip switch B */ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) // speed / time.. - PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x03, DEF_STR( Normal )) - PORT_DIPSETTING( 0x01, DEF_STR( Hard ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) + PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) + PORT_DIPSETTING( 0x03, DEF_STR( Normal )) + PORT_DIPSETTING( 0x01, DEF_STR( Hard ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) PORT_DIPNAME( 0x0C, 0x0C, "VS Round" ) - PORT_DIPSETTING( 0x00, "1" ) - PORT_DIPSETTING( 0x0C, "2" ) - PORT_DIPSETTING( 0x08, "3" ) - PORT_DIPSETTING( 0x04, "4" ) + PORT_DIPSETTING( 0x00, "1" ) + PORT_DIPSETTING( 0x0C, "2" ) + PORT_DIPSETTING( 0x08, "3" ) + PORT_DIPSETTING( 0x04, "4" ) PORT_DIPNAME( 0x20, 0x00, DEF_STR( Demo_Sounds ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x80, 0x80, "Test Mode" ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END static INPUT_PORTS_START( mayjisn2 ) @@ -359,34 +361,34 @@ static INPUT_PORTS_START( mayjisn2 ) PORT_MODIFY("DSW1") /* Dip switch A */ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) - PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) ) - PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) ) - PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x06, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x05, DEF_STR( 1C_3C ) ) - PORT_DIPSETTING( 0x04, DEF_STR( 1C_4C ) ) + PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) ) + PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x06, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x05, DEF_STR( 1C_3C ) ) + PORT_DIPSETTING( 0x04, DEF_STR( 1C_4C ) ) PORT_DIPNAME( 0x18, 0x18, "Timer" ) - PORT_DIPSETTING( 0x00, "6:00" ) - PORT_DIPSETTING( 0x08, "5:00" ) - PORT_DIPSETTING( 0x18, "4:00" ) - PORT_DIPSETTING( 0x10, "3:00" ) + PORT_DIPSETTING( 0x00, "6:00" ) + PORT_DIPSETTING( 0x08, "5:00" ) + PORT_DIPSETTING( 0x18, "4:00" ) + PORT_DIPSETTING( 0x10, "3:00" ) PORT_MODIFY("DSW2") /* Dip switch B */ PORT_DIPNAME( 0x18, 0x18, "Music in Game" ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x08, "Remixed" ) - PORT_DIPSETTING( 0x18, "Only Intro" ) - PORT_DIPSETTING( 0x10, "Classic" ) + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x08, "Remixed" ) + PORT_DIPSETTING( 0x18, "Only Intro" ) + PORT_DIPSETTING( 0x10, "Classic" ) PORT_DIPNAME( 0x20, 0x20, DEF_STR( Demo_Sounds ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x20, DEF_STR( On ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x20, DEF_STR( On ) ) PORT_DIPNAME( 0x40, 0x40, "Position of Title" ) - PORT_DIPSETTING( 0x00, "B" ) - PORT_DIPSETTING( 0x40, "A" ) + PORT_DIPSETTING( 0x00, "B" ) + PORT_DIPSETTING( 0x40, "A" ) PORT_DIPNAME( 0x80, 0x80, "Test mode" ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END static GFXDECODE_START( st0016 ) diff --git a/src/mame/drivers/stactics.c b/src/mame/drivers/stactics.c index 78632a6706e..2fc45db81be 100644 --- a/src/mame/drivers/stactics.c +++ b/src/mame/drivers/stactics.c @@ -83,8 +83,8 @@ static void move_motor(running_machine *machine, stactics_state *state) /* monitor motor under joystick control */ if (*state->motor_on & 0x01) { - int ip3 = input_port_read_indexed(machine, 3); - int ip4 = input_port_read_indexed(machine, 4); + int ip3 = input_port_read(machine, "IN3"); + int ip4 = input_port_read(machine, "FAKE"); /* up */ if (((ip4 & 0x01) == 0) && (state->vert_pos > -128)) @@ -173,8 +173,8 @@ static INTERRUPT_GEN( stactics_interrupt ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x2fff) AM_ROM AM_RANGE(0x4000, 0x47ff) AM_RAM - AM_RANGE(0x5000, 0x5000) AM_MIRROR(0x0fff) AM_READ(input_port_0_r) - AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_READ(input_port_1_r) + AM_RANGE(0x5000, 0x5000) AM_MIRROR(0x0fff) AM_READ_PORT("IN0") + AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_READ_PORT("IN1") AM_RANGE(0x6000, 0x6001) AM_MIRROR(0x0f08) AM_WRITE(stactics_coin_lockout_w) AM_RANGE(0x6002, 0x6005) AM_MIRROR(0x0f08) AM_WRITE(SMH_NOP) AM_RANGE(0x6006, 0x6007) AM_MIRROR(0x0f08) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(stactics_state, palette) @@ -188,8 +188,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x6070, 0x609f) AM_MIRROR(0x0f00) AM_WRITE(SMH_NOP) /* AM_RANGE(0x60a0, 0x60ef) AM_MIRROR(0x0f00) AM_WRITE(stactics_sound2_w) */ AM_RANGE(0x60f0, 0x60ff) AM_MIRROR(0x0f00) AM_WRITE(SMH_NOP) - AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_READ(input_port_2_r) - AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x0fff) AM_READ(input_port_3_r) + AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_READ_PORT("IN2") + AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x0fff) AM_READ_PORT("IN3") AM_RANGE(0x8000, 0x87ff) AM_MIRROR(0x0800) AM_WRITE(stactics_scroll_ram_w) AM_RANGE(0x9000, 0x9000) AM_MIRROR(0x0fff) AM_READ(vert_pos_r) AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x0fff) AM_READ(horiz_pos_r) @@ -209,8 +209,7 @@ ADDRESS_MAP_END *************************************/ static INPUT_PORTS_START( stactics ) - - PORT_START /* IN0 */ + PORT_START_TAG("IN0") /* IN0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON5 ) @@ -218,9 +217,9 @@ static INPUT_PORTS_START( stactics ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) - PORT_BIT (0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(get_motor_not_ready, 0) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(get_motor_not_ready, 0) - PORT_START /* IN1 */ + PORT_START_TAG("IN1") /* IN1 */ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_B ) ) PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x05, DEF_STR( 2C_1C ) ) @@ -246,19 +245,19 @@ static INPUT_PORTS_START( stactics ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* IN2 */ - PORT_BIT (0x07, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(get_rng, 0) - PORT_BIT (0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(stactics_get_frame_count_d3, 0) + PORT_START_TAG("IN2") /* IN2 */ + PORT_BIT( 0x07, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(get_rng, 0) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(stactics_get_frame_count_d3, 0) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_DIPNAME( 0x40, 0x40, DEF_STR( Free_Play ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) - PORT_START /* IN3 */ + PORT_START_TAG("IN3") /* IN3 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_BIT (0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(stactics_get_shot_standby, 0) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(stactics_get_shot_standby, 0) PORT_DIPNAME( 0x04, 0x04, "Number of Barriers" ) PORT_DIPSETTING( 0x04, "4" ) PORT_DIPSETTING( 0x00, "6" ) @@ -270,9 +269,9 @@ static INPUT_PORTS_START( stactics ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY - PORT_BIT (0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(stactics_get_not_shot_arrive, 0) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(stactics_get_not_shot_arrive, 0) - PORT_START /* FAKE */ + PORT_START_TAG("FAKE") /* FAKE */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY INPUT_PORTS_END diff --git a/src/mame/drivers/starfire.c b/src/mame/drivers/starfire.c index ea9fe37dee9..84f523b6c4c 100644 --- a/src/mame/drivers/starfire.c +++ b/src/mame/drivers/starfire.c @@ -105,11 +105,11 @@ static READ8_HANDLER( starfire_input_r ) { switch (offset & 15) { - case 0: return input_port_read_indexed(machine, 0); - case 1: return input_port_read_indexed(machine, 1); /* Note: need to loopback sounds lengths on that one */ - case 5: return input_port_read_indexed(machine, 4); - case 6: return input_port_read_indexed(machine, 2); - case 7: return input_port_read_indexed(machine, 3); + case 0: return input_port_read(machine, "DSW"); + case 1: return input_port_read(machine, "SYSTEM"); /* Note: need to loopback sounds lengths on that one */ + case 5: return input_port_read(machine, "STICKZ"); + case 6: return input_port_read(machine, "STICKX"); + case 7: return input_port_read(machine, "STICKY"); default: return 0xff; } } @@ -132,10 +132,10 @@ static READ8_HANDLER( fireone_input_r ) switch (offset & 15) { - case 0: return input_port_read_indexed(machine, 0); - case 1: return input_port_read_indexed(machine, 1); + case 0: return input_port_read(machine, "DSW"); + case 1: return input_port_read(machine, "SYSTEM"); case 2: - temp = fireone_select ? input_port_read_indexed(machine, 2) : input_port_read_indexed(machine, 3); + temp = fireone_select ? input_port_read(machine, "P1") : input_port_read(machine, "P2"); temp = (temp & 0xc0) | fireone_paddle_map[temp & 0x3f]; return temp; default: return 0xff; @@ -166,7 +166,7 @@ ADDRESS_MAP_END *************************************/ static INPUT_PORTS_START( starfire ) - PORT_START /* DSW0 */ + PORT_START_TAG("DSW") /* DSW0 */ PORT_DIPNAME( 0x03, 0x00, "Time" ) PORT_DIPSETTING( 0x00, "90 Sec" ) PORT_DIPSETTING( 0x01, "80 Sec" ) @@ -188,7 +188,7 @@ static INPUT_PORTS_START( starfire ) PORT_DIPSETTING( 0x40, "fixed length+fire" ) PORT_SERVICE( 0x80, IP_ACTIVE_HIGH ) - PORT_START /* IN1 */ + PORT_START_TAG("SYSTEM") /* IN1 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) @@ -198,19 +198,19 @@ static INPUT_PORTS_START( starfire ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* IN2 */ + PORT_START_TAG("STICKX") /* IN2 */ PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) - PORT_START /* IN3 */ + PORT_START_TAG("STICKY") /* IN3 */ PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE - PORT_START /* IN4 */ /* throttle */ + PORT_START_TAG("STICKZ") /* IN4 */ /* throttle */ PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Z ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_REVERSE INPUT_PORTS_END static INPUT_PORTS_START( fireone ) - PORT_START /* DSW0 */ + PORT_START_TAG("DSW") /* DSW0 */ PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x03, "2 Coins/1 Player" ) PORT_DIPSETTING( 0x02, "2 Coins/1 or 2 Players" ) @@ -231,7 +231,7 @@ static INPUT_PORTS_START( fireone ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_SERVICE( 0x80, IP_ACTIVE_HIGH ) - PORT_START /* IN1 */ + PORT_START_TAG("SYSTEM") /* IN1 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1) @@ -241,12 +241,12 @@ static INPUT_PORTS_START( fireone ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - PORT_START /* IN2 */ + PORT_START_TAG("P1") /* IN2 */ PORT_BIT( 0x3f, 0x20, IPT_PADDLE ) PORT_MINMAX(0,63) PORT_SENSITIVITY(50) PORT_KEYDELTA(1) PORT_PLAYER(1) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) - PORT_START /* IN3 */ + PORT_START_TAG("P2") /* IN3 */ PORT_BIT( 0x3f, 0x20, IPT_PADDLE ) PORT_MINMAX(0,63) PORT_SENSITIVITY(50) PORT_KEYDELTA(1) PORT_PLAYER(2) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) diff --git a/src/mame/drivers/starshp1.c b/src/mame/drivers/starshp1.c index 1555d89aa5b..7c2e3f218c4 100644 --- a/src/mame/drivers/starshp1.c +++ b/src/mame/drivers/starshp1.c @@ -17,7 +17,7 @@ static int starshp1_analog_in_select; static INTERRUPT_GEN( starshp1_interrupt ) { - if ((input_port_read_indexed(machine, 0) & 0x90) != 0x90) + if ((input_port_read(machine, "SYSTEM") & 0x90) != 0x90) cpunum_set_input_line(machine, 0, 0, PULSE_LINE); } @@ -69,26 +69,26 @@ static READ8_HANDLER( starshp1_port_1_r ) switch (starshp1_analog_in_select) { case 0: - val = input_port_read_indexed(machine, 4); + val = input_port_read(machine, "STICKY"); break; case 1: - val = input_port_read_indexed(machine, 5); + val = input_port_read(machine, "STICKX"); break; case 2: val = 0x20; /* DAC feedback, not used */ break; case 3: - val = input_port_read_indexed(machine, 3); + val = input_port_read(machine, "PLAYTIME"); break; } - return (val & 0x3f) | input_port_read_indexed(machine, 1); + return (val & 0x3f) | input_port_read(machine, "VBLANK"); } static READ8_HANDLER( starshp1_port_2_r ) { - return input_port_read_indexed(machine, 2) | (starshp1_collision_latch & 0x0f); + return input_port_read(machine, "COINAGE") | (starshp1_collision_latch & 0x0f); } @@ -190,41 +190,41 @@ ADDRESS_MAP_END static INPUT_PORTS_START( starshp1 ) - PORT_START + PORT_START_TAG("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* SWA1? */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_DIPNAME( 0x20, 0x20, "Extended Play" ) - PORT_DIPSETTING( 0x00, DEF_STR( No ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Yes ) ) + PORT_DIPSETTING( 0x00, DEF_STR( No ) ) + PORT_DIPSETTING( 0x20, DEF_STR( Yes ) ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_TOGGLE PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_START + PORT_START_TAG("VBLANK") PORT_BIT( 0x3f, IP_ACTIVE_HIGH, IPT_UNUSED ) /* analog in */ PORT_SERVICE( 0x40, IP_ACTIVE_LOW ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK ) - PORT_START + PORT_START_TAG("COINAGE") PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_UNUSED ) /* collision latch */ PORT_DIPNAME( 0x70, 0x20, DEF_STR( Coinage )) - PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C )) - PORT_DIPSETTING( 0x20, DEF_STR( 1C_1C )) - PORT_DIPSETTING( 0x40, DEF_STR( 1C_2C )) + PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C )) + PORT_DIPSETTING( 0x20, DEF_STR( 1C_1C )) + PORT_DIPSETTING( 0x40, DEF_STR( 1C_2C )) PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) /* ground */ - PORT_START + PORT_START_TAG("PLAYTIME") PORT_DIPNAME( 0x3f, 0x20, "Play Time" ) /* potentiometer */ - PORT_DIPSETTING( 0x00, "60 Seconds" ) - PORT_DIPSETTING( 0x20, "90 Seconds" ) - PORT_DIPSETTING( 0x3f, "120 Seconds" ) + PORT_DIPSETTING( 0x00, "60 Seconds" ) + PORT_DIPSETTING( 0x20, "90 Seconds" ) + PORT_DIPSETTING( 0x3f, "120 Seconds" ) - PORT_START + PORT_START_TAG("STICKY") PORT_BIT( 0x3f, 0x20, IPT_AD_STICK_Y ) PORT_MINMAX(0,63) PORT_SENSITIVITY(10) PORT_KEYDELTA(10) PORT_REVERSE - PORT_START + PORT_START_TAG("STICKX") PORT_BIT( 0x3f, 0x20, IPT_AD_STICK_X ) PORT_MINMAX(0,63) PORT_SENSITIVITY(10) PORT_KEYDELTA(10) PORT_REVERSE INPUT_PORTS_END diff --git a/src/mame/drivers/starwars.c b/src/mame/drivers/starwars.c index 82351bc2ebc..9d39b3007e7 100644 --- a/src/mame/drivers/starwars.c +++ b/src/mame/drivers/starwars.c @@ -158,10 +158,10 @@ static OPBASE_HANDLER( esb_setopbase ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x2fff) AM_RAM AM_BASE(&vectorram) AM_SIZE(&vectorram_size) AM_REGION(REGION_CPU1, 0) AM_RANGE(0x3000, 0x3fff) AM_ROM /* vector_rom */ - AM_RANGE(0x4300, 0x431f) AM_READ(input_port_0_r) /* Memory mapped input port 0 */ + AM_RANGE(0x4300, 0x431f) AM_READ_PORT("IN0") /* Memory mapped input port 0 */ AM_RANGE(0x4320, 0x433f) AM_READ(starwars_input_1_r) /* Memory mapped input port 1 */ - AM_RANGE(0x4340, 0x435f) AM_READ(input_port_2_r) /* DIP switches bank 0 */ - AM_RANGE(0x4360, 0x437f) AM_READ(input_port_3_r) /* DIP switches bank 1 */ + AM_RANGE(0x4340, 0x435f) AM_READ_PORT("DSW0") /* DIP switches bank 0 */ + AM_RANGE(0x4360, 0x437f) AM_READ_PORT("DSW1") /* DIP switches bank 1 */ AM_RANGE(0x4380, 0x439f) AM_READ(starwars_adc_r) /* a-d control result */ AM_RANGE(0x4400, 0x4400) AM_READWRITE(starwars_main_read_r, starwars_main_wr_w) AM_RANGE(0x4401, 0x4401) AM_READ(starwars_main_ready_flag_r) @@ -212,7 +212,7 @@ ADDRESS_MAP_END *************************************/ static INPUT_PORTS_START( starwars ) - PORT_START /* IN0 */ + PORT_START_TAG("IN0") /* IN0 */ PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -222,7 +222,7 @@ static INPUT_PORTS_START( starwars ) PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_START /* IN1 */ + PORT_START_TAG("IN1") /* IN1 */ PORT_BIT ( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Diagnostic Step") PORT_CODE(KEYCODE_F1) @@ -234,7 +234,7 @@ static INPUT_PORTS_START( starwars ) /* Bit 7 is VG_HALT - see machine/starwars.c */ PORT_BIT ( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START /* DSW0 */ + PORT_START_TAG("DSW0") /* DSW0 */ PORT_DIPNAME(0x03, 0x00, "Starting Shields" ) PORT_DIPSETTING ( 0x00, "6" ) PORT_DIPSETTING ( 0x01, "7" ) @@ -257,7 +257,7 @@ static INPUT_PORTS_START( starwars ) PORT_DIPSETTING ( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING ( 0x00, DEF_STR( On ) ) - PORT_START /* DSW1 */ + PORT_START_TAG("DSW1") /* DSW1 */ PORT_DIPNAME(0x03, 0x02, DEF_STR( Coinage ) ) PORT_DIPSETTING ( 0x03, DEF_STR( 2C_1C ) ) PORT_DIPSETTING ( 0x02, DEF_STR( 1C_1C ) ) @@ -280,16 +280,16 @@ static INPUT_PORTS_START( starwars ) PORT_DIPSETTING ( 0x00, DEF_STR( None ) ) /* 0xc0 and 0xe0 None */ - PORT_START /* IN4 */ + PORT_START_TAG("STICKY") /* IN4 */ PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(70) PORT_KEYDELTA(30) - PORT_START /* IN5 */ + PORT_START_TAG("STICKX") /* IN5 */ PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(30) INPUT_PORTS_END static INPUT_PORTS_START( esb ) - PORT_START /* IN0 */ + PORT_START_TAG("IN0") /* IN0 */ PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -299,7 +299,7 @@ static INPUT_PORTS_START( esb ) PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_START /* IN1 */ + PORT_START_TAG("IN1") /* IN1 */ PORT_BIT ( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Diagnostic Step") PORT_CODE(KEYCODE_F1) @@ -311,7 +311,7 @@ static INPUT_PORTS_START( esb ) /* Bit 7 is VG_HALT - see machine/starwars.c */ PORT_BIT ( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START /* DSW0 */ + PORT_START_TAG("DSW0") /* DSW0 */ PORT_DIPNAME(0x03, 0x03, "Starting Shields" ) PORT_DIPSETTING ( 0x01, "2" ) PORT_DIPSETTING ( 0x00, "3" ) @@ -334,7 +334,7 @@ static INPUT_PORTS_START( esb ) PORT_DIPSETTING ( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING ( 0x00, DEF_STR( On ) ) - PORT_START /* DSW1 */ + PORT_START_TAG("DSW1") /* DSW1 */ PORT_DIPNAME(0x03, 0x02, DEF_STR( Coinage ) ) PORT_DIPSETTING ( 0x03, DEF_STR( 2C_1C ) ) PORT_DIPSETTING ( 0x02, DEF_STR( 1C_1C ) ) @@ -357,10 +357,10 @@ static INPUT_PORTS_START( esb ) PORT_DIPSETTING ( 0xe0, DEF_STR( None ) ) /* 0xc0 and 0x00 None */ - PORT_START /* IN4 */ + PORT_START_TAG("STICKY") /* IN4 */ PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(70) PORT_KEYDELTA(30) - PORT_START /* IN5 */ + PORT_START_TAG("STICKX") /* IN5 */ PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(30) INPUT_PORTS_END diff --git a/src/mame/drivers/stfight.c b/src/mame/drivers/stfight.c index 76a8c8b9dc2..dad83109617 100644 --- a/src/mame/drivers/stfight.c +++ b/src/mame/drivers/stfight.c @@ -235,14 +235,14 @@ DONE? (check on real board) static ADDRESS_MAP_START( readmem_cpu1, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) - AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) /* sf02.bin */ - AM_RANGE(0xc000, 0xc1ff) AM_READ(SMH_RAM) /* palette ram */ - AM_RANGE(0xc200, 0xc200) AM_READ(input_port_0_r) /* IN1 */ - AM_RANGE(0xc201, 0xc201) AM_READ(input_port_1_r) /* IN2 */ - AM_RANGE(0xc202, 0xc202) AM_READ(input_port_2_r) /* IN3 */ - AM_RANGE(0xc203, 0xc204) AM_READ(stfight_dsw_r) /* DS0,1 */ - AM_RANGE(0xc205, 0xc205) AM_READ(stfight_coin_r) /* coin mech */ - AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM) /* video */ + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1) /* sf02.bin */ + AM_RANGE(0xc000, 0xc1ff) AM_READ(SMH_RAM) /* palette ram */ + AM_RANGE(0xc200, 0xc200) AM_READ_PORT("P1") /* IN1 */ + AM_RANGE(0xc201, 0xc201) AM_READ_PORT("P2") /* IN2 */ + AM_RANGE(0xc202, 0xc202) AM_READ_PORT("START") /* IN3 */ + AM_RANGE(0xc203, 0xc204) AM_READ(stfight_dsw_r) /* DS0,1 */ + AM_RANGE(0xc205, 0xc205) AM_READ(stfight_coin_r) /* coin mech */ + AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM) /* video */ AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM) ADDRESS_MAP_END @@ -287,7 +287,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( stfight ) - PORT_START /* PLAYER 1 */ + PORT_START_TAG("P1") /* PLAYER 1 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY @@ -297,7 +297,7 @@ static INPUT_PORTS_START( stfight ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* PLAYER 2 */ + PORT_START_TAG("P2") /* PLAYER 2 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL @@ -307,13 +307,12 @@ static INPUT_PORTS_START( stfight ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* START BUTTONS */ + PORT_START_TAG("START") /* START BUTTONS */ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0xe7, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* DSW0 */ - + PORT_START_TAG("DSW0") /* DSW0 */ PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x07, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x03, DEF_STR( 4C_1C ) ) @@ -336,7 +335,7 @@ static INPUT_PORTS_START( stfight ) PORT_DIPSETTING( 0x80, "Red" ) PORT_DIPSETTING( 0x00, "Blue" ) - PORT_START /* DSW1 */ + PORT_START_TAG("DSW1") /* DSW1 */ PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) ) @@ -359,7 +358,7 @@ static INPUT_PORTS_START( stfight ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x80, DEF_STR( On ) ) - PORT_START /* COIN MECH */ + PORT_START_TAG("COIN") /* COIN MECH */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(2) INPUT_PORTS_END diff --git a/src/mame/drivers/stlforce.c b/src/mame/drivers/stlforce.c index e873ead324c..ffc03ce2d88 100644 --- a/src/mame/drivers/stlforce.c +++ b/src/mame/drivers/stlforce.c @@ -86,7 +86,7 @@ WRITE16_HANDLER( stlforce_bg_videoram_w ); static READ16_HANDLER( stlforce_input_port_1_r ) { - return (input_port_read_indexed(machine, 1) & ~0x40) | (eeprom_read_bit() << 6); + return (input_port_read(machine, "SYSTEM") & ~0x40) | (eeprom_read_bit() << 6); } static WRITE16_HANDLER( eeprom_w ) @@ -119,7 +119,7 @@ static ADDRESS_MAP_START( stlforce_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x105000, 0x107fff) AM_RAM /* unknown / ram */ AM_RANGE(0x108000, 0x108fff) AM_RAM AM_BASE(&stlforce_spriteram) AM_RANGE(0x109000, 0x11ffff) AM_RAM - AM_RANGE(0x400000, 0x400001) AM_READ(input_port_0_word_r) + AM_RANGE(0x400000, 0x400001) AM_READ_PORT("INPUT") AM_RANGE(0x400002, 0x400003) AM_READ(stlforce_input_port_1_r) AM_RANGE(0x400010, 0x400011) AM_WRITE(eeprom_w) AM_RANGE(0x400012, 0x400013) AM_WRITE(oki_bank_w) @@ -128,7 +128,7 @@ static ADDRESS_MAP_START( stlforce_map, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END static INPUT_PORTS_START( stlforce ) - PORT_START + PORT_START_TAG("INPUT") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -146,7 +146,7 @@ static INPUT_PORTS_START( stlforce ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START + PORT_START_TAG("SYSTEM") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED ) diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c index eaefbabb318..3b98084e366 100644 --- a/src/mame/drivers/stv.c +++ b/src/mame/drivers/stv.c @@ -468,13 +468,13 @@ static UINT8 stv_SMPC_r8 (running_machine *machine, int offset) return_data = 0x20 ^ 0xff; if (offset == 0x75)//PDR1 read - return_data = input_port_read_indexed(machine, 0); + return_data = input_port_read(machine, "DSW1"); if (offset == 0x77)//PDR2 read return_data= (0xfe | eeprom_read_bit()); // if (offset == 0x33) //country code -// return_data = input_port_read_indexed(machine, 7); +// return_data = input_port_read(machine, "FAKE"); if (activecpu_get_pc()==0x060020E6) return_data = 0x10;//??? @@ -633,7 +633,7 @@ static void stv_SMPC_w8 (running_machine *machine, int offset, UINT8 data) smpc_ram[0x31]=0x00; //? - //smpc_ram[0x33]=input_port_read_indexed(machine, 7); + //smpc_ram[0x33]=input_port_read(machine, "FAKE"); smpc_ram[0x35]=0x00; smpc_ram[0x37]=0x00; @@ -902,21 +902,21 @@ static READ32_HANDLER ( stv_io_r32 ) case 0: switch(port_sel) { - case 0x77: return 0xff000000|(input_port_read_indexed(machine, 2) << 16) |0x0000ff00|(input_port_read_indexed(machine, 3)); + case 0x77: return 0xff000000|(input_port_read(machine, "P1") << 16) |0x0000ff00|(input_port_read(machine, "P2")); case 0x67: { switch(mux_data) { /*Mahjong panel interface,bit wise(ACTIVE LOW)*/ - case 0xfe: return 0xff000000 | (input_port_read_indexed(machine, 7) << 16) | 0x0000ff00 | (input_port_read_indexed(machine, 12)); - case 0xfd: return 0xff000000 | (input_port_read_indexed(machine, 8) << 16) | 0x0000ff00 | (input_port_read_indexed(machine, 13)); - case 0xfb: return 0xff000000 | (input_port_read_indexed(machine, 9) << 16) | 0x0000ff00 | (input_port_read_indexed(machine, 14)); - case 0xf7: return 0xff000000 | (input_port_read_indexed(machine, 10) << 16) | 0x0000ff00 | (input_port_read_indexed(machine, 15)); - case 0xef: return 0xff000000 | (input_port_read_indexed(machine, 11) << 16) | 0x0000ff00 | (input_port_read_indexed(machine, 16)); + case 0xfe: return 0xff000000 | (input_port_read_safe(machine, "KEY0", 0) << 16) | 0x0000ff00 | (input_port_read_safe(machine, "KEY5", 0)); + case 0xfd: return 0xff000000 | (input_port_read_safe(machine, "KEY1", 0) << 16) | 0x0000ff00 | (input_port_read_safe(machine, "KEY6", 0)); + case 0xfb: return 0xff000000 | (input_port_read_safe(machine, "KEY2", 0) << 16) | 0x0000ff00 | (input_port_read_safe(machine, "KEY7", 0)); + case 0xf7: return 0xff000000 | (input_port_read_safe(machine, "KEY3", 0) << 16) | 0x0000ff00 | (input_port_read_safe(machine, "KEY8", 0)); + case 0xef: return 0xff000000 | (input_port_read_safe(machine, "KEY4", 0) << 16) | 0x0000ff00 | (input_port_read_safe(machine, "KEY9", 0)); /*Joystick panel*/ default: //popmessage("%02x MUX DATA",mux_data); - return (input_port_read_indexed(machine, 2) << 16) | (input_port_read_indexed(machine, 3)); + return (input_port_read(machine, "P1") << 16) | (input_port_read(machine, "P2")); } } case 0x47: @@ -926,12 +926,12 @@ static READ32_HANDLER ( stv_io_r32 ) int data1 = 0, data2 = 0; /* Critter Crusher */ - data1 = input_port_read_indexed(machine, 7); + data1 = input_port_read(machine, "LIGHTX"); data1 = BITSWAP8(data1, 2, 3, 0, 1, 6, 7, 5, 4) & 0xf3; - data1 |= (input_port_read_indexed(machine, 2) & 1) ? 0x0 : 0x4; - data2 = input_port_read_indexed(machine, 8); + data1 |= (input_port_read(machine, "P1") & 1) ? 0x0 : 0x4; + data2 = input_port_read(machine, "LIGHTY"); data2 = BITSWAP8(data2, 2, 3, 0, 1, 6, 7, 5, 4) & 0xf3; - data2 |= (input_port_read_indexed(machine, 2) & 1) ? 0x0 : 0x4; + data2 |= (input_port_read(machine, "P1") & 1) ? 0x0 : 0x4; return 0xff000000 | data1 << 16 | 0x0000ff00 | data2; } @@ -939,21 +939,21 @@ static READ32_HANDLER ( stv_io_r32 ) //default: default: //popmessage("%02x PORT SEL",port_sel); - return (input_port_read_indexed(machine, 2) << 16) | (input_port_read_indexed(machine, 3)); + return (input_port_read(machine, "P1") << 16) | (input_port_read(machine, "P2")); } case 1: if ( strcmp(machine->gamedrv->name,"critcrsh") == 0 ) { - return ((input_port_read_indexed(machine, 4) << 16) & ((input_port_read_indexed(machine, 2) & 1) ? 0xffef0000 : 0xffff0000)) | (ioga[1]); + return ((input_port_read(machine, "SYSTEM") << 16) & ((input_port_read(machine, "P1") & 1) ? 0xffef0000 : 0xffff0000)) | (ioga[1]); } else { - return (input_port_read_indexed(machine, 4) << 16) | (ioga[1]); + return (input_port_read(machine, "SYSTEM") << 16) | (ioga[1]); } case 2: switch(port_sel) { - case 0x77: return (input_port_read_indexed(machine, 5) << 16) | (input_port_read_indexed(machine, 6)); + case 0x77: return (input_port_read(machine, "UNUSED") << 16) | (input_port_read(machine, "EXTRA")); case 0x67: return 0xffffffff;/**/ case 0x20: return 0xffff0000 | (ioga[2] & 0xffff); case 0x10: return ((ioga[2] & 0xffff) << 16) | 0xffff; @@ -2067,7 +2067,7 @@ ADDRESS_MAP_END PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(_n_) static INPUT_PORTS_START( stv ) - PORT_START + PORT_START_TAG("DSW1") PORT_DIPNAME( 0x01, 0x01, "PDR1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2093,7 +2093,7 @@ static INPUT_PORTS_START( stv ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("DSW2") PORT_DIPNAME( 0x01, 0x01, "PDR2" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2119,20 +2119,20 @@ static INPUT_PORTS_START( stv ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("P1") STV_PLAYER_INPUTS(1, BUTTON1, BUTTON2, BUTTON3, BUTTON4) - PORT_START + PORT_START_TAG("P2") STV_PLAYER_INPUTS(2, BUTTON1, BUTTON2, BUTTON3, BUTTON4) /* - PORT_START + PORT_START_TAG("P3") STV_PLAYER_INPUTS(3, BUTTON1, BUTTON2, BUTTON3, BUTTON4) - PORT_START + PORT_START_TAG("P4") STV_PLAYER_INPUTS(4, BUTTON1, BUTTON2, BUTTON3, BUTTON4) */ - PORT_START + PORT_START_TAG("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW ) @@ -2142,12 +2142,12 @@ static INPUT_PORTS_START( stv ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("1P Push Switch") PORT_CODE(KEYCODE_7) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("2P Push Switch") PORT_CODE(KEYCODE_8) - /*This *might* be unused...*/ - PORT_START + /* This *might* be unused... */ + PORT_START_TAG("UNUSED") PORT_BIT ( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - /*Extra button layout,used by Power Instinct 3 & Suikoenbu*/ - PORT_START + /* Extra button layout,used by Power Instinct 3 & Suikoenbu */ + PORT_START_TAG("EXTRA") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) @@ -2157,9 +2157,9 @@ static INPUT_PORTS_START( stv ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - /*We don't need these,AFAIK the country code doesn't work either...*/ + /* We don't need these, AFAIK the country code doesn't work either... */ #if 0 - PORT_START //7 + PORT_START_TAG("FAKE") //7 PORT_DIPNAME( 0x0f, 0x01, "Country" ) PORT_DIPSETTING( 0x01, DEF_STR( Japan ) ) PORT_DIPSETTING( 0x02, "Asia Ntsc" ) @@ -2170,7 +2170,7 @@ static INPUT_PORTS_START( stv ) PORT_DIPSETTING( 0x0c, "Europe/Other Pal" ) PORT_DIPSETTING( 0x0d, "Sud America Pal" ) - PORT_START /* Pad data 1a */ + PORT_START_TAG("PAD1A") /* Pad data 1a */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("B") PORT_CODE(KEYCODE_U) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("C") PORT_CODE(KEYCODE_Y) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("A") PORT_CODE(KEYCODE_T) @@ -2180,7 +2180,7 @@ static INPUT_PORTS_START( stv ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Left") PORT_CODE(KEYCODE_J) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Right") PORT_CODE(KEYCODE_L) - PORT_START /* Pad data 1b */ + PORT_START_TAG("PAD1B") /* Pad data 1b */ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("L trig") PORT_CODE(KEYCODE_A) PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Z") PORT_CODE(KEYCODE_Q) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Y") PORT_CODE(KEYCODE_W) @@ -2190,113 +2190,24 @@ static INPUT_PORTS_START( stv ) INPUT_PORTS_END static INPUT_PORTS_START( critcrsh ) - PORT_INCLUDE( stv ) /* IN 7 */ - PORT_START /* mask default type sens delta min max */ + PORT_START_TAG("LIGHTX") /* mask default type sens delta min max */ PORT_BIT( 0x3f, 0x00, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX(0,0x3f) PORT_SENSITIVITY(50) PORT_KEYDELTA(1) PORT_PLAYER(1) /* IN 8 */ - PORT_START + PORT_START_TAG("LIGHTY") PORT_BIT( 0x3f, 0x00, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_MINMAX(0x0,0x3f) PORT_SENSITIVITY(50) PORT_KEYDELTA(1) PORT_PLAYER(1) INPUT_PORTS_END -/*Same as the regular one,but with an additional & optional mahjong panel*/ +/* Same as the regular one,but with an additional & optional mahjong panel */ static INPUT_PORTS_START( stvmp ) - PORT_START - PORT_DIPNAME( 0x01, 0x01, "PDR1" ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - - PORT_START - PORT_DIPNAME( 0x01, 0x01, "PDR2" ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - - PORT_START - STV_PLAYER_INPUTS(1, BUTTON1, BUTTON2, BUTTON3, BUTTON4) - - PORT_START - STV_PLAYER_INPUTS(2, BUTTON1, BUTTON2, BUTTON3, BUTTON4) -/* - PORT_START - STV_PLAYER_INPUTS(3, BUTTON1, BUTTON2, BUTTON3, BUTTON4) - - PORT_START - STV_PLAYER_INPUTS(4, BUTTON1, BUTTON2, BUTTON3, BUTTON4) -*/ - - PORT_START - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("1P Push Switch") PORT_CODE(KEYCODE_7) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("2P Push Switch") PORT_CODE(KEYCODE_8) - - /*This *might* be unused...*/ - PORT_START - PORT_BIT ( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - - /*Extra button layout,used by Power Instinct 3*/ - PORT_START - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(2) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_INCLUDE( stv ) - /*Mahjong panel/player 1 side*/ - PORT_START/*7*/ + /* Mahjong panel/player 1 side */ + PORT_START_TAG("KEY0") /*7*/ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -2306,7 +2217,7 @@ static INPUT_PORTS_START( stvmp ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_M ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_I ) - PORT_START/*8*/ + PORT_START_TAG("KEY1") /*8*/ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -2316,7 +2227,7 @@ static INPUT_PORTS_START( stvmp ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_N ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_J ) - PORT_START/*9*/ + PORT_START_TAG("KEY2") /*9*/ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -2326,7 +2237,7 @@ static INPUT_PORTS_START( stvmp ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_K ) - PORT_START/*10*/ + PORT_START_TAG("KEY3") /*10*/ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -2336,7 +2247,7 @@ static INPUT_PORTS_START( stvmp ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_L ) - PORT_START/*11*/ + PORT_START_TAG("KEY4") /*11*/ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -2346,8 +2257,8 @@ static INPUT_PORTS_START( stvmp ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - /*Mahjong panel/player 2 side*/ - PORT_START/*12*/ + /* Mahjong panel/player 2 side */ + PORT_START_TAG("KEY5") /*12*/ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -2357,7 +2268,7 @@ static INPUT_PORTS_START( stvmp ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_M ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_PLAYER(2) - PORT_START/*13*/ + PORT_START_TAG("KEY6") /*13*/ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -2367,7 +2278,7 @@ static INPUT_PORTS_START( stvmp ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_N ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_PLAYER(2) - PORT_START/*14*/ + PORT_START_TAG("KEY7") /*14*/ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -2377,7 +2288,7 @@ static INPUT_PORTS_START( stvmp ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_K ) PORT_PLAYER(2) - PORT_START/*15*/ + PORT_START_TAG("KEY8") /*15*/ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -2387,7 +2298,7 @@ static INPUT_PORTS_START( stvmp ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_PLAYER(2) - PORT_START/*16*/ + PORT_START_TAG("KEY9") /*16*/ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -2455,7 +2366,7 @@ DRIVER_INIT ( stv ) smpc_ram[0x2d] = DectoBCD(systime.local_time.minute); smpc_ram[0x2f] = DectoBCD(systime.local_time.second); smpc_ram[0x31] = 0x00; //CTG1=0 CTG0=0 (correct??) -// smpc_ram[0x33] = input_port_read_indexed(machine, 7); +// smpc_ram[0x33] = input_port_read(machine, "FAKE"); smpc_ram[0x5f] = 0x10; #ifdef MAME_DEBUG diff --git a/src/mame/drivers/subs.c b/src/mame/drivers/subs.c index bbcd6a6abdb..52c77b0950f 100644 --- a/src/mame/drivers/subs.c +++ b/src/mame/drivers/subs.c @@ -84,7 +84,7 @@ ADDRESS_MAP_END *************************************/ static INPUT_PORTS_START( subs ) - PORT_START /* OPTIONS */ + PORT_START_TAG("DSW") /* OPTIONS */ PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -109,14 +109,14 @@ static INPUT_PORTS_START( subs ) PORT_DIPSETTING( 0xc0, "3:30 Minutes" ) PORT_DIPSETTING( 0xe0, "4:00 Minutes" ) - PORT_START /* IN1 */ + PORT_START_TAG("IN0") /* IN1 */ PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Diag Step */ PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* Diag Hold */ PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_TILT ) /* Slam */ PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) /* Spare */ PORT_BIT ( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Filled in with steering information */ - PORT_START /* IN2 */ + PORT_START_TAG("IN1") /* IN2 */ PORT_BIT ( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT ( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 ) @@ -126,10 +126,10 @@ static INPUT_PORTS_START( subs ) PORT_SERVICE_NO_TOGGLE( 0x40, IP_ACTIVE_LOW ) PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_START /* IN3 */ + PORT_START_TAG("DIAL2") /* IN3 */ PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_PLAYER(2) - PORT_START /* IN4 */ + PORT_START_TAG("DIAL1") /* IN4 */ PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) INPUT_PORTS_END diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c index 759d04fa22f..2818e636244 100644 --- a/src/mame/drivers/suna8.c +++ b/src/mame/drivers/suna8.c @@ -490,10 +490,10 @@ static READ8_HANDLER( hardhead_ip_r ) { switch (*hardhead_ip) { - case 0: return input_port_read_indexed(machine, 0); - case 1: return input_port_read_indexed(machine, 1); - case 2: return input_port_read_indexed(machine, 2); - case 3: return input_port_read_indexed(machine, 3); + case 0: return input_port_read(machine, "P1"); + case 1: return input_port_read(machine, "P2"); + case 2: return input_port_read(machine, "DSW1"); + case 3: return input_port_read(machine, "DSW2"); default: logerror("CPU #0 - PC %04X: Unknown IP read: %02X\n",activecpu_get_pc(),*hardhead_ip); return 0xff; @@ -606,12 +606,12 @@ static ADDRESS_MAP_START( rranger_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1 ) // Banked ROM AM_RANGE(0xc000, 0xc000) AM_READ(watchdog_reset_r ) // Watchdog (Tested!) - AM_RANGE(0xc002, 0xc002) AM_READ(input_port_0_r ) // P1 (Inputs) - AM_RANGE(0xc003, 0xc003) AM_READ(input_port_1_r ) // P2 + AM_RANGE(0xc002, 0xc002) AM_READ_PORT("P1") // P1 (Inputs) + AM_RANGE(0xc003, 0xc003) AM_READ_PORT("P2") // P2 AM_RANGE(0xc004, 0xc004) AM_READ(rranger_soundstatus_r ) // Latch Status? AM_RANGE(0xc200, 0xc200) AM_READ(SMH_NOP ) // Protection? - AM_RANGE(0xc280, 0xc280) AM_READ(input_port_2_r ) // DSW 1 - AM_RANGE(0xc2c0, 0xc2c0) AM_READ(input_port_3_r ) // DSW 2 + AM_RANGE(0xc280, 0xc280) AM_READ_PORT("DSW1") // DSW 1 + AM_RANGE(0xc2c0, 0xc2c0) AM_READ_PORT("DSW2") // DSW 2 AM_RANGE(0xc600, 0xc7ff) AM_READ(SMH_RAM ) // Palette AM_RANGE(0xc800, 0xdfff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM ) // Sprites @@ -696,13 +696,13 @@ static WRITE8_HANDLER( brickzn_rombank_w ) static ADDRESS_MAP_START( brickzn_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1 ) // Banked ROM - AM_RANGE(0xc100, 0xc100) AM_READ(input_port_0_r ) // P1 (Buttons) - AM_RANGE(0xc101, 0xc101) AM_READ(input_port_1_r ) // P2 - AM_RANGE(0xc102, 0xc102) AM_READ(input_port_2_r ) // DSW 1 - AM_RANGE(0xc103, 0xc103) AM_READ(input_port_3_r ) // DSW 2 - AM_RANGE(0xc108, 0xc108) AM_READ(input_port_4_r ) // P1 (Analog) - AM_RANGE(0xc10c, 0xc10c) AM_READ(input_port_5_r ) // P2 - AM_RANGE(0xc140, 0xc140) AM_READ(brickzn_c140_r ) // ??? + AM_RANGE(0xc100, 0xc100) AM_READ_PORT("P1") // P1 (Buttons) + AM_RANGE(0xc101, 0xc101) AM_READ_PORT("P2") // P2 + AM_RANGE(0xc102, 0xc102) AM_READ_PORT("DSW1") // DSW 1 + AM_RANGE(0xc103, 0xc103) AM_READ_PORT("DSW2") // DSW 2 + AM_RANGE(0xc108, 0xc108) AM_READ_PORT("TRACK1") // P1 (Analog) + AM_RANGE(0xc10c, 0xc10c) AM_READ_PORT("TRACK2") // P2 + AM_RANGE(0xc140, 0xc140) AM_READ(brickzn_c140_r ) // ??? AM_RANGE(0xc600, 0xc7ff) AM_READ(suna8_banked_paletteram_r ) // Palette (Banked) AM_RANGE(0xc800, 0xdfff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0xe000, 0xffff) AM_READ(suna8_banked_spriteram_r ) // Sprites (Banked) @@ -805,16 +805,16 @@ static WRITE8_HANDLER( hardhea2_rambank_1_w ) static ADDRESS_MAP_START( hardhea2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) // ROM - AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1 ) // Banked ROM - AM_RANGE(0xc000, 0xc000) AM_READ(input_port_0_r ) // P1 (Inputs) - AM_RANGE(0xc001, 0xc001) AM_READ(input_port_1_r ) // P2 - AM_RANGE(0xc002, 0xc002) AM_READ(input_port_2_r ) // DSW 1 - AM_RANGE(0xc003, 0xc003) AM_READ(input_port_3_r ) // DSW 2 - AM_RANGE(0xc080, 0xc080) AM_READ(input_port_4_r ) // vblank? - AM_RANGE(0xc600, 0xc7ff) AM_READ(SMH_RAM ) // Palette (Banked??) - AM_RANGE(0xc800, 0xdfff) AM_READ(SMH_BANK2 ) // RAM (Banked?) - AM_RANGE(0xe000, 0xffff) AM_READ(suna8_banked_spriteram_r ) // Sprites (Banked) + AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) // ROM + AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1 ) // Banked ROM + AM_RANGE(0xc000, 0xc000) AM_READ_PORT("P1") // P1 (Inputs) + AM_RANGE(0xc001, 0xc001) AM_READ_PORT("P2") // P2 + AM_RANGE(0xc002, 0xc002) AM_READ_PORT("DSW1") // DSW 1 + AM_RANGE(0xc003, 0xc003) AM_READ_PORT("DSW2") // DSW 2 + AM_RANGE(0xc080, 0xc080) AM_READ_PORT("BUTTONS") // vblank? + AM_RANGE(0xc600, 0xc7ff) AM_READ(SMH_RAM ) // Palette (Banked??) + AM_RANGE(0xc800, 0xdfff) AM_READ(SMH_BANK2 ) // RAM (Banked?) + AM_RANGE(0xe000, 0xffff) AM_READ(suna8_banked_spriteram_r ) // Sprites (Banked) ADDRESS_MAP_END static ADDRESS_MAP_START( hardhea2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -872,10 +872,10 @@ static WRITE8_HANDLER( starfigh_spritebank_w ) static ADDRESS_MAP_START( starfigh_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1 ) // Banked ROM - AM_RANGE(0xc000, 0xc000) AM_READ(input_port_0_r ) // P1 (Inputs) - AM_RANGE(0xc001, 0xc001) AM_READ(input_port_1_r ) // P2 - AM_RANGE(0xc002, 0xc002) AM_READ(input_port_2_r ) // DSW 1 - AM_RANGE(0xc003, 0xc003) AM_READ(input_port_3_r ) // DSW 2 + AM_RANGE(0xc000, 0xc000) AM_READ_PORT("P1") // P1 (Inputs) + AM_RANGE(0xc001, 0xc001) AM_READ_PORT("P2") // P2 + AM_RANGE(0xc002, 0xc002) AM_READ_PORT("DSW1") // DSW 1 + AM_RANGE(0xc003, 0xc003) AM_READ_PORT("DSW2") // DSW 2 AM_RANGE(0xc600, 0xc7ff) AM_READ(suna8_banked_paletteram_r ) // Palette (Banked??) AM_RANGE(0xc800, 0xdfff) AM_READ(SMH_RAM ) // RAM AM_RANGE(0xe000, 0xffff) AM_READ(suna8_banked_spriteram_r ) // Sprites (Banked) @@ -966,11 +966,11 @@ static READ8_HANDLER( sparkman_c0a3_r ) static ADDRESS_MAP_START( sparkman_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM ) // ROM AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1 ) // Banked ROM - AM_RANGE(0xc000, 0xc000) AM_READ(input_port_0_r ) // P1 (Inputs) - AM_RANGE(0xc001, 0xc001) AM_READ(input_port_1_r ) // P2 - AM_RANGE(0xc002, 0xc002) AM_READ(input_port_2_r ) // DSW 1 - AM_RANGE(0xc003, 0xc003) AM_READ(input_port_3_r ) // DSW 2 - AM_RANGE(0xc080, 0xc080) AM_READ(input_port_4_r ) // Buttons + AM_RANGE(0xc000, 0xc000) AM_READ_PORT("P1") // P1 (Inputs) + AM_RANGE(0xc001, 0xc001) AM_READ_PORT("P2") // P2 + AM_RANGE(0xc002, 0xc002) AM_READ_PORT("DSW1") // DSW 1 + AM_RANGE(0xc003, 0xc003) AM_READ_PORT("DSW2") // DSW 2 + AM_RANGE(0xc080, 0xc080) AM_READ_PORT("BUTTONS") // Buttons AM_RANGE(0xc0a3, 0xc0a3) AM_READ(sparkman_c0a3_r ) // ??? AM_RANGE(0xc600, 0xc7ff) AM_READ(SMH_RAM ) // Palette (Banked??) AM_RANGE(0xc800, 0xdfff) AM_READ(SMH_RAM ) // RAM @@ -1140,13 +1140,13 @@ ADDRESS_MAP_END static INPUT_PORTS_START( hardhead ) - PORT_START_TAG("IN0") // Player 1 - $da00 (ip = 0) + PORT_START_TAG("P1") // Player 1 - $da00 (ip = 0) JOY(1) - PORT_START_TAG("IN1") // Player 2 - $da00 (ip = 1) + PORT_START_TAG("P2") // Player 2 - $da00 (ip = 1) JOY(2) - PORT_START_TAG("IN2") // DSW 1 - $da00 (ip = 2) + PORT_START_TAG("DSW1") // DSW 1 - $da00 (ip = 2) PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1172,7 +1172,7 @@ static INPUT_PORTS_START( hardhead ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START_TAG("IN3") //DSW 2 - $da00 (ip = 3) + PORT_START_TAG("DSW2") //DSW 2 - $da00 (ip = 3) PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1204,13 +1204,13 @@ INPUT_PORTS_END static INPUT_PORTS_START( rranger ) - PORT_START_TAG("IN0") // Player 1 - $c002 + PORT_START_TAG("P1") // Player 1 - $c002 JOY(1) - PORT_START_TAG("IN1") // Player 2 - $c003 + PORT_START_TAG("P2") // Player 2 - $c003 JOY(2) - PORT_START_TAG("IN2") //DSW 1 - $c280 + PORT_START_TAG("DSW1") //DSW 1 - $c280 PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) ) @@ -1235,7 +1235,7 @@ static INPUT_PORTS_START( rranger ) PORT_DIPSETTING( 0x40, DEF_STR( Harder ) ) PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) - PORT_START_TAG("IN3") // DSW 2 - $c2c0 + PORT_START_TAG("DSW2") // DSW 2 - $c2c0 PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1269,13 +1269,13 @@ INPUT_PORTS_END static INPUT_PORTS_START( brickzn ) - PORT_START_TAG("IN0") // Player 1 - $c100 + PORT_START_TAG("P1") // Player 1 - $c100 JOY(1) - PORT_START_TAG("IN1") // Player 2 - $c101 + PORT_START_TAG("P2") // Player 2 - $c101 JOY(2) - PORT_START_TAG("IN2") // DSW 1 - $c102 + PORT_START_TAG("DSW1") // DSW 1 - $c102 PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) // rom 38:b840 PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) ) @@ -1302,7 +1302,7 @@ static INPUT_PORTS_START( brickzn ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START_TAG("IN3") // DSW 2 - $c103 + PORT_START_TAG("DSW2") // DSW 2 - $c103 PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1327,10 +1327,10 @@ static INPUT_PORTS_START( brickzn ) PORT_DIPSETTING( 0x40, "4" ) PORT_DIPSETTING( 0x00, "5" ) - PORT_START_TAG("IN4") // Player 1 - $c108 + PORT_START_TAG("TRACK1") // Player 1 - $c108 PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(0) PORT_REVERSE - PORT_START_TAG("IN5") // Player 2 - $c10c + PORT_START_TAG("TRACK2") // Player 2 - $c10c PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(0) PORT_REVERSE INPUT_PORTS_END @@ -1342,13 +1342,13 @@ INPUT_PORTS_END static INPUT_PORTS_START( hardhea2 ) - PORT_START_TAG("IN0") // Player 1 - $c000 + PORT_START_TAG("P1") // Player 1 - $c000 JOY(1) - PORT_START_TAG("IN1") // Player 2 - $c001 + PORT_START_TAG("P2") // Player 2 - $c001 JOY(2) - PORT_START_TAG("IN2") // DSW 1 - $c002 + PORT_START_TAG("DSW1") // DSW 1 - $c002 PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) ) @@ -1372,7 +1372,7 @@ static INPUT_PORTS_START( hardhea2 ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START_TAG("IN3") // DSW 2 - $c003 + PORT_START_TAG("DSW2") // DSW 2 - $c003 PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1397,7 +1397,7 @@ static INPUT_PORTS_START( hardhea2 ) PORT_DIPSETTING( 0x40, "4" ) PORT_DIPSETTING( 0x00, "5" ) - PORT_START_TAG("IN4") // Buttons - $c080 + PORT_START_TAG("BUTTONS") // Buttons - $c080 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1416,13 +1416,13 @@ INPUT_PORTS_END static INPUT_PORTS_START( sparkman ) - PORT_START_TAG("IN0") // Player 1 - $c000 + PORT_START_TAG("P1") // Player 1 - $c000 JOY(1) - PORT_START_TAG("IN1") // Player 2 - $c001 + PORT_START_TAG("P2") // Player 2 - $c001 JOY(2) - PORT_START_TAG("IN2") // DSW 1 - $c002 + PORT_START_TAG("DSW1") // DSW 1 - $c002 PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) ) @@ -1446,7 +1446,7 @@ static INPUT_PORTS_START( sparkman ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START_TAG("IN3") // DSW 2 - $c003 + PORT_START_TAG("DSW2") // DSW 2 - $c003 PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1471,7 +1471,7 @@ static INPUT_PORTS_START( sparkman ) PORT_DIPSETTING( 0x40, "4" ) PORT_DIPSETTING( 0x00, "5" ) - PORT_START_TAG("IN4") // Buttons - $c080 + PORT_START_TAG("BUTTONS") // Buttons - $c080 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c index fb5e8671cb4..671a9c1f5cd 100644 --- a/src/mame/drivers/supbtime.c +++ b/src/mame/drivers/supbtime.c @@ -36,11 +36,11 @@ static READ16_HANDLER( supbtime_controls_r ) switch (offset<<1) { case 0: /* Player 1 & Player 2 joysticks & fire buttons */ - return (input_port_read_indexed(machine, 0) + (input_port_read_indexed(machine, 1) << 8)); + return (input_port_read(machine, "P1") + (input_port_read(machine, "P2") << 8)); case 2: /* Dips */ - return (input_port_read_indexed(machine, 3) + (input_port_read_indexed(machine, 4) << 8)); + return (input_port_read(machine, "DSW1") + (input_port_read(machine, "DSW2") << 8)); case 8: /* Credits */ - return input_port_read_indexed(machine, 2); + return input_port_read(machine, "COIN"); case 10: /* ? Not used for anything */ case 12: return 0; @@ -153,7 +153,7 @@ ADDRESS_MAP_END /******************************************************************************/ static INPUT_PORTS_START( supbtime ) - PORT_START /* Player 1 controls */ + PORT_START_TAG("P1") /* Player 1 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY @@ -163,7 +163,7 @@ static INPUT_PORTS_START( supbtime ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START /* Player 2 controls */ + PORT_START_TAG("P2") /* Player 2 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -173,7 +173,7 @@ static INPUT_PORTS_START( supbtime ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START /* Credits */ + PORT_START_TAG("COIN") /* Credits */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) @@ -183,7 +183,7 @@ static INPUT_PORTS_START( supbtime ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* Dip switch bank 1 - inverted with respect to other Deco games */ + PORT_START_TAG("DSW1") /* Dip switch bank 1 - inverted with respect to other Deco games */ PORT_DIPNAME( 0xe0, 0xe0, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ) ) @@ -209,7 +209,7 @@ static INPUT_PORTS_START( supbtime ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* Dip switch bank 2 */ + PORT_START_TAG("DSW2") /* Dip switch bank 2 */ PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) ) PORT_DIPSETTING( 0x80, "1" ) PORT_DIPSETTING( 0x00, "2" ) @@ -235,7 +235,7 @@ static INPUT_PORTS_START( supbtime ) INPUT_PORTS_END static INPUT_PORTS_START( chinatwn ) - PORT_START /* Player 1 controls */ + PORT_START_TAG("P1") /* Player 1 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY @@ -245,7 +245,7 @@ static INPUT_PORTS_START( chinatwn ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* button 3 - unused */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START /* Player 2 controls */ + PORT_START_TAG("P2") /* Player 2 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -255,7 +255,7 @@ static INPUT_PORTS_START( chinatwn ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START /* Credits */ + PORT_START_TAG("COIN") /* Credits */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) @@ -265,7 +265,7 @@ static INPUT_PORTS_START( chinatwn ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* Dip switch bank 1 - inverted with respect to other Deco games */ + PORT_START_TAG("DSW1") /* Dip switch bank 1 - inverted with respect to other Deco games */ PORT_DIPNAME( 0xe0, 0xe0, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ) ) @@ -291,7 +291,7 @@ static INPUT_PORTS_START( chinatwn ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* Dip switch bank 2 */ + PORT_START_TAG("DSW2") /* Dip switch bank 2 */ PORT_DIPNAME( 0xc0, 0xc0, "Time" ) PORT_DIPSETTING( 0x00, "1500" ) PORT_DIPSETTING( 0x80, "2000" ) diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c index 0198a6dded3..20271ed6488 100644 --- a/src/mame/drivers/superchs.c +++ b/src/mame/drivers/superchs.c @@ -115,7 +115,7 @@ static READ32_HANDLER( superchs_input_r ) switch (offset) { case 0x00: - return (input_port_read_indexed(machine,0) << 16) | input_port_read_indexed(machine,1) | + return (input_port_read(machine, "SYSTEM") << 16) | input_port_read(machine, "INPUT") | (eeprom_read_bit() << 7); case 0x01: @@ -176,12 +176,12 @@ static WRITE32_HANDLER( superchs_input_w ) static READ32_HANDLER( superchs_stick_r ) { - int fake = input_port_read_indexed(machine,6); + int fake = input_port_read(machine, "FAKE"); int accel; if (!(fake &0x10)) /* Analogue steer (the real control method) */ { - steer = input_port_read_indexed(machine,2); + steer = input_port_read(machine, "WHEEL"); } else /* Digital steer, with smoothing - speed depends on how often stick_r is called */ { @@ -206,13 +206,13 @@ static READ32_HANDLER( superchs_stick_r ) } /* Accelerator is an analogue input but the game treats it as digital (on/off) */ - if (input_port_read_indexed(machine,6) & 0x1) /* pressing B1 */ + if (input_port_read(machine, "FAKE") & 0x1) /* pressing B1 */ accel = 0x0; else accel = 0xff; /* Todo: Verify brake - and figure out other input */ - return (steer << 24) | (accel << 16) | (input_port_read_indexed(machine,4) << 8) | input_port_read_indexed(machine,5); + return (steer << 24) | (accel << 16) | (input_port_read(machine, "SOUND") << 8) | input_port_read(machine, "UNKNOWN"); } static WRITE32_HANDLER( superchs_stick_w ) @@ -273,7 +273,7 @@ ADDRESS_MAP_END /***********************************************************/ static INPUT_PORTS_START( superchs ) - PORT_START /* IN0 */ + PORT_START_TAG("SYSTEM") /* IN0 */ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -291,7 +291,7 @@ static INPUT_PORTS_START( superchs ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* IN1 */ + PORT_START_TAG("INPUT") /* IN1 */ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -304,24 +304,24 @@ static INPUT_PORTS_START( superchs ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT(0x1000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Nitro") - PORT_BIT(0x2000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Gear Shift") - PORT_BIT(0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Brake") + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Nitro") + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Gear Shift") + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Brake") PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START /* IN 2, steering wheel */ + PORT_START_TAG("WHEEL") /* IN 2, steering wheel */ PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_REVERSE PORT_PLAYER(1) - PORT_START /* IN 3, accel [effectively also brake for the upright] */ + PORT_START_TAG("ACCEL") /* IN 3, accel [effectively also brake for the upright] */ PORT_BIT( 0xff, 0x00, IPT_AD_STICK_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_PLAYER(1) - PORT_START /* IN 4, sound volume */ + PORT_START_TAG("SOUND") /* IN 4, sound volume */ PORT_BIT( 0xff, 0x00, IPT_AD_STICK_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2) - PORT_START /* IN 5, unknown */ + PORT_START_TAG("UNKNOWN") /* IN 5, unknown */ PORT_BIT( 0xff, 0x00, IPT_AD_STICK_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_PLAYER(2) - PORT_START /* IN 6, inputs and DSW all fake */ + PORT_START_TAG("FAKE") /* IN 6, inputs and DSW all fake */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1) diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c index d60e952f5ff..237ad057a57 100644 --- a/src/mame/drivers/superqix.c +++ b/src/mame/drivers/superqix.c @@ -195,7 +195,7 @@ static int from_mcu_pending, from_z80_pending, invert_coin_lockout; static READ8_HANDLER( in4_mcu_r ) { // logerror("%04x: in4_mcu_r\n",activecpu_get_pc()); - return input_port_read_indexed(machine, 4) | (from_mcu_pending << 6) | (from_z80_pending << 7); + return input_port_read(machine, "P2") | (from_mcu_pending << 6) | (from_z80_pending << 7); } static READ8_HANDLER( sqix_from_mcu_r ) @@ -268,11 +268,11 @@ static READ8_HANDLER( mcu_p3_r ) { if ((port1 & 0x10) == 0) { - return input_port_read_indexed(machine, 0); + return input_port_read(machine, "DSW1"); } else if ((port1 & 0x20) == 0) { - return input_port_read_indexed(machine, 2) | (from_mcu_pending << 6) | (from_z80_pending << 7); + return input_port_read(machine, "SYSTEM") | (from_mcu_pending << 6) | (from_z80_pending << 7); } else if ((port1 & 0x40) == 0) { @@ -297,7 +297,7 @@ static READ8_HANDLER( nmi_ack_r ) static READ8_HANDLER( bootleg_in0_r ) { - return BITSWAP8(input_port_read_indexed(machine, 0), 0,1,2,3,4,5,6,7); + return BITSWAP8(input_port_read(machine, "DSW1"), 0,1,2,3,4,5,6,7); } static WRITE8_HANDLER( bootleg_flipscreen_w ) @@ -325,7 +325,7 @@ static int read_dial(running_machine *machine, int player) static int sign[2]; /* get the new position and adjust the result */ - newpos = input_port_read_indexed(machine, 3 + player); + newpos = input_port_read(machine, player ? "DIAL2" : "DIAL1"); if (newpos != oldpos[player]) { sign[player] = ((newpos - oldpos[player]) & 0x80) >> 7; @@ -401,11 +401,11 @@ static WRITE8_HANDLER( hotsmash_68705_portC_w ) switch (data & 0x07) { case 0x0: // dsw A - portA_in = input_port_read_indexed(machine, 0); + portA_in = input_port_read(machine, "DSW1"); break; case 0x1: // dsw B - portA_in = input_port_read_indexed(machine, 1); + portA_in = input_port_read(machine, "DSW2"); break; case 0x2: @@ -449,7 +449,7 @@ logerror("%04x: z80 reads answer %02x\n",activecpu_get_pc(),from_mcu); static READ8_HANDLER(hotsmash_ay_port_a_r) { //logerror("%04x: ay_port_a_r and mcu_pending is %d\n",activecpu_get_pc(),from_mcu_pending); - return input_port_read_indexed(machine, 2) | ((from_mcu_pending^1) << 7); + return input_port_read(machine, "SYSTEM") | ((from_mcu_pending^1) << 7); } /************************************************************************** @@ -469,10 +469,10 @@ static READ8_HANDLER(pbillian_from_mcu_r) switch (from_z80) { - case 0x01: return input_port_read_indexed(machine, 4 + 2 * curr_player); - case 0x02: return input_port_read_indexed(machine, 5 + 2 * curr_player); - case 0x04: return input_port_read_indexed(machine, 0); - case 0x08: return input_port_read_indexed(machine, 1); + case 0x01: return input_port_read(machine, curr_player ? "PADDLE2" : "PADDLE1"); + case 0x02: return input_port_read(machine, curr_player ? "DIAL2" : "DIAL1"); + case 0x04: return input_port_read(machine, "DSW1"); + case 0x08: return input_port_read(machine, "DSW2"); case 0x80: curr_player = 0; return 0; case 0x81: curr_player = 1; return 0; } @@ -485,7 +485,7 @@ static READ8_HANDLER(pbillian_ay_port_a_r) { // logerror("%04x: ay_port_a_r\n",activecpu_get_pc()); /* bits 76------ MCU status bits */ - return (mame_rand(machine)&0xc0)|input_port_read_indexed(machine, 3); + return (mame_rand(machine) & 0xc0) | input_port_read(machine, "BUTTONS"); } @@ -586,7 +586,7 @@ static ADDRESS_MAP_START( bootleg_port_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x0407, 0x0407) AM_WRITE(AY8910_control_port_1_w) AM_RANGE(0x0408, 0x0408) AM_WRITE(bootleg_flipscreen_w) AM_RANGE(0x0410, 0x0410) AM_WRITE(superqix_0410_w) /* ROM bank, NMI enable, tile bank */ - AM_RANGE(0x0418, 0x0418) AM_READ(input_port_2_r) + AM_RANGE(0x0418, 0x0418) AM_READ_PORT("SYSTEM") AM_RANGE(0x0800, 0x77ff) AM_RAM_WRITE(superqix_bitmapram_w) AM_BASE(&superqix_bitmapram) AM_RANGE(0x8800, 0xf7ff) AM_RAM_WRITE(superqix_bitmapram2_w) AM_BASE(&superqix_bitmapram2) ADDRESS_MAP_END @@ -615,56 +615,56 @@ ADDRESS_MAP_END static INPUT_PORTS_START( pbillian ) - PORT_START + PORT_START_TAG("DSW1") PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) - PORT_DIPSETTING( 0x03, DEF_STR( 5C_1C ) ) - PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) ) - PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) ) - PORT_DIPSETTING( 0x06, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) - PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x01, DEF_STR( 1C_3C ) ) + PORT_DIPSETTING( 0x03, DEF_STR( 5C_1C ) ) + PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) ) + PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x06, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) + PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x01, DEF_STR( 1C_3C ) ) PORT_DIPNAME( 0x38, 0x38, DEF_STR( Coin_B ) ) - PORT_DIPSETTING( 0x18, DEF_STR( 5C_1C ) ) - PORT_DIPSETTING( 0x20, DEF_STR( 4C_1C ) ) - PORT_DIPSETTING( 0x28, DEF_STR( 3C_1C ) ) - PORT_DIPSETTING( 0x30, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x38, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) - PORT_DIPSETTING( 0x10, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x08, DEF_STR( 1C_3C ) ) + PORT_DIPSETTING( 0x18, DEF_STR( 5C_1C ) ) + PORT_DIPSETTING( 0x20, DEF_STR( 4C_1C ) ) + PORT_DIPSETTING( 0x28, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x30, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x38, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) + PORT_DIPSETTING( 0x10, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x08, DEF_STR( 1C_3C ) ) PORT_DIPNAME( 0x40, 0x00, DEF_STR( Allow_Continue ) ) - PORT_DIPSETTING( 0x40, DEF_STR( No ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) + PORT_DIPSETTING( 0x40, DEF_STR( No ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) PORT_DIPNAME( 0x80, 0x80, "Freeze" ) - PORT_DIPSETTING( 0x80, DEF_STR( No ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) + PORT_DIPSETTING( 0x80, DEF_STR( No ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) - PORT_START + PORT_START_TAG("DSW2") PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) - PORT_DIPSETTING( 0x03, "2" ) - PORT_DIPSETTING( 0x02, "3" ) - PORT_DIPSETTING( 0x01, "4" ) - PORT_DIPSETTING( 0x00, "5" ) + PORT_DIPSETTING( 0x03, "2" ) + PORT_DIPSETTING( 0x02, "3" ) + PORT_DIPSETTING( 0x01, "4" ) + PORT_DIPSETTING( 0x00, "5" ) PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) - PORT_DIPSETTING( 0x0c, "10/20/300K Points" ) - PORT_DIPSETTING( 0x00, "10/30/500K Points" ) - PORT_DIPSETTING( 0x08, "20/30/400K Points" ) - PORT_DIPSETTING( 0x04, "30/40/500K Points" ) + PORT_DIPSETTING( 0x0c, "10/20/300K Points" ) + PORT_DIPSETTING( 0x00, "10/30/500K Points" ) + PORT_DIPSETTING( 0x08, "20/30/400K Points" ) + PORT_DIPSETTING( 0x04, "30/40/500K Points" ) PORT_DIPNAME( 0x30, 0x10, DEF_STR( Difficulty ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x10, DEF_STR( Normal ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Hard ) ) - PORT_DIPSETTING( 0x30, DEF_STR( Very_Hard ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Easy ) ) + PORT_DIPSETTING( 0x10, DEF_STR( Normal ) ) + PORT_DIPSETTING( 0x20, DEF_STR( Hard ) ) + PORT_DIPSETTING( 0x30, DEF_STR( Very_Hard ) ) PORT_DIPNAME( 0x40, 0x00, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) + PORT_DIPSETTING( 0x40, DEF_STR( Cocktail ) ) PORT_DIPNAME( 0x80, 0x80, DEF_STR( Flip_Screen ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) @@ -674,7 +674,7 @@ static INPUT_PORTS_START( pbillian ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) - PORT_START + PORT_START_TAG("BUTTONS") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) // high score initials PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) // fire (M powerup) + high score initials PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL // high score initials @@ -684,71 +684,71 @@ static INPUT_PORTS_START( pbillian ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) // mcu status (pending mcu->z80) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) // mcu status (pending z80->mcu) - PORT_START + PORT_START_TAG("PADDLE1") PORT_BIT( 0x3f, 0x00, IPT_PADDLE_V ) PORT_MINMAX(0,0x3f) PORT_SENSITIVITY(30) PORT_KEYDELTA(3) PORT_CENTERDELTA(0) PORT_REVERSE PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) - PORT_START + PORT_START_TAG("DIAL1") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) - PORT_START + PORT_START_TAG("PADDLE2") PORT_BIT( 0x3f, 0x00, IPT_PADDLE_V ) PORT_MINMAX(0,0x3f) PORT_SENSITIVITY(30) PORT_KEYDELTA(3) PORT_CENTERDELTA(0) PORT_REVERSE PORT_COCKTAIL PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL - PORT_START + PORT_START_TAG("DIAL2") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_COCKTAIL INPUT_PORTS_END static INPUT_PORTS_START( hotsmash ) - PORT_START + PORT_START_TAG("DSW1") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x08, DEF_STR( On ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x08, DEF_STR( On ) ) PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) ) - PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) - PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) + PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) ) PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_B ) ) - PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) - PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) + PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) ) - PORT_START + PORT_START_TAG("DSW2") PORT_DIPNAME( 0x03, 0x03, "Difficulty vs. CPU" ) - PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x03, DEF_STR( Normal ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Hard ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) + PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) + PORT_DIPSETTING( 0x03, DEF_STR( Normal ) ) + PORT_DIPSETTING( 0x01, DEF_STR( Hard ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) PORT_DIPNAME( 0x0c, 0x0c, "Difficulty vs. 2P" ) - PORT_DIPSETTING( 0x08, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x0c, DEF_STR( Normal ) ) - PORT_DIPSETTING( 0x04, DEF_STR( Hard ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) + PORT_DIPSETTING( 0x08, DEF_STR( Easy ) ) + PORT_DIPSETTING( 0x0c, DEF_STR( Normal ) ) + PORT_DIPSETTING( 0x04, DEF_STR( Hard ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) PORT_DIPNAME( 0x10, 0x10, "Points per game" ) - PORT_DIPSETTING( 0x00, "3" ) - PORT_DIPSETTING( 0x10, "4" ) + PORT_DIPSETTING( 0x00, "3" ) + PORT_DIPSETTING( 0x10, "4" ) PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) @@ -758,63 +758,63 @@ static INPUT_PORTS_START( hotsmash ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) // mcu status (0 = pending mcu->z80) - PORT_START + PORT_START_TAG("DIAL1") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(15) PORT_KEYDELTA(30) PORT_CENTERDELTA(0) PORT_PLAYER(1) - PORT_START + PORT_START_TAG("DIAL2") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(15) PORT_KEYDELTA(30) PORT_CENTERDELTA(0) PORT_PLAYER(2) INPUT_PORTS_END static INPUT_PORTS_START( superqix ) - PORT_START /* DSW1 */ + PORT_START_TAG("DSW1") /* DSW1 */ PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) + PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) ) PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x04, 0x04, "Freeze" ) - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x08, 0x00, DEF_STR( Allow_Continue ) ) - PORT_DIPSETTING( 0x08, DEF_STR( No ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) + PORT_DIPSETTING( 0x08, DEF_STR( No ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) ) - PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C )) - PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C )) + PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) ) PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_B ) ) - PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C )) - PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C )) + PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) ) - PORT_START /* DSW2 */ + PORT_START_TAG("DSW2") /* DSW2 */ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x03, DEF_STR( Normal ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Hard ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) + PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) + PORT_DIPSETTING( 0x03, DEF_STR( Normal ) ) + PORT_DIPSETTING( 0x01, DEF_STR( Hard ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) - PORT_DIPSETTING( 0x08, "20000 50000" ) - PORT_DIPSETTING( 0x0c, "30000 100000" ) - PORT_DIPSETTING( 0x04, "50000 100000" ) - PORT_DIPSETTING( 0x00, DEF_STR( None ) ) + PORT_DIPSETTING( 0x08, "20000 50000" ) + PORT_DIPSETTING( 0x0c, "30000 100000" ) + PORT_DIPSETTING( 0x04, "50000 100000" ) + PORT_DIPSETTING( 0x00, DEF_STR( None ) ) PORT_DIPNAME( 0x30, 0x30, DEF_STR( Lives ) ) - PORT_DIPSETTING( 0x20, "2" ) - PORT_DIPSETTING( 0x30, "3" ) - PORT_DIPSETTING( 0x10, "4" ) - PORT_DIPSETTING( 0x00, "5" ) + PORT_DIPSETTING( 0x20, "2" ) + PORT_DIPSETTING( 0x30, "3" ) + PORT_DIPSETTING( 0x10, "4" ) + PORT_DIPSETTING( 0x00, "5" ) PORT_DIPNAME( 0xc0, 0xc0, "Fill Area" ) - PORT_DIPSETTING( 0x80, "70%" ) - PORT_DIPSETTING( 0xc0, "75%" ) - PORT_DIPSETTING( 0x40, "80%" ) - PORT_DIPSETTING( 0x00, "85%" ) + PORT_DIPSETTING( 0x80, "70%" ) + PORT_DIPSETTING( 0xc0, "75%" ) + PORT_DIPSETTING( 0x40, "80%" ) + PORT_DIPSETTING( 0x00, "85%" ) - PORT_START + PORT_START_TAG("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 ) @@ -824,7 +824,7 @@ static INPUT_PORTS_START( superqix ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) // Z80 status (pending z80->mcu) - PORT_START + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY @@ -834,7 +834,7 @@ static INPUT_PORTS_START( superqix ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_VBLANK ) /* ??? */ PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) - PORT_START + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL diff --git a/src/mame/drivers/suprnova.c b/src/mame/drivers/suprnova.c index 224f488abd1..2808eb16426 100644 --- a/src/mame/drivers/suprnova.c +++ b/src/mame/drivers/suprnova.c @@ -703,17 +703,17 @@ INPUT_PORTS_END static READ32_HANDLER( nova_input_port_0_r ) { - return input_port_read_indexed(machine, 0)<<24 | input_port_read_indexed(machine, 1)<<16 | input_port_read_indexed(machine, 2)<<8 | input_port_read_indexed(machine, 3); + return input_port_read(machine, "IN0")<<24 | input_port_read(machine, "IN1")<<16 | input_port_read(machine, "IN2")<<8 | input_port_read(machine, "IN3"); } static READ32_HANDLER( nova_input_port_3_r ) { - return input_port_read_indexed(machine, 8) | 0xffffff00; + return input_port_read(machine, "Paddle D") | 0xffffff00; } static READ32_HANDLER( nova_input_port_dip_r ) { - return input_port_read_indexed(machine, 4)<<24 | input_port_read_indexed(machine, 5)<<16 | input_port_read_indexed(machine, 6)<<8 | input_port_read_indexed(machine, 7); + return input_port_read(machine, "Paddle A")<<24 | input_port_read(machine, "Paddle B")<<16 | input_port_read(machine, "Paddle C")<<8 | input_port_read(machine, "DSW"); } static UINT32 timer_0_temp[4]; diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c index fd802157933..4d75d2ba3b3 100644 --- a/src/mame/drivers/system16.c +++ b/src/mame/drivers/system16.c @@ -226,7 +226,6 @@ static INTERRUPT_GEN( sys16_interrupt ) } - /***************************************************************************/ /* Tough Turf (Datsu bootleg) sound emulation @@ -423,7 +422,6 @@ static WRITE16_HANDLER( sound_command_nmi_w ) //static UINT16 coinctrl; - static WRITE16_HANDLER( sys16_coinctrl_w ) { if( ACCESSING_BITS_0_7 ) @@ -492,8 +490,6 @@ static MACHINE_DRIVER_START( system16_7759 ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.48) MACHINE_DRIVER_END - - /***************************************************************************/ static WRITE16_HANDLER( sys16_tilebank_w ) @@ -542,43 +538,81 @@ static void set_bg_page( int data ) sys16_bg_page[3] = data&0xf; } - - - - -/***************************************************************************/ -/***************************************************************************/ -/***************************************************************************/ - - - - -/***************************************************************************/ - - /***************************************************************************/ +static INPUT_PORTS_START( sys16_common ) + PORT_START_TAG("P1") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY -/***************************************************************************/ - -/***************************************************************************/ - - -/***************************************************************************/ - - -/***************************************************************************/ - + PORT_START_TAG("P2") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL + PORT_START_TAG("SERVICE") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) + PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START1 ) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START_TAG("DSW1") + PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4") + PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) ) + PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x09, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x05, "2 Coins/1 Credit 5/3 6/4" ) + PORT_DIPSETTING( 0x04, "2 Coins/1 Credit 4/3" ) + PORT_DIPSETTING( 0x0f, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x01, "1 Coin/1 Credit 2/3" ) + PORT_DIPSETTING( 0x02, "1 Coin/1 Credit 4/5" ) + PORT_DIPSETTING( 0x03, "1 Coin/1 Credit 5/6" ) + PORT_DIPSETTING( 0x06, DEF_STR( 2C_3C ) ) + PORT_DIPSETTING( 0x0e, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x0d, DEF_STR( 1C_3C ) ) + PORT_DIPSETTING( 0x0c, DEF_STR( 1C_4C ) ) + PORT_DIPSETTING( 0x0b, DEF_STR( 1C_5C ) ) + PORT_DIPSETTING( 0x0a, DEF_STR( 1C_6C ) ) + PORT_DIPSETTING( 0x00, "Free Play (if Coin B too) or 1/1" ) + PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:5,6,7,8") + PORT_DIPSETTING( 0x70, DEF_STR( 4C_1C ) ) + PORT_DIPSETTING( 0x80, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x90, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x50, "2 Coins/1 Credit 5/3 6/4" ) + PORT_DIPSETTING( 0x40, "2 Coins/1 Credit 4/3" ) + PORT_DIPSETTING( 0xf0, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x10, "1 Coin/1 Credit 2/3" ) + PORT_DIPSETTING( 0x20, "1 Coin/1 Credit 4/5" ) + PORT_DIPSETTING( 0x30, "1 Coin/1 Credit 5/6" ) + PORT_DIPSETTING( 0x60, DEF_STR( 2C_3C ) ) + PORT_DIPSETTING( 0xe0, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0xd0, DEF_STR( 1C_3C ) ) + PORT_DIPSETTING( 0xc0, DEF_STR( 1C_4C ) ) + PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ) ) + PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) ) + PORT_DIPSETTING( 0x00, "Free Play (if Coin A too) or 1/1" ) +INPUT_PORTS_END /***************************************************************************/ #ifdef UNUSED_DEFINITION static INPUT_PORTS_START( aliensyn ) - SYS16_JOY1 - SYS16_JOY2 - SYS16_SERVICE - SYS16_COINAGE + PORT_INCLUDE( sys16_common ) PORT_START_TAG("DSW2") PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW2:1" ) /* Listed as "Unused" */ @@ -604,10 +638,6 @@ INPUT_PORTS_END #endif /****************************************************************************/ - -/***************************************************************************/ - - static ADDRESS_MAP_START( bayroute_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0bffff) AM_READ(SMH_ROM) AM_RANGE(0x500000, 0x503fff) AM_READ(SYS16_MRA16_WORKINGRAM) @@ -615,11 +645,11 @@ static ADDRESS_MAP_START( bayroute_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x700000, 0x70ffff) AM_READ(SYS16_MRA16_TILERAM) AM_RANGE(0x710000, 0x710fff) AM_READ(SYS16_MRA16_TEXTRAM) AM_RANGE(0x800000, 0x800fff) AM_READ(SYS16_MRA16_PALETTERAM) - AM_RANGE(0x901002, 0x901003) AM_READ(input_port_0_word_r) // player1 - AM_RANGE(0x901006, 0x901007) AM_READ(input_port_1_word_r) // player2 - AM_RANGE(0x901000, 0x901001) AM_READ(input_port_2_word_r) // service - AM_RANGE(0x902002, 0x902003) AM_READ(input_port_3_word_r) // dip1 - AM_RANGE(0x902000, 0x902001) AM_READ(input_port_4_word_r) // dip2 + AM_RANGE(0x901002, 0x901003) AM_READ_PORT("P1") + AM_RANGE(0x901006, 0x901007) AM_READ_PORT("P2") + AM_RANGE(0x901000, 0x901001) AM_READ_PORT("SERVICE") + AM_RANGE(0x902002, 0x902003) AM_READ_PORT("DSW1") + AM_RANGE(0x902000, 0x902001) AM_READ_PORT("DSW2") ADDRESS_MAP_END static ADDRESS_MAP_START( bayroute_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -664,13 +694,11 @@ static DRIVER_INIT( bayrtbl1 ) { MACHINE_RESET_CALL(sys16_onetime); } + /***************************************************************************/ static INPUT_PORTS_START( bayroute ) - SYS16_JOY1 - SYS16_JOY2 - SYS16_SERVICE - SYS16_COINAGE + PORT_INCLUDE( sys16_common ) PORT_START_TAG("DSW2") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW2:1") @@ -708,22 +736,6 @@ static MACHINE_DRIVER_START( bayroute ) MDRV_MACHINE_RESET(bayroute) MACHINE_DRIVER_END -/*************************************************************************** - - Body Slam - -***************************************************************************/ - - -/***************************************************************************/ - - -/***************************************************************************/ - - -/***************************************************************************/ - - /***************************************************************************/ static ADDRESS_MAP_START( dduxbl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -732,11 +744,11 @@ static ADDRESS_MAP_START( dduxbl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x410000, 0x410fff) AM_READ(SYS16_MRA16_TEXTRAM) AM_RANGE(0x440000, 0x440fff) AM_READ(SYS16_MRA16_SPRITERAM) AM_RANGE(0x840000, 0x840fff) AM_READ(SYS16_MRA16_PALETTERAM) - AM_RANGE(0xc41002, 0xc41003) AM_READ(input_port_0_word_r) // player1 - AM_RANGE(0xc41004, 0xc41005) AM_READ(input_port_1_word_r) // player2 - AM_RANGE(0xc41000, 0xc41001) AM_READ(input_port_2_word_r) // service - AM_RANGE(0xc42002, 0xc42003) AM_READ(input_port_3_word_r) // dip1 - AM_RANGE(0xc42000, 0xc42001) AM_READ(input_port_4_word_r) // dip2 + AM_RANGE(0xc41002, 0xc41003) AM_READ_PORT("P1") + AM_RANGE(0xc41004, 0xc41005) AM_READ_PORT("P2") + AM_RANGE(0xc41000, 0xc41001) AM_READ_PORT("SERVICE") + AM_RANGE(0xc42002, 0xc42003) AM_READ_PORT("DSW1") + AM_RANGE(0xc42000, 0xc42001) AM_READ_PORT("DSW2") AM_RANGE(0xffc000, 0xffffff) AM_READ(SYS16_MRA16_WORKINGRAM) ADDRESS_MAP_END @@ -823,13 +835,11 @@ static DRIVER_INIT( dduxbl ) MACHINE_RESET_CALL(sys16_onetime); sys16_video_config(dduxbl_update_proc, -0x48, bank); } + /***************************************************************************/ static INPUT_PORTS_START( ddux ) - SYS16_JOY1 - SYS16_JOY2 - SYS16_SERVICE - SYS16_COINAGE + PORT_INCLUDE( sys16_common ) PORT_START_TAG("DSW2") PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:1") @@ -867,19 +877,17 @@ MACHINE_DRIVER_END /***************************************************************************/ - - static ADDRESS_MAP_START( eswat_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_READ(SMH_ROM) AM_RANGE(0x400000, 0x40ffff) AM_READ(SYS16_MRA16_TILERAM) AM_RANGE(0x410000, 0x418fff) AM_READ(SYS16_MRA16_TEXTRAM) //* AM_RANGE(0x440000, 0x440fff) AM_READ(SYS16_MRA16_SPRITERAM) AM_RANGE(0x840000, 0x840fff) AM_READ(SYS16_MRA16_PALETTERAM) - AM_RANGE(0xc41002, 0xc41003) AM_READ(input_port_0_word_r) // player1 - AM_RANGE(0xc41006, 0xc41007) AM_READ(input_port_1_word_r) // player2 - AM_RANGE(0xc41000, 0xc41001) AM_READ(input_port_2_word_r) // service - AM_RANGE(0xc42002, 0xc42003) AM_READ(input_port_3_word_r) // dip1 - AM_RANGE(0xc42000, 0xc42001) AM_READ(input_port_4_word_r) // dip2 + AM_RANGE(0xc41002, 0xc41003) AM_READ_PORT("P1") + AM_RANGE(0xc41006, 0xc41007) AM_READ_PORT("P2") + AM_RANGE(0xc41000, 0xc41001) AM_READ_PORT("SERVICE") + AM_RANGE(0xc42002, 0xc42003) AM_READ_PORT("DSW1") + AM_RANGE(0xc42000, 0xc42001) AM_READ_PORT("DSW2") AM_RANGE(0xffc000, 0xffffff) AM_READ(SYS16_MRA16_WORKINGRAM) ADDRESS_MAP_END @@ -894,7 +902,6 @@ static WRITE16_HANDLER( eswat_tilebank0_w ) } - static ADDRESS_MAP_START( eswatbl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x3e2000, 0x3e2001) AM_WRITE(eswat_tilebank0_w) @@ -908,7 +915,6 @@ static ADDRESS_MAP_START( eswatbl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xffc000, 0xffffff) AM_WRITE(SYS16_MWA16_WORKINGRAM) AM_BASE(&sys16_workingram) ADDRESS_MAP_END - /***************************************************************************/ static void eswatbl_update_proc( void ) @@ -952,10 +958,7 @@ static DRIVER_INIT( eswatbl ) /***************************************************************************/ static INPUT_PORTS_START( eswat ) - SYS16_JOY1 - SYS16_JOY2 - SYS16_SERVICE - SYS16_COINAGE + PORT_INCLUDE( sys16_common ) PORT_START_TAG("DSW2") PORT_DIPNAME( 0x01, 0x01, "Credits To Start" ) PORT_DIPLOCATION("SW2:1") @@ -996,25 +999,15 @@ MACHINE_DRIVER_END /***************************************************************************/ - -/***************************************************************************/ - - -/***************************************************************************/ - - -/***************************************************************************/ - - static ADDRESS_MAP_START( fpointbl_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x01ffff) AM_ROM // AM_RANGE(0x02002e, 0x020049) AM_READ(fp_io_service_dummy_r) AM_RANGE(0x600006, 0x600007) AM_WRITE(sound_command_w) - AM_RANGE(0x601000, 0x601001) AM_READ(input_port_0_word_r) // service - AM_RANGE(0x601002, 0x601003) AM_READ(input_port_1_word_r) // player1 - AM_RANGE(0x601004, 0x601005) AM_READ(input_port_2_word_r) // player2 - AM_RANGE(0x600000, 0x600001) AM_READ(input_port_3_word_r) // dip1 - AM_RANGE(0x600002, 0x600003) AM_READ(input_port_4_word_r) // dip2 + AM_RANGE(0x601000, 0x601001) AM_READ_PORT("SERVICE") + AM_RANGE(0x601002, 0x601003) AM_READ_PORT("P1") + AM_RANGE(0x601004, 0x601005) AM_READ_PORT("P2") + AM_RANGE(0x600000, 0x600001) AM_READ_PORT("DSW2") + AM_RANGE(0x600002, 0x600003) AM_READ_PORT("DSW1") AM_RANGE(0x400000, 0x40ffff) AM_READWRITE(SYS16_MRA16_TILERAM, SYS16_MWA16_TILERAM) AM_BASE(&sys16_tileram) AM_RANGE(0x410000, 0x410fff) AM_READWRITE(SYS16_MRA16_TEXTRAM, SYS16_MWA16_TEXTRAM) AM_BASE(&sys16_textram) AM_RANGE(0x440000, 0x440fff) AM_READWRITE(SYS16_MRA16_SPRITERAM, SYS16_MWA16_SPRITERAM) AM_BASE(&sys16_spriteram) @@ -1071,62 +1064,22 @@ static DRIVER_INIT( fpointbl ) MACHINE_RESET_CALL(sys16_onetime); sys16_video_config(fpoint_update_proc, -0xb8, NULL); } -/***************************************************************************/ - -static INPUT_PORTS_START( fpoint ) - SYS16_SERVICE - - PORT_START_TAG("IN0") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY - - PORT_START_TAG("IN1") - PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START_TAG("IN3") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL - PORT_START_TAG("DSW2") - PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW2:1" ) /* Listed as "Unused" */ - PORT_DIPNAME( 0x02, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:2") - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "SW2:3" ) /* Listed as "Unused" */ - PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "SW2:4" ) /* Listed as "Unused" */ - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:5,6") - PORT_DIPSETTING( 0x20, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x30, DEF_STR( Normal ) ) - PORT_DIPSETTING( 0x10, DEF_STR( Hard ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) - PORT_DIPNAME( 0x40, 0x40, "Clear Round Allowed" ) PORT_DIPLOCATION("SW2:7") /* Use button 3 */ - PORT_DIPSETTING( 0x00, "1" ) - PORT_DIPSETTING( 0x40, "2" ) - /* The mode in which a block falls at twice [ usual ] speed as this when playing 25 minutes or more on one coin. */ - PORT_DIPNAME( 0x80, 0x80, "2 Cell Move" ) PORT_DIPLOCATION("SW2:8") - PORT_DIPSETTING( 0x00, DEF_STR( No ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Yes ) ) - - SYS16_COINAGE -INPUT_PORTS_END +/***************************************************************************/ -static INPUT_PORTS_START( fpointbj ) - SYS16_SERVICE +static INPUT_PORTS_START( fpointbl ) + PORT_START_TAG("SERVICE") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) + PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START1 ) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN0") + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) @@ -1136,7 +1089,7 @@ static INPUT_PORTS_START( fpointbj ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY - PORT_START_TAG("IN1") + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL @@ -1166,7 +1119,41 @@ static INPUT_PORTS_START( fpointbj ) PORT_DIPSETTING( 0x00, DEF_STR( No ) ) PORT_DIPSETTING( 0x80, DEF_STR( Yes ) ) - SYS16_COINAGE + PORT_START_TAG("DSW1") + PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4") + PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) ) + PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x09, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x05, "2 Coins/1 Credit 5/3 6/4" ) + PORT_DIPSETTING( 0x04, "2 Coins/1 Credit 4/3" ) + PORT_DIPSETTING( 0x0f, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x01, "1 Coin/1 Credit 2/3" ) + PORT_DIPSETTING( 0x02, "1 Coin/1 Credit 4/5" ) + PORT_DIPSETTING( 0x03, "1 Coin/1 Credit 5/6" ) + PORT_DIPSETTING( 0x06, DEF_STR( 2C_3C ) ) + PORT_DIPSETTING( 0x0e, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x0d, DEF_STR( 1C_3C ) ) + PORT_DIPSETTING( 0x0c, DEF_STR( 1C_4C ) ) + PORT_DIPSETTING( 0x0b, DEF_STR( 1C_5C ) ) + PORT_DIPSETTING( 0x0a, DEF_STR( 1C_6C ) ) + PORT_DIPSETTING( 0x00, "Free Play (if Coin B too) or 1/1" ) + PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:5,6,7,8") + PORT_DIPSETTING( 0x70, DEF_STR( 4C_1C ) ) + PORT_DIPSETTING( 0x80, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x90, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x50, "2 Coins/1 Credit 5/3 6/4" ) + PORT_DIPSETTING( 0x40, "2 Coins/1 Credit 4/3" ) + PORT_DIPSETTING( 0xf0, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x10, "1 Coin/1 Credit 2/3" ) + PORT_DIPSETTING( 0x20, "1 Coin/1 Credit 4/5" ) + PORT_DIPSETTING( 0x30, "1 Coin/1 Credit 5/6" ) + PORT_DIPSETTING( 0x60, DEF_STR( 2C_3C ) ) + PORT_DIPSETTING( 0xe0, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0xd0, DEF_STR( 1C_3C ) ) + PORT_DIPSETTING( 0xc0, DEF_STR( 1C_4C ) ) + PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ) ) + PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) ) + PORT_DIPSETTING( 0x00, "Free Play (if Coin A too) or 1/1" ) INPUT_PORTS_END /***************************************************************************/ @@ -1197,11 +1184,11 @@ MACHINE_DRIVER_END /***************************************************************************/ static READ16_HANDLER( ga_io_players_r ) { - return (input_port_read_indexed(machine, 0) << 8) | input_port_read_indexed(machine, 1); + return (input_port_read(machine, "P1") << 8) | input_port_read(machine, "P2"); } static READ16_HANDLER( ga_io_service_r ) { - return (input_port_read_indexed(machine,2) << 8) | (sys16_workingram[0x2c96/2] & 0x00ff); + return (input_port_read(machine,"SERVICE") << 8) | (sys16_workingram[0x2c96/2] & 0x00ff); } static ADDRESS_MAP_START( goldnaxe_readmem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -1211,11 +1198,11 @@ static ADDRESS_MAP_START( goldnaxe_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x140000, 0x140fff) AM_READ(SYS16_MRA16_PALETTERAM) AM_RANGE(0x1f0000, 0x1f0003) AM_READ(SYS16_MRA16_EXTRAM) AM_RANGE(0x200000, 0x200fff) AM_READ(SYS16_MRA16_SPRITERAM) - AM_RANGE(0xc41002, 0xc41003) AM_READ(input_port_0_word_r) // player1 - AM_RANGE(0xc41006, 0xc41007) AM_READ(input_port_1_word_r) // player2 - AM_RANGE(0xc41000, 0xc41001) AM_READ(input_port_2_word_r) // service - AM_RANGE(0xc42002, 0xc42003) AM_READ(input_port_3_word_r) // dip1 - AM_RANGE(0xc42000, 0xc42001) AM_READ(input_port_4_word_r) // dip2 + AM_RANGE(0xc41002, 0xc41003) AM_READ_PORT("P1") + AM_RANGE(0xc41006, 0xc41007) AM_READ_PORT("P2") + AM_RANGE(0xc41000, 0xc41001) AM_READ_PORT("SERVICE") + AM_RANGE(0xc42002, 0xc42003) AM_READ_PORT("DSW1") + AM_RANGE(0xc42000, 0xc42001) AM_READ_PORT("DSW2") AM_RANGE(0xffecd0, 0xffecd1) AM_READ(ga_io_players_r) AM_RANGE(0xffec96, 0xffec97) AM_READ(ga_io_service_r) AM_RANGE(0xffc000, 0xffffff) AM_READ(SYS16_MRA16_WORKINGRAM) @@ -1288,8 +1275,6 @@ static MACHINE_RESET( goldnaxe ) sys16_update_proc = goldnaxe_update_proc; } - - static DRIVER_INIT( goldnabl ) { MACHINE_RESET_CALL(sys16_onetime); @@ -1298,10 +1283,7 @@ static DRIVER_INIT( goldnabl ) /***************************************************************************/ static INPUT_PORTS_START( goldnaxe ) - SYS16_JOY1 - SYS16_JOY2 - SYS16_SERVICE - SYS16_COINAGE + PORT_INCLUDE( sys16_common ) PORT_START_TAG("DSW2") PORT_DIPNAME( 0x01, 0x01, "Credits Needed" ) PORT_DIPLOCATION("SW2:1") @@ -1349,33 +1331,17 @@ MACHINE_DRIVER_END /***************************************************************************/ - - -/***************************************************************************/ - - -/***************************************************************************/ - - -/***************************************************************************/ - - -/***************************************************************************/ - - -/***************************************************************************/ - static ADDRESS_MAP_START( passsht_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x01ffff) AM_READ(SMH_ROM) AM_RANGE(0x400000, 0x40ffff) AM_READ(SYS16_MRA16_TILERAM) AM_RANGE(0x410000, 0x410fff) AM_READ(SYS16_MRA16_TEXTRAM) AM_RANGE(0x440000, 0x440fff) AM_READ(SYS16_MRA16_SPRITERAM) AM_RANGE(0x840000, 0x840fff) AM_READ(SYS16_MRA16_PALETTERAM) - AM_RANGE(0xc41002, 0xc41003) AM_READ(input_port_0_word_r) // player1 - AM_RANGE(0xc41004, 0xc41005) AM_READ(input_port_1_word_r) // player2 - AM_RANGE(0xc41000, 0xc41001) AM_READ(input_port_2_word_r) // service - AM_RANGE(0xc42002, 0xc42003) AM_READ(input_port_3_word_r) // dip1 - AM_RANGE(0xc42000, 0xc42001) AM_READ(input_port_4_word_r) // dip2 + AM_RANGE(0xc41002, 0xc41003) AM_READ_PORT("P1") + AM_RANGE(0xc41004, 0xc41005) AM_READ_PORT("P2") + AM_RANGE(0xc41000, 0xc41001) AM_READ_PORT("SERVICE") + AM_RANGE(0xc42002, 0xc42003) AM_READ_PORT("DSW1") + AM_RANGE(0xc42000, 0xc42001) AM_READ_PORT("DSW2") AM_RANGE(0xffc000, 0xffffff) AM_READ(SYS16_MRA16_WORKINGRAM) ADDRESS_MAP_END @@ -1396,43 +1362,54 @@ static int passht4b_io3_val; static READ16_HANDLER( passht4b_service_r ) { - UINT16 val=input_port_read_indexed(machine,2); - if(!(input_port_read_indexed(machine, 0) & 0x40)) val&=0xef; - if(!(input_port_read_indexed(machine, 1) & 0x40)) val&=0xdf; - if(!(input_port_read_indexed(machine, 5) & 0x40)) val&=0xbf; - if(!(input_port_read_indexed(machine, 6) & 0x40)) val&=0x7f; + UINT16 val=input_port_read(machine, "SERVICE"); + if(!(input_port_read(machine, "P1") & 0x40)) val&=0xef; + if(!(input_port_read(machine, "P2") & 0x40)) val&=0xdf; + if(!(input_port_read(machine, "P3") & 0x40)) val&=0xbf; + if(!(input_port_read(machine, "P4") & 0x40)) val&=0x7f; - passht4b_io3_val=(input_port_read_indexed(machine, 0)<<4) | (input_port_read_indexed(machine, 5)&0xf); - passht4b_io2_val=(input_port_read_indexed(machine, 1)<<4) | (input_port_read_indexed(machine, 6)&0xf); + passht4b_io3_val=(input_port_read(machine, "P1") << 4) | (input_port_read(machine, "P3") & 0xf); + passht4b_io2_val=(input_port_read(machine, "P2") << 4) | (input_port_read(machine, "P4") & 0xf); passht4b_io1_val=0xff; // player 1 buttons - if(!(input_port_read_indexed(machine, 0) & 0x10)) passht4b_io1_val &=0xfe; - if(!(input_port_read_indexed(machine, 0) & 0x20)) passht4b_io1_val &=0xfd; - if(!(input_port_read_indexed(machine, 0) & 0x80)) passht4b_io1_val &=0xfc; + if(!(input_port_read(machine, "P1") & 0x10)) passht4b_io1_val &=0xfe; + if(!(input_port_read(machine, "P1") & 0x20)) passht4b_io1_val &=0xfd; + if(!(input_port_read(machine, "P1") & 0x80)) passht4b_io1_val &=0xfc; // player 2 buttons - if(!(input_port_read_indexed(machine, 1) & 0x10)) passht4b_io1_val &=0xfb; - if(!(input_port_read_indexed(machine, 1) & 0x20)) passht4b_io1_val &=0xf7; - if(!(input_port_read_indexed(machine, 1) & 0x80)) passht4b_io1_val &=0xf3; + if(!(input_port_read(machine, "P2") & 0x10)) passht4b_io1_val &=0xfb; + if(!(input_port_read(machine, "P2") & 0x20)) passht4b_io1_val &=0xf7; + if(!(input_port_read(machine, "P2") & 0x80)) passht4b_io1_val &=0xf3; // player 3 buttons - if(!(input_port_read_indexed(machine, 5) & 0x10)) passht4b_io1_val &=0xef; - if(!(input_port_read_indexed(machine, 5) & 0x20)) passht4b_io1_val &=0xdf; - if(!(input_port_read_indexed(machine, 5) & 0x80)) passht4b_io1_val &=0xcf; + if(!(input_port_read(machine, "P3") & 0x10)) passht4b_io1_val &=0xef; + if(!(input_port_read(machine, "P3") & 0x20)) passht4b_io1_val &=0xdf; + if(!(input_port_read(machine, "P3") & 0x80)) passht4b_io1_val &=0xcf; // player 4 buttons - if(!(input_port_read_indexed(machine, 6) & 0x10)) passht4b_io1_val &=0xbf; - if(!(input_port_read_indexed(machine, 6) & 0x20)) passht4b_io1_val &=0x7f; - if(!(input_port_read_indexed(machine, 6) & 0x80)) passht4b_io1_val &=0x3f; + if(!(input_port_read(machine, "P4") & 0x10)) passht4b_io1_val &=0xbf; + if(!(input_port_read(machine, "P4") & 0x20)) passht4b_io1_val &=0x7f; + if(!(input_port_read(machine, "P4") & 0x80)) passht4b_io1_val &=0x3f; return val; } -static READ16_HANDLER( passht4b_io1_r ) { return passht4b_io1_val;} -static READ16_HANDLER( passht4b_io2_r ) { return passht4b_io2_val;} -static READ16_HANDLER( passht4b_io3_r ) { return passht4b_io3_val;} +static READ16_HANDLER( passht4b_io1_r ) +{ + return passht4b_io1_val; +} + +static READ16_HANDLER( passht4b_io2_r ) +{ + return passht4b_io2_val; +} + +static READ16_HANDLER( passht4b_io3_r ) +{ + return passht4b_io3_val; +} static ADDRESS_MAP_START( passht4b_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x01ffff) AM_READ(SMH_ROM) @@ -1444,12 +1421,12 @@ static ADDRESS_MAP_START( passht4b_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc41002, 0xc41003) AM_READ(passht4b_io1_r) AM_RANGE(0xc41004, 0xc41005) AM_READ(passht4b_io2_r) AM_RANGE(0xc41006, 0xc41007) AM_READ(passht4b_io3_r) - AM_RANGE(0xc42002, 0xc42003) AM_READ(input_port_3_word_r) // dip1 - AM_RANGE(0xc42000, 0xc42001) AM_READ(input_port_4_word_r) // dip2 - AM_RANGE(0xc43000, 0xc43001) AM_READ(input_port_0_word_r) // player1 // test mode only - AM_RANGE(0xc43002, 0xc43003) AM_READ(input_port_1_word_r) // player2 - AM_RANGE(0xc43004, 0xc43005) AM_READ(input_port_5_word_r) // player3 - AM_RANGE(0xc43006, 0xc43007) AM_READ(input_port_6_word_r) // player4 + AM_RANGE(0xc42002, 0xc42003) AM_READ_PORT("DSW1") + AM_RANGE(0xc42000, 0xc42001) AM_READ_PORT("DSW2") + AM_RANGE(0xc43000, 0xc43001) AM_READ_PORT("P1") // test mode only + AM_RANGE(0xc43002, 0xc43003) AM_READ_PORT("P2") + AM_RANGE(0xc43004, 0xc43005) AM_READ_PORT("P3") + AM_RANGE(0xc43006, 0xc43007) AM_READ_PORT("P4") AM_RANGE(0xffc000, 0xffffff) AM_READ(SYS16_MRA16_WORKINGRAM) ADDRESS_MAP_END @@ -1523,28 +1500,13 @@ static DRIVER_INIT( passht4b ) /***************************************************************************/ static INPUT_PORTS_START( passsht ) - PORT_START_TAG("IN0") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) + PORT_INCLUDE( sys16_common ) + + PORT_MODIFY("P1") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY - PORT_START_TAG("IN1") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL + PORT_MODIFY("P2") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_COCKTAIL - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL - - SYS16_SERVICE - SYS16_COINAGE PORT_START_TAG("DSW2") PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:1") @@ -1572,7 +1534,9 @@ static INPUT_PORTS_START( passsht ) INPUT_PORTS_END static INPUT_PORTS_START( passht4b ) - PORT_START_TAG("IN0") + PORT_INCLUDE( passsht ) + + PORT_MODIFY("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY @@ -1582,7 +1546,7 @@ static INPUT_PORTS_START( passht4b ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) - PORT_START_TAG("IN1") + PORT_MODIFY("P2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL @@ -1592,43 +1556,11 @@ static INPUT_PORTS_START( passht4b ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_COCKTAIL - PORT_START_TAG("IN2") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) + PORT_MODIFY("SERVICE") PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4 ) - SYS16_COINAGE - - PORT_START_TAG("DSW2") - PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:1") - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x0e, 0x0e, "Initial Point" ) PORT_DIPLOCATION("SW2:2,3,4") - PORT_DIPSETTING( 0x06, "2000" ) - PORT_DIPSETTING( 0x0a, "3000" ) - PORT_DIPSETTING( 0x0c, "4000" ) - PORT_DIPSETTING( 0x0e, "5000" ) - PORT_DIPSETTING( 0x08, "6000" ) - PORT_DIPSETTING( 0x04, "7000" ) - PORT_DIPSETTING( 0x02, "8000" ) - PORT_DIPSETTING( 0x00, "9000" ) - PORT_DIPNAME( 0x30, 0x30, "Point Table" ) PORT_DIPLOCATION("SW2:5,6") - PORT_DIPSETTING( 0x20, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x30, DEF_STR( Normal ) ) - PORT_DIPSETTING( 0x10, DEF_STR( Hard ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) - PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:7,8") - PORT_DIPSETTING( 0x80, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0xc0, DEF_STR( Normal ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Hard ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) - - PORT_START_TAG("IN5") + PORT_START_TAG("P3") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3) @@ -1638,7 +1570,7 @@ static INPUT_PORTS_START( passht4b ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(3) - PORT_START_TAG("IN6") + PORT_START_TAG("P4") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(4) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4) @@ -1647,7 +1579,6 @@ static INPUT_PORTS_START( passht4b ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(4) - INPUT_PORTS_END /***************************************************************************/ @@ -1675,20 +1606,8 @@ MACHINE_DRIVER_END /***************************************************************************/ - -/***************************************************************************/ - - -/***************************************************************************/ - - -/***************************************************************************/ - static INPUT_PORTS_START( shinobi ) - SYS16_JOY1 - SYS16_JOY2 - SYS16_SERVICE - SYS16_COINAGE + PORT_INCLUDE( sys16_common ) PORT_START_TAG("DSW2") PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:1") @@ -1717,20 +1636,17 @@ INPUT_PORTS_END /***************************************************************************/ - -/***************************************************************************/ - static ADDRESS_MAP_START( shinobl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_RANGE(0x400000, 0x40ffff) AM_READ(SYS16_MRA16_TILERAM) AM_RANGE(0x410000, 0x410fff) AM_READ(SYS16_MRA16_TEXTRAM) AM_RANGE(0x440000, 0x440fff) AM_READ(SYS16_MRA16_SPRITERAM) AM_RANGE(0x840000, 0x840fff) AM_READ(SYS16_MRA16_PALETTERAM) - AM_RANGE(0xc41002, 0xc41003) AM_READ(input_port_0_word_r) // player1 - AM_RANGE(0xc41006, 0xc41007) AM_READ(input_port_1_word_r) // player2 - AM_RANGE(0xc41000, 0xc41001) AM_READ(input_port_2_word_r) // service - AM_RANGE(0xc42000, 0xc42001) AM_READ(input_port_3_word_r) // dip1 - AM_RANGE(0xc42002, 0xc42003) AM_READ(input_port_4_word_r) // dip2 + AM_RANGE(0xc41002, 0xc41003) AM_READ_PORT("P1") + AM_RANGE(0xc41006, 0xc41007) AM_READ_PORT("P2") + AM_RANGE(0xc41000, 0xc41001) AM_READ_PORT("SERVICE") + AM_RANGE(0xc42000, 0xc42001) AM_READ_PORT("DSW1") + AM_RANGE(0xc42002, 0xc42003) AM_READ_PORT("DSW2") AM_RANGE(0xffc000, 0xffffff) AM_READ(SYS16_MRA16_WORKINGRAM) ADDRESS_MAP_END @@ -1778,11 +1694,8 @@ static DRIVER_INIT( shinobl ) MACHINE_RESET_CALL(sys16_onetime); } - /***************************************************************************/ - - static MACHINE_DRIVER_START( shinob2 ) /* basic machine hardware */ @@ -1793,11 +1706,8 @@ static MACHINE_DRIVER_START( shinob2 ) MDRV_MACHINE_RESET(shinobl) MACHINE_DRIVER_END - /***************************************************************************/ - - /* bootleg has extra ram for regs? */ static ADDRESS_MAP_START( tetrisbl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -1807,11 +1717,11 @@ static ADDRESS_MAP_START( tetrisbl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x418000, 0x41803f) AM_READ(SYS16_MRA16_EXTRAM2) AM_RANGE(0x440000, 0x440fff) AM_READ(SYS16_MRA16_SPRITERAM) AM_RANGE(0x840000, 0x840fff) AM_READ(SYS16_MRA16_PALETTERAM) - AM_RANGE(0xc41002, 0xc41003) AM_READ(input_port_0_word_r) // player1 - AM_RANGE(0xc41006, 0xc41007) AM_READ(input_port_1_word_r) // player2 - AM_RANGE(0xc41000, 0xc41001) AM_READ(input_port_2_word_r) // service - AM_RANGE(0xc42002, 0xc42003) AM_READ(input_port_3_word_r) // dip1 - AM_RANGE(0xc42000, 0xc42001) AM_READ(input_port_4_word_r) // dip2 + AM_RANGE(0xc41002, 0xc41003) AM_READ_PORT("P1") + AM_RANGE(0xc41006, 0xc41007) AM_READ_PORT("P2") + AM_RANGE(0xc41000, 0xc41001) AM_READ_PORT("SERVICE") + AM_RANGE(0xc42002, 0xc42003) AM_READ_PORT("DSW1") + AM_RANGE(0xc42000, 0xc42001) AM_READ_PORT("DSW2") AM_RANGE(0xc80000, 0xc80001) AM_READ(SMH_NOP) AM_RANGE(0xffc000, 0xffffff) AM_READ(SYS16_MRA16_WORKINGRAM) ADDRESS_MAP_END @@ -1831,7 +1741,6 @@ static ADDRESS_MAP_START( tetrisbl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END - static READ16_HANDLER(beautyb_unk1_r) { @@ -1868,8 +1777,6 @@ ADDRESS_MAP_END /***************************************************************************/ - - static void tetris_bootleg_update_proc( void ) { sys16_fg_scrolly = sys16_textram[0x748]; @@ -1901,10 +1808,7 @@ static DRIVER_INIT( tetrisbl ) /***************************************************************************/ static INPUT_PORTS_START( tetris ) - SYS16_JOY1 - SYS16_JOY2 - SYS16_SERVICE - SYS16_COINAGE /* unconfirmed */ + PORT_INCLUDE( sys16_common ) /* unconfirmed coinage dip */ PORT_START_TAG("DSW2") PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW2:1" ) /* Listed as "Unused" */ @@ -1947,19 +1851,22 @@ static MACHINE_DRIVER_START( beautyb ) MDRV_MACHINE_RESET(tetrisbl) MACHINE_DRIVER_END - /***************************************************************************/ static READ16_HANDLER( tt_io_player1_r ) -{ return input_port_read_indexed(machine,0) << 8; } -static READ16_HANDLER( tt_io_player2_r ) -{ return input_port_read_indexed(machine,1) << 8; } -static READ16_HANDLER( tt_io_service_r ) -{ return input_port_read_indexed(machine,2) << 8; } - +{ + return input_port_read(machine, "P1") << 8; +} +static READ16_HANDLER( tt_io_player2_r ) +{ + return input_port_read(machine, "P2") << 8; +} -/***************************************************************************/ +static READ16_HANDLER( tt_io_service_r ) +{ + return input_port_read(machine, "SERVICE") << 8; +} /* This game has a MCU which does the following: @@ -1988,14 +1895,8 @@ static READ16_HANDLER( tt_io_service_r ) be tricky, tturfbl handles it correctly. */ - -/***************************************************************************/ - static INPUT_PORTS_START( tturf ) - SYS16_JOY1 - SYS16_JOY2 - SYS16_SERVICE - SYS16_COINAGE + PORT_INCLUDE( sys16_common ) PORT_START_TAG("DSW2") PORT_DIPNAME( 0x03, 0x00, DEF_STR( Continues ) ) PORT_DIPLOCATION("SW2:1,2") @@ -2034,13 +1935,13 @@ static ADDRESS_MAP_START( tturfbl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x400000, 0x40ffff) AM_READ(SYS16_MRA16_TILERAM) AM_RANGE(0x410000, 0x410fff) AM_READ(SYS16_MRA16_TEXTRAM) AM_RANGE(0x500000, 0x500fff) AM_READ(SYS16_MRA16_PALETTERAM) - AM_RANGE(0x600002, 0x600003) AM_READ(input_port_3_word_r) // dip1 - AM_RANGE(0x600000, 0x600001) AM_READ(input_port_4_word_r) // dip2 - AM_RANGE(0x601002, 0x601003) AM_READ(input_port_0_word_r) // player1 - AM_RANGE(0x601004, 0x601005) AM_READ(input_port_1_word_r) // player2 - AM_RANGE(0x601000, 0x601001) AM_READ(input_port_2_word_r) // service - AM_RANGE(0x602002, 0x602003) AM_READ(input_port_3_word_r) // dip1 - AM_RANGE(0x602000, 0x602001) AM_READ(input_port_4_word_r) // dip2 + AM_RANGE(0x600002, 0x600003) AM_READ_PORT("DSW1") + AM_RANGE(0x600000, 0x600001) AM_READ_PORT("DSW2") + AM_RANGE(0x601002, 0x601003) AM_READ_PORT("P1") + AM_RANGE(0x601004, 0x601005) AM_READ_PORT("P2") + AM_RANGE(0x601000, 0x601001) AM_READ_PORT("SERVICE") + AM_RANGE(0x602002, 0x602003) AM_READ_PORT("DSW1") + AM_RANGE(0x602000, 0x602001) AM_READ_PORT("DSW2") AM_RANGE(0xc46000, 0xc4601f) AM_READ(SYS16_MRA16_EXTRAM3) ADDRESS_MAP_END @@ -2108,8 +2009,8 @@ static DRIVER_INIT( tturfbl ) mem = memory_region(machine, REGION_CPU2); memcpy(mem, mem+0x10000, 0x8000); - } + /***************************************************************************/ // sound ?? static MACHINE_DRIVER_START( tturfbl ) @@ -2136,20 +2037,8 @@ MACHINE_DRIVER_END /***************************************************************************/ - -/***************************************************************************/ - - - - - -/***************************************************************************/ - static INPUT_PORTS_START( wb3b ) - SYS16_JOY1 - SYS16_JOY2 - SYS16_SERVICE - SYS16_COINAGE + PORT_INCLUDE( sys16_common ) PORT_START_TAG("DSW2") PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW2:1" ) /* Listed as "Unused" */ @@ -2175,20 +2064,17 @@ INPUT_PORTS_END /***************************************************************************/ - -/***************************************************************************/ - static ADDRESS_MAP_START( wb3bbl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM) AM_RANGE(0x400000, 0x40ffff) AM_READ(SYS16_MRA16_TILERAM) AM_RANGE(0x410000, 0x410fff) AM_READ(SYS16_MRA16_TEXTRAM) AM_RANGE(0x440000, 0x440fff) AM_READ(SYS16_MRA16_SPRITERAM) AM_RANGE(0x840000, 0x840fff) AM_READ(SYS16_MRA16_PALETTERAM) - AM_RANGE(0xc41002, 0xc41003) AM_READ(input_port_0_word_r) // player1 - AM_RANGE(0xc41004, 0xc41005) AM_READ(input_port_1_word_r) // player2 - AM_RANGE(0xc41000, 0xc41001) AM_READ(input_port_2_word_r) // service - AM_RANGE(0xc42002, 0xc42003) AM_READ(input_port_3_word_r) // dip1 - AM_RANGE(0xc42000, 0xc42001) AM_READ(input_port_4_word_r) // dip2 + AM_RANGE(0xc41002, 0xc41003) AM_READ_PORT("P1") + AM_RANGE(0xc41004, 0xc41005) AM_READ_PORT("P2") + AM_RANGE(0xc41000, 0xc41001) AM_READ_PORT("SERVICE") + AM_RANGE(0xc42002, 0xc42003) AM_READ_PORT("DSW1") + AM_RANGE(0xc42000, 0xc42001) AM_READ_PORT("DSW2") AM_RANGE(0xc46000, 0xc4601f) AM_READ(SYS16_MRA16_EXTRAM3) AM_RANGE(0xff0000, 0xffffff) AM_READ(SYS16_MRA16_WORKINGRAM) ADDRESS_MAP_END @@ -2277,11 +2163,8 @@ static MACHINE_DRIVER_START( wb3bbl ) MDRV_MACHINE_RESET(wb3bbl) MACHINE_DRIVER_END - - /*****************************************************************************/ - ROM_START( bayrtbl1 ) ROM_REGION( 0xc0000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "b4.bin", 0x000000, 0x10000, CRC(eb6646ae) SHA1(073bc0a3868e70785f44e497a949cd9e3b591a33) ) @@ -2342,7 +2225,6 @@ ROM_START( bayrtbl2 ) ROM_END // sys16B - ROM_START( dduxbl ) ROM_REGION( 0x0c0000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "dduxb03.bin", 0x000000, 0x20000, CRC(e7526012) SHA1(a1798008bfa1ce9b87dc330f3817b1978052fcfd) ) @@ -2373,8 +2255,6 @@ ROM_START( dduxbl ) ROM_END // sys16B - - ROM_START( eswatbl ) ROM_REGION( 0x080000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "eswat_c.rom", 0x000000, 0x10000, CRC(1028cc81) SHA1(24b4cd182419a44f3d6afa1c4273353024eb278f) ) @@ -2403,8 +2283,6 @@ ROM_START( eswatbl ) ROM_END // sys16B - - ROM_START( fpointbl ) ROM_REGION( 0x020000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "flpoint.003", 0x000000, 0x10000, CRC(4d6df514) SHA1(168aa1629ab7152ba1984605155406b236954a2c) ) @@ -2513,7 +2391,6 @@ ROM_END */ - ROM_START( goldnab2 ) ROM_REGION( 0x0c0000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "ic39.1", 0x00000, 0x10000, CRC(71489c9a) SHA1(ec25463a2c63027d2635f0e27f5a971d68938fe3) ) @@ -2565,49 +2442,6 @@ ROM_START( goldnab2 ) ROM_LOAD( "ic46.9", 0x10000, 0x10000, CRC(634dd54e) SHA1(ac4ab0ad9c1ac634ff4dfb83232b0fa5cfb26fdd) ) ROM_END - -// pre16 -#ifdef UNUSED_DEFINITION -ROM_START( mjleague ) - ROM_REGION( 0x030000, REGION_CPU1, 0 ) /* 68000 code */ - ROM_LOAD16_BYTE( "epr-7404.09b", 0x000000, 0x8000, CRC(ec1655b5) SHA1(5c1df364fa9733daa4478c5f88298089e4963c33) ) - ROM_LOAD16_BYTE( "epr-7401.06b", 0x000001, 0x8000, CRC(2befa5e0) SHA1(0a1681a4c7d62a5754ba6f3845436b4d08324246) ) - ROM_LOAD16_BYTE( "epr-7405.10b", 0x010000, 0x8000, CRC(7a4f4e38) SHA1(65a22097dd933e83f326bd64b3863915897780a6) ) - ROM_LOAD16_BYTE( "epr-7402.07b", 0x010001, 0x8000, CRC(b7bef762) SHA1(214450e0b094f99ef38dec2a3e5cbdb0b30e917d) ) - ROM_LOAD16_BYTE( "epra7406.11b", 0x020000, 0x8000, CRC(bb743639) SHA1(5d99638a79f02ce14374d3b1f3d9fbfc5c13c6e1) ) - ROM_LOAD16_BYTE( "epra7403.08b", 0x020001, 0x8000, CRC(d86250cf) SHA1(fb5dabb7b9b9fe0bbe93e28c60311c7b3256107a) ) // Fails memory test. Bad rom? - - ROM_REGION( 0x18000, REGION_GFX1, ROMREGION_DISPOSE ) /* tiles */ - ROM_LOAD( "epr-7051.09a", 0x00000, 0x08000, CRC(10ca255a) SHA1(ccf58ffcac2f7fbdbfbdf32601a1b97f359cbd91) ) - ROM_LOAD( "epr-7052.10a", 0x08000, 0x08000, CRC(2550db0e) SHA1(28f8d68f43d26f12793fe295c205cc86adc4e96a) ) - ROM_LOAD( "epr-7053.11a", 0x10000, 0x08000, CRC(5bfea038) SHA1(01dc6e14cc7bba9f7930e68573c441fa2841f49a) ) - - ROM_REGION( 0x50000, REGION_GFX2, 0 ) /* sprites */ - ROM_LOAD16_BYTE( "epr-7055.05a", 0x000001, 0x8000, CRC(1fb860bd) SHA1(4a4155d0352dfae9e402a2b2f1558ef17b1303b4) ) - ROM_LOAD16_BYTE( "epr-7059.02b", 0x000000, 0x8000, CRC(3d14091d) SHA1(36208415b2012b6e948fefa15b0f7041748066be) ) - ROM_LOAD16_BYTE( "epr-7056.06a", 0x010001, 0x8000, CRC(b35dd968) SHA1(e306b5e38acf583d7b2089302622ad25ae5564b0) ) - ROM_LOAD16_BYTE( "epr-7060.03b", 0x010000, 0x8000, CRC(61bb3757) SHA1(5c87cf23be22b84e3dae746527ca057d870d6397) ) - ROM_LOAD16_BYTE( "epr-7057.07a", 0x020001, 0x8000, CRC(3e5a2b6f) SHA1(d3dbafb4acb916e02c978a156008bd75ba122fb7) ) - ROM_LOAD16_BYTE( "epr-7061.04b", 0x020000, 0x8000, CRC(c808dad5) SHA1(9b65acc8dc23b16e56327298188d1a6ab48b2b5d) ) - ROM_LOAD16_BYTE( "epr-7058.08a", 0x030001, 0x8000, CRC(b543675f) SHA1(35ffc9295a8849a18fabe156fdbc9801ea2179cd) ) - ROM_LOAD16_BYTE( "epr-7062.05b", 0x030000, 0x8000, CRC(9168eb47) SHA1(daaa7836e627a0679e65373d8f20a9383ba4c905) ) -// ROM_LOAD16_BYTE( "epr-7055.05a", 0x040001, 0x8000, CRC(1fb860bd) SHA1(4a4155d0352dfae9e402a2b2f1558ef17b1303b4) ) loaded twice?? -// ROM_LOAD16_BYTE( "epr-7059.02b", 0x040000, 0x8000, CRC(3d14091d) SHA1(36208415b2012b6e948fefa15b0f7041748066be) ) loaded twice?? - - ROM_REGION( 0x20000, REGION_CPU2, 0 ) /* sound CPU */ - ROM_LOAD( "eprc7054.01b", 0x00000, 0x8000, CRC(4443b744) SHA1(73359a6e9d62b382dee47fea31b9e17eb26a0321) ) - - ROM_REGION( 0x1000, REGION_CPU3, 0 ) /* 4k for 7751 onboard ROM */ - ROM_LOAD( "7751.bin", 0x0000, 0x0400, CRC(6a9534fc) SHA1(67ad94674db5c2aab75785668f610f6f4eccd158) ) /* 7751 - U34 */ - - ROM_REGION( 0x20000, REGION_SOUND1, 0 ) /* 7751 sound data */ - ROM_LOAD( "epr-7063.01a", 0x00000, 0x8000, CRC(45d8908a) SHA1(e61f81f953c1a744ded36fed3b55774e4747af29) ) - ROM_LOAD( "epr-7065.02a", 0x08000, 0x8000, CRC(8c8f8cff) SHA1(fca5a916a8b25800ee5e8771e2ced0ed9bd737f4) ) - ROM_LOAD( "epr-7064.03a", 0x10000, 0x8000, CRC(159f6636) SHA1(66fa3f3e95a6ef3d3ff4ded09c05ab1131d9fbbb) ) - ROM_LOAD( "epr-7066.04a", 0x18000, 0x8000, CRC(f5cfa91f) SHA1(c85d68cbcd03fe1436bed12235c033610acc11ee) ) -ROM_END -#endif - ROM_START( passht4b ) ROM_REGION( 0x20000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "pas4p.3", 0x000000, 0x10000, CRC(2d8bc946) SHA1(35d3e529d4815543d9876fd0545c3d686467abaa) ) @@ -2632,7 +2466,6 @@ ROM_START( passht4b ) ROM_END /* Passing Shot Bootleg is a decrypted version of Passing Shot Japanese (passshtj). It has been heavily modified */ - ROM_START( passshtb ) ROM_REGION( 0x020000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "pass3_2p.bin", 0x000000, 0x10000, CRC(26bb9299) SHA1(11bacf86dfdd8bcfbfb61f0ebc59890325c48adc) ) @@ -2733,16 +2566,6 @@ ROM_START( shinobld ) ROM_LOAD( "16.bin", 0x0000, 0x10000, CRC(52c8364e) SHA1(01d30b82f92498d155d2e31d43d58dff0285cce3) ) ROM_END - -// sys16B - -// sys16A custom - -/* - - -*/ - // sys16B ROM_START( tetrisbl ) ROM_REGION( 0x040000, REGION_CPU1, ROMREGION_ERASEFF ) /* 68000 code */ @@ -2790,7 +2613,6 @@ ROM_START( tturfbl ) ROM_LOAD( "tt0246ff.rom", 0x20000, 0x10000, CRC(bb4bba8f) SHA1(b182a7e1d0425e93c2c1b93472aafd30a6af6907) ) ROM_END - // sys16B ROM_START( wb3bbl ) ROM_REGION( 0x040000, REGION_CPU1, 0 ) /* 68000 code */ @@ -2830,13 +2652,12 @@ GAME( 1987, shinobld, shinobi, shinob2, shinobi, shinobl, ROT0, "[Sega] (D /* System16B */ /* rom parent machine inp init */ - GAME( 1989, bayrtbl1, bayroute, bayroute, bayroute, bayrtbl1, ROT0, "bootleg", "Bay Route (bootleg set 1)", GAME_NOT_WORKING ) GAME( 1989, bayrtbl2, bayroute, bayroute, bayroute, bayrtbl1, ROT0, "bootleg", "Bay Route (bootleg set 2)", GAME_NOT_WORKING ) GAME( 1989, dduxbl, ddux, dduxbl, ddux, dduxbl, ROT0, "bootleg", "Dynamite Dux (bootleg)", 0 ) GAME( 1989, eswatbl, eswat, eswatbl, eswat, eswatbl, ROT0, "bootleg", "E-Swat - Cyber Police (bootleg)", GAME_IMPERFECT_SOUND ) -GAME( 1989, fpointbl, fpoint, fpointbl, fpoint, fpointbl, ROT0, "bootleg", "Flash Point (World, bootleg)", 0 ) -GAME( 1989, fpointbj, fpoint, fpointbl, fpointbj, fpointbl, ROT0, "bootleg", "Flash Point (Japan, bootleg)", 0 ) +GAME( 1989, fpointbl, fpoint, fpointbl, fpointbl, fpointbl, ROT0, "bootleg", "Flash Point (World, bootleg)", 0 ) +GAME( 1989, fpointbj, fpoint, fpointbl, fpointbl, fpointbl, ROT0, "bootleg", "Flash Point (Japan, bootleg)", 0 ) GAME( 1989, goldnabl, goldnaxe, goldnaxe, goldnaxe, goldnabl, ROT0, "bootleg", "Golden Axe (bootleg, encrypted)", GAME_NOT_WORKING ) GAME( 1989, goldnab2, goldnaxe, goldnaxe, goldnaxe, goldnabl, ROT0, "bootleg", "Golden Axe (bootleg)", GAME_NOT_WORKING ) @@ -2901,4 +2722,3 @@ ROM_END GAME( 1991, beautyb, 0, beautyb, tetris, beautyb, ROT0, "AMT", "Beauty Block", GAME_NO_SOUND|GAME_NOT_WORKING ) - diff --git a/src/mame/drivers/system18.c b/src/mame/drivers/system18.c index b29e524ec6a..4c5a4fa2028 100644 --- a/src/mame/drivers/system18.c +++ b/src/mame/drivers/system18.c @@ -77,9 +77,6 @@ extern WRITE16_HANDLER( segac2_vdp_w ); /***************************************************************************/ - - - static WRITE16_HANDLER( sys18_refreshenable_w ) { if(ACCESSING_BITS_0_7) @@ -486,14 +483,14 @@ static READ16_HANDLER( sys18_io_r ) if(io_reg[0x0F] & 0x01) return io_reg[0x00]; else - return input_port_read_indexed(machine, 0); + return input_port_read(machine, "P1"); break; case 0x01: /* Port B - 2P controls */ if(io_reg[0x0F] & 0x02) return io_reg[0x01]; else - return input_port_read_indexed(machine, 1); + return input_port_read(machine, "P2"); break; case 0x02: /* Port C - Bidirectional I/O port */ @@ -514,21 +511,21 @@ static READ16_HANDLER( sys18_io_r ) if(io_reg[0x0F] & 0x10) return io_reg[0x04]; else - return input_port_read_indexed(machine, 2); + return input_port_read(machine, "SERVICE"); break; case 0x05: /* Port F - DIP switch #1 */ if(io_reg[0x0F] & 0x20) return io_reg[0x05]; else - return input_port_read_indexed(machine, 3); + return input_port_read(machine, "DSW1"); break; case 0x06: /* Port G - DIP switch #2 */ if(io_reg[0x0F] & 0x40) return io_reg[0x06]; else - return input_port_read_indexed(machine, 4); + return input_port_read(machine, "P3"); break; case 0x07: /* Port H - Tile banking control */ @@ -641,13 +638,6 @@ static WRITE16_HANDLER( sys18_io_w ) } - -/***************************************************************************/ - - - - - /***************************************************************************/ /* Shadow Dancer (Bootleg) @@ -698,11 +688,11 @@ static ADDRESS_MAP_START( shdancbl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x840000, 0x840fff) AM_READ(SYS16_MRA16_PALETTERAM) AM_RANGE(0xc00000, 0xc0ffff) AM_READ(vdp_r) AM_RANGE(0xe40000, 0xe4ffff) AM_READ(sys18_io_r) - AM_RANGE(0xc40000, 0xc40001) AM_READ(input_port_3_word_r) // dip1 - AM_RANGE(0xc40002, 0xc40003) AM_READ(input_port_4_word_r) // dip2 - AM_RANGE(0xc41002, 0xc41003) AM_READ(input_port_0_word_r) // player1 - AM_RANGE(0xc41004, 0xc41005) AM_READ(input_port_1_word_r) // player2 - AM_RANGE(0xc41000, 0xc41001) AM_READ(input_port_2_word_r) // service + AM_RANGE(0xc40000, 0xc40001) AM_READ_PORT("COINAGE") + AM_RANGE(0xc40002, 0xc40003) AM_READ_PORT("DSW1") + AM_RANGE(0xc41002, 0xc41003) AM_READ_PORT("P1") + AM_RANGE(0xc41004, 0xc41005) AM_READ_PORT("P2") + AM_RANGE(0xc41000, 0xc41001) AM_READ_PORT("SERVICE") AM_RANGE(0xffc000, 0xffffff) AM_READ(SYS16_MRA16_WORKINGRAM) ADDRESS_MAP_END @@ -803,13 +793,13 @@ static ADDRESS_MAP_START( mwalkbl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x440000, 0x440fff) AM_READ(SYS16_MRA16_SPRITERAM) AM_RANGE(0x840000, 0x840fff) AM_READ(SYS16_MRA16_PALETTERAM) AM_RANGE(0xc00000, 0xc0ffff) AM_READ(vdp_r) - AM_RANGE(0xc40000, 0xc40001) AM_READ(input_port_3_word_r) // dip1 - AM_RANGE(0xc40002, 0xc40003) AM_READ(input_port_4_word_r) // dip2 - AM_RANGE(0xc41002, 0xc41003) AM_READ(input_port_0_word_r) // player1 - AM_RANGE(0xc41004, 0xc41005) AM_READ(input_port_1_word_r) // player2 - AM_RANGE(0xc41006, 0xc41007) AM_READ(input_port_5_word_r) // player3 + AM_RANGE(0xc40000, 0xc40001) AM_READ_PORT("COINAGE") + AM_RANGE(0xc40002, 0xc40003) AM_READ_PORT("DSW1") + AM_RANGE(0xc41002, 0xc41003) AM_READ_PORT("P1") + AM_RANGE(0xc41004, 0xc41005) AM_READ_PORT("P2") + AM_RANGE(0xc41006, 0xc41007) AM_READ_PORT("P3") AM_RANGE(0xc41008, 0xc41009) AM_READ(SMH_NOP) // figure this out, extra input for 3p? - AM_RANGE(0xc41000, 0xc41001) AM_READ(input_port_2_word_r) // service + AM_RANGE(0xc41000, 0xc41001) AM_READ_PORT("SERVICE") AM_RANGE(0xe40000, 0xe4ffff) AM_READ(SYS16_MRA16_EXTRAM2) AM_RANGE(0xffe02c, 0xffe02d) AM_READ(mwalkbl_skip_r) AM_RANGE(0xffc000, 0xffffff) AM_READ(SYS16_MRA16_WORKINGRAM) @@ -925,8 +915,6 @@ static DRIVER_INIT( mwalkbl ){ /***************************************************************************/ - - /* bootleg doesn't have real vdp or i/o */ static ADDRESS_MAP_START( astormbl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -935,12 +923,12 @@ static ADDRESS_MAP_START( astormbl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x110000, 0x110fff) AM_READ(SYS16_MRA16_TEXTRAM) AM_RANGE(0x140000, 0x140fff) AM_READ(SYS16_MRA16_PALETTERAM) AM_RANGE(0x200000, 0x200fff) AM_READ(SYS16_MRA16_SPRITERAM) - AM_RANGE(0xa00000, 0xa00001) AM_READ(input_port_3_word_r) // dip1 - AM_RANGE(0xa00002, 0xa00003) AM_READ(input_port_4_word_r) // dip2 - AM_RANGE(0xa01002, 0xa01003) AM_READ(input_port_0_word_r) // player1 - AM_RANGE(0xa01004, 0xa01005) AM_READ(input_port_1_word_r) // player2 - AM_RANGE(0xa01006, 0xa01007) AM_READ(input_port_5_word_r) // player3 - AM_RANGE(0xa01000, 0xa01001) AM_READ(input_port_2_word_r) // service + AM_RANGE(0xa00000, 0xa00001) AM_READ_PORT("COINAGE") + AM_RANGE(0xa00002, 0xa00003) AM_READ_PORT("DSW1") + AM_RANGE(0xa01002, 0xa01003) AM_READ_PORT("P1") + AM_RANGE(0xa01004, 0xa01005) AM_READ_PORT("P2") + AM_RANGE(0xa01006, 0xa01007) AM_READ_PORT("P3") + AM_RANGE(0xa01000, 0xa01001) AM_READ_PORT("SERVICE") AM_RANGE(0xc00000, 0xc0ffff) AM_READ(vdp_r) AM_RANGE(0xffc000, 0xffffff) AM_READ(SYS16_MRA16_WORKINGRAM) ADDRESS_MAP_END @@ -961,13 +949,8 @@ static ADDRESS_MAP_START( astormbl_writemem, ADDRESS_SPACE_PROGRAM, 16 ) ADDRESS_MAP_END - - - /***************************************************************************/ - - static void astormbl_update_proc( void ){ UINT16 data; sys16_fg_scrollx = sys16_textram[0x0e98/2]; @@ -1082,10 +1065,6 @@ static MACHINE_RESET( astormbl ){ } - - - - static DRIVER_INIT( astormbl ){ UINT8 *RAM= memory_region(machine, REGION_CPU2); static const int astormbl_sound_info[] = @@ -1106,8 +1085,6 @@ static DRIVER_INIT( astormbl ){ } - - /*****************************************************************************/ static MACHINE_DRIVER_START( system18 ) @@ -1156,7 +1133,6 @@ static MACHINE_DRIVER_START( system18 ) MACHINE_DRIVER_END - static MACHINE_DRIVER_START( astormbl ) /* basic machine hardware */ @@ -1168,8 +1144,6 @@ static MACHINE_DRIVER_START( astormbl ) MACHINE_DRIVER_END - - static MACHINE_DRIVER_START( mwalkbl ) /* basic machine hardware */ @@ -1181,8 +1155,6 @@ static MACHINE_DRIVER_START( mwalkbl ) MACHINE_DRIVER_END - - static MACHINE_DRIVER_START( shdancbl ) /* basic machine hardware */ @@ -1207,10 +1179,8 @@ MACHINE_DRIVER_END /***************************************************************************/ - - static INPUT_PORTS_START( astormbl ) - PORT_START /* player 1 */ + PORT_START_TAG("P1") /* player 1 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) @@ -1219,7 +1189,8 @@ static INPUT_PORTS_START( astormbl ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY - PORT_START /* player 2 */ + + PORT_START_TAG("P2") /* player 2 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) @@ -1228,7 +1199,8 @@ static INPUT_PORTS_START( astormbl ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) - PORT_START + + PORT_START_TAG("SERVICE") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW) @@ -1237,8 +1209,44 @@ static INPUT_PORTS_START( astormbl ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) - SYS16_COINAGE - PORT_START /* DSW1 */ + + PORT_START_TAG("COINAGE") + PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4") + PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) ) + PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x09, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x05, "2 Coins/1 Credit 5/3 6/4" ) + PORT_DIPSETTING( 0x04, "2 Coins/1 Credit 4/3" ) + PORT_DIPSETTING( 0x0f, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x01, "1 Coin/1 Credit 2/3" ) + PORT_DIPSETTING( 0x02, "1 Coin/1 Credit 4/5" ) + PORT_DIPSETTING( 0x03, "1 Coin/1 Credit 5/6" ) + PORT_DIPSETTING( 0x06, DEF_STR( 2C_3C ) ) + PORT_DIPSETTING( 0x0e, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x0d, DEF_STR( 1C_3C ) ) + PORT_DIPSETTING( 0x0c, DEF_STR( 1C_4C ) ) + PORT_DIPSETTING( 0x0b, DEF_STR( 1C_5C ) ) + PORT_DIPSETTING( 0x0a, DEF_STR( 1C_6C ) ) + PORT_DIPSETTING( 0x00, "Free Play (if Coin B too) or 1/1" ) + PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:5,6,7,8") + PORT_DIPSETTING( 0x70, DEF_STR( 4C_1C ) ) + PORT_DIPSETTING( 0x80, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0x90, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x50, "2 Coins/1 Credit 5/3 6/4" ) + PORT_DIPSETTING( 0x40, "2 Coins/1 Credit 4/3" ) + PORT_DIPSETTING( 0xf0, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x10, "1 Coin/1 Credit 2/3" ) + PORT_DIPSETTING( 0x20, "1 Coin/1 Credit 4/5" ) + PORT_DIPSETTING( 0x30, "1 Coin/1 Credit 5/6" ) + PORT_DIPSETTING( 0x60, DEF_STR( 2C_3C ) ) + PORT_DIPSETTING( 0xe0, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0xd0, DEF_STR( 1C_3C ) ) + PORT_DIPSETTING( 0xc0, DEF_STR( 1C_4C ) ) + PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ) ) + PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) ) + PORT_DIPSETTING( 0x00, "Free Play (if Coin A too) or 1/1" ) + + PORT_START_TAG("DSW1") /* DSW1 */ PORT_DIPNAME( 0x01, 0x01, "2 Credits to Start" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1263,7 +1271,8 @@ static INPUT_PORTS_START( astormbl ) PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unused ) ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* player 3 */ + + PORT_START_TAG("P3") /* player 3 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3) @@ -1275,41 +1284,14 @@ static INPUT_PORTS_START( astormbl ) INPUT_PORTS_END static INPUT_PORTS_START( mwalkbl ) - PORT_START /* player 1 */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY - PORT_START /* player 2 */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) - PORT_START /* service */ + PORT_INCLUDE( astormbl ) + + PORT_MODIFY("SERVICE") /* service */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - SYS16_COINAGE - PORT_START /* DSW1 */ - PORT_DIPNAME( 0x01, 0x01, "2 Credits to Start" ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x00, DEF_STR( Demo_Sounds ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + + PORT_MODIFY("DSW1") /* DSW1 */ PORT_DIPNAME( 0x04, 0x04, DEF_STR( Lives ) ) PORT_DIPSETTING( 0x04, "2" ) PORT_DIPSETTING( 0x00, "3" ) @@ -1327,23 +1309,13 @@ static INPUT_PORTS_START( mwalkbl ) PORT_DIPSETTING( 0xc0, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x40, DEF_STR( Hard ) ) PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) - PORT_START /* player 3 */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3) -// PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_MODIFY("P3") /* player 3 */ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START3 ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3) INPUT_PORTS_END - /*****************************************************************************/ - - ROM_START( astormbl ) ROM_REGION( 0x080000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "astorm.a6", 0x000000, 0x40000, CRC(7682ed3e) SHA1(b857352ad9c66488e91f60989472638c483e4ae8) ) @@ -1574,5 +1546,4 @@ GAME( 1990, astormb2, astorm, astormbl, astormbl, astormbl, ROT0, "bootleg", " GAME( 1990, mwalkbl, mwalk, mwalkbl, mwalkbl, mwalkbl, ROT0, "bootleg", "Michael Jackson's Moonwalker (bootleg)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND ) -GAME( 1989, shdancbl, shdancer, shdancbl, mwalkbl, shdancbl, ROT0, "bootleg", "Shadow Dancer (bootleg)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND ) - +GAME( 1989, shdancbl, shdancer, shdancbl, mwalkbl, shdancbl, ROT0, "bootleg", "Shadow Dancer (bootleg)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND ) diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c index 2c2a5c38590..e5106f65d38 100644 --- a/src/mame/drivers/taito_b.c +++ b/src/mame/drivers/taito_b.c @@ -169,6 +169,7 @@ Notes: #include "driver.h" #include "deprecat.h" +#include "taitoipt.h" #include "cpu/m68000/m68000.h" #include "video/taitoic.h" #include "machine/eeprom.h" @@ -328,35 +329,35 @@ static INTERRUPT_GEN( sbm_interrupt )//5 static READ16_HANDLER( tracky1_hi_r ) { - return input_port_read_indexed(machine,5); + return input_port_read(machine, "TRACKX1"); } static READ16_HANDLER( tracky1_lo_r ) { - return (input_port_read_indexed(machine,5) & 0xff) <<8; + return (input_port_read(machine, "TRACKX1") & 0xff) <<8; } static READ16_HANDLER( trackx1_hi_r ) { - return input_port_read_indexed(machine,6); + return input_port_read(machine, "TRACKY1"); } static READ16_HANDLER( trackx1_lo_r ) { - return (input_port_read_indexed(machine,6) & 0xff) <<8; + return (input_port_read(machine, "TRACKY1") & 0xff) <<8; } static READ16_HANDLER( tracky2_hi_r ) { - return input_port_read_indexed(machine,7); + return input_port_read(machine, "TRACKX2"); } static READ16_HANDLER( tracky2_lo_r ) { - return (input_port_read_indexed(machine,7) & 0xff) <<8; + return (input_port_read(machine, "TRACKX2") & 0xff) <<8; } static READ16_HANDLER( trackx2_hi_r ) { - return input_port_read_indexed(machine,8); + return input_port_read(machine, "TRACKY2"); } static READ16_HANDLER( trackx2_lo_r ) { - return (input_port_read_indexed(machine,8) & 0xff) <<8; + return (input_port_read(machine, "TRACKY2") & 0xff) <<8; } @@ -413,7 +414,7 @@ static READ16_HANDLER( eeprom_r ) int res; res = (eeprom_read_bit() & 0x01); - res |= input_port_read_indexed(machine,1) & 0xfe; /* coin inputs */ + res |= input_port_read(machine, "IN1") & 0xfe; /* coin inputs */ return res; } @@ -482,10 +483,10 @@ static READ16_HANDLER( pbobble_input_bypass_r ) switch (offset) { case 0x01: - return eeprom_r(machine,0,mem_mask) << 8; + return eeprom_r(machine, 0, mem_mask) << 8; default: - return TC0640FIO_r( machine,offset ) << 8; + return TC0640FIO_r(machine, offset) << 8; } } @@ -633,7 +634,7 @@ static ADDRESS_MAP_START( hitice_readmem, ADDRESS_SPACE_PROGRAM, 16 ) TC0180VCU_MEMR( 0x400000 ) AM_RANGE(0x600000, 0x60000f) AM_READ(TC0220IOC_halfword_byteswap_r) - AM_RANGE(0x610000, 0x610001) AM_READ(input_port_5_word_r) /* player 3,4 inputs*/ + AM_RANGE(0x610000, 0x610001) AM_READ_PORT("P3_P4") AM_RANGE(0x700000, 0x700001) AM_READ(SMH_NOP) AM_RANGE(0x700002, 0x700003) AM_READ(taitosound_comm16_msb_r) @@ -707,9 +708,9 @@ static ADDRESS_MAP_START( pbobble_readmem, ADDRESS_SPACE_PROGRAM, 16 ) TC0180VCU_MEMR( 0x400000 ) AM_RANGE(0x500000, 0x50000f) AM_READ(pbobble_input_bypass_r) - AM_RANGE(0x500024, 0x500025) AM_READ(input_port_5_word_r) /* shown in service mode, game omits to read it */ + AM_RANGE(0x500024, 0x500025) AM_READ_PORT("IN5") /* shown in service mode, game omits to read it */ AM_RANGE(0x500026, 0x500027) AM_READ(eep_latch_r) /* not read by this game */ - AM_RANGE(0x50002e, 0x50002f) AM_READ(input_port_6_word_r) /* shown in service mode, game omits to read it */ + AM_RANGE(0x50002e, 0x50002f) AM_READ_PORT("IN6") /* shown in service mode, game omits to read it */ AM_RANGE(0x700000, 0x700001) AM_READ(SMH_NOP) AM_RANGE(0x700002, 0x700003) AM_READ(taitosound_comm16_msb_r) @@ -741,9 +742,9 @@ static ADDRESS_MAP_START( spacedx_readmem, ADDRESS_SPACE_PROGRAM, 16 ) TC0180VCU_MEMR( 0x400000 ) AM_RANGE(0x500000, 0x50000f) AM_READ(pbobble_input_bypass_r) - AM_RANGE(0x500024, 0x500025) AM_READ(input_port_5_word_r) + AM_RANGE(0x500024, 0x500025) AM_READ_PORT("IN5") AM_RANGE(0x500026, 0x500027) AM_READ(eep_latch_r) - AM_RANGE(0x50002e, 0x50002f) AM_READ(input_port_6_word_r) + AM_RANGE(0x50002e, 0x50002f) AM_READ_PORT("IN6") AM_RANGE(0x700000, 0x700001) AM_READ(SMH_NOP) AM_RANGE(0x700002, 0x700003) AM_READ(taitosound_comm16_msb_r) @@ -775,9 +776,9 @@ static ADDRESS_MAP_START( spacedxo_readmem, ADDRESS_SPACE_PROGRAM, 16 ) TC0180VCU_MEMR( 0x500000 ) AM_RANGE(0x200000, 0x20000f) AM_READ(TC0220IOC_halfword_r) - AM_RANGE(0x210000, 0x210001) AM_READ(input_port_5_word_r) - AM_RANGE(0x220000, 0x220001) AM_READ(input_port_6_word_r) - AM_RANGE(0x230000, 0x230001) AM_READ(input_port_7_word_r) + AM_RANGE(0x210000, 0x210001) AM_READ_PORT("IN5") + AM_RANGE(0x220000, 0x220001) AM_READ_PORT("IN6") + AM_RANGE(0x230000, 0x230001) AM_READ_PORT("IN7") AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP) AM_RANGE(0x100002, 0x100003) AM_READ(taitosound_comm16_msb_r) @@ -806,9 +807,9 @@ static ADDRESS_MAP_START( qzshowby_readmem, ADDRESS_SPACE_PROGRAM, 16 ) TC0180VCU_MEMR( 0x400000 ) AM_RANGE(0x200000, 0x20000f) AM_READ(pbobble_input_bypass_r) - AM_RANGE(0x200024, 0x200025) AM_READ(input_port_5_word_r) /* player 3,4 start */ + AM_RANGE(0x200024, 0x200025) AM_READ_PORT("IN5") /* player 3,4 start */ AM_RANGE(0x200028, 0x200029) AM_READ(player_34_coin_ctrl_r) - AM_RANGE(0x20002e, 0x20002f) AM_READ(input_port_6_word_r) /* player 3,4 buttons */ + AM_RANGE(0x20002e, 0x20002f) AM_READ_PORT("IN6") /* player 3,4 buttons */ AM_RANGE(0x600000, 0x600001) AM_READ(SMH_NOP) AM_RANGE(0x600002, 0x600003) AM_READ(taitosound_comm16_msb_r) @@ -901,9 +902,9 @@ static ADDRESS_MAP_START( silentd_readmem, ADDRESS_SPACE_PROGRAM, 16 ) TC0180VCU_MEMR( 0x500000 ) AM_RANGE(0x200000, 0x20000f) AM_READ(TC0220IOC_halfword_r) - AM_RANGE(0x210000, 0x210001) AM_READ(input_port_5_word_r) - AM_RANGE(0x220000, 0x220001) AM_READ(input_port_6_word_r) - AM_RANGE(0x230000, 0x230001) AM_READ(input_port_7_word_r) + AM_RANGE(0x210000, 0x210001) AM_READ_PORT("IN5") + AM_RANGE(0x220000, 0x220001) AM_READ_PORT("IN6") + AM_RANGE(0x230000, 0x230001) AM_READ_PORT("IN7") // AM_RANGE(0x240000, 0x240001) AM_READ(SMH_NOP) /* read 4 times at init */ AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP) @@ -1058,71 +1059,6 @@ ADDRESS_MAP_END INPUT PORTS, DIPs ***********************************************************/ -#define TAITO_COINAGE_JAPAN_8 \ - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) ) \ - PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) \ - PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) ) \ - PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_B ) ) \ - PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) \ - PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) ) - -#define TAITO_COINAGE_WORLD_8 \ - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) ) \ - PORT_DIPSETTING( 0x10, DEF_STR( 3C_1C ) ) \ - PORT_DIPSETTING( 0x20, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) \ - PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_B ) ) \ - PORT_DIPSETTING( 0xc0, DEF_STR( 1C_2C ) ) \ - PORT_DIPSETTING( 0x80, DEF_STR( 1C_3C ) ) \ - PORT_DIPSETTING( 0x40, DEF_STR( 1C_4C ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 1C_6C ) ) - -#define TAITO_COINAGE_US_8 \ - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coinage ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) ) \ - PORT_DIPSETTING( 0x10, DEF_STR( 3C_1C ) ) \ - PORT_DIPSETTING( 0x20, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) \ - PORT_DIPNAME( 0xc0, 0xc0, "Price to Continue" ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) ) \ - PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0x80, DEF_STR( 1C_1C ) ) \ - PORT_DIPSETTING( 0xc0, "Same as Start" ) - -#define TAITO_COINAGE_JAPAN_NEW_8 \ - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) ) \ - PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) \ - PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) ) \ - PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_B ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) ) \ - PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) ) \ - PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) ) - -#define TAITO_DIFFICULTY_8 \ - PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) \ - PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) \ - PORT_DIPSETTING( 0x03, DEF_STR( Medium ) ) \ - PORT_DIPSETTING( 0x01, DEF_STR( Hard ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) - - -/* Included only the bits that are common to all sets (viofight has 3 buttons) */ -#define TAITO_B_PLAYERS_INPUT( player ) \ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(player) PORT_8WAY \ - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(player) PORT_8WAY \ - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(player) PORT_8WAY \ - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(player) PORT_8WAY \ - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(player) \ - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(player) - #define TAITO_B_SYSTEM_INPUT \ PORT_START_TAG("IN2") \ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT ) \ @@ -1134,26 +1070,14 @@ ADDRESS_MAP_END PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 ) \ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) -#define TAITO_B_DSWA_2_4 \ - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) ) \ - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) \ - PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) \ - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) \ - PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - static INPUT_PORTS_START( rastsag2 ) PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) // all 2 "unused" in manual - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - TAITO_B_DSWA_2_4 - TAITO_COINAGE_JAPAN_8 + TAITO_MACHINE_NO_COCKTAIL // all 2 "unused" in manual + TAITO_COINAGE_JAPAN_OLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPSETTING( 0x0c, "100k only" ) PORT_DIPSETTING( 0x08, "150k only" ) @@ -1172,29 +1096,21 @@ static INPUT_PORTS_START( rastsag2 ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START_TAG("IN0") - TAITO_B_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + TAITO_JOY_UDLR_2_BUTTONS( 1 ) PORT_START_TAG("IN1") - TAITO_B_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + TAITO_JOY_UDLR_2_BUTTONS( 2 ) - /* IN2 */ TAITO_B_SYSTEM_INPUT INPUT_PORTS_END static INPUT_PORTS_START( nastar ) PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - TAITO_B_DSWA_2_4 - TAITO_COINAGE_WORLD_8 + TAITO_MACHINE_NO_COCKTAIL + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPSETTING( 0x0c, "100k only" ) PORT_DIPSETTING( 0x08, "150k only" ) @@ -1212,30 +1128,22 @@ static INPUT_PORTS_START( nastar ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* IN0 */ - TAITO_B_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_START_TAG("IN0") + TAITO_JOY_UDLR_2_BUTTONS( 1 ) - PORT_START /* IN1 */ - TAITO_B_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_START_TAG("IN1") + TAITO_JOY_UDLR_2_BUTTONS( 2 ) - /* IN2 */ TAITO_B_SYSTEM_INPUT INPUT_PORTS_END static INPUT_PORTS_START( nastarw ) PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) ) - TAITO_B_DSWA_2_4 - TAITO_COINAGE_US_8 + TAITO_MACHINE_COCKTAIL + TAITO_COINAGE_US PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPSETTING( 0x0c, "100k only" ) PORT_DIPSETTING( 0x08, "150k only" ) @@ -1254,29 +1162,21 @@ static INPUT_PORTS_START( nastarw ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START_TAG("IN0") - TAITO_B_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + TAITO_JOY_UDLR_2_BUTTONS( 1 ) PORT_START_TAG("IN1") - TAITO_B_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + TAITO_JOY_UDLR_2_BUTTONS( 2 ) - /* IN2 */ TAITO_B_SYSTEM_INPUT INPUT_PORTS_END static INPUT_PORTS_START( masterw ) PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) ) - TAITO_B_DSWA_2_4 - TAITO_COINAGE_WORLD_8 + TAITO_MACHINE_COCKTAIL + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPSETTING( 0x08, "500k, 1000k and 1500k" ) PORT_DIPSETTING( 0x0c, "500k and 1000k" ) @@ -1295,18 +1195,12 @@ static INPUT_PORTS_START( masterw ) PORT_DIPSETTING( 0x00, "Hover Cycle" ) PORT_START_TAG("IN0") - TAITO_B_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + TAITO_JOY_UDLR_2_BUTTONS( 1 ) PORT_START_TAG("IN1") - TAITO_B_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + TAITO_JOY_UDLR_2_BUTTONS( 2 ) - /* IN2 */ TAITO_B_SYSTEM_INPUT - INPUT_PORTS_END static INPUT_PORTS_START( crimec ) @@ -1314,11 +1208,11 @@ static INPUT_PORTS_START( crimec ) PORT_DIPNAME( 0x01, 0x01, "Hi Score" ) PORT_DIPSETTING( 0x01, "Scribble" ) PORT_DIPSETTING( 0x00, "3 Characters" ) - TAITO_B_DSWA_2_4 - TAITO_COINAGE_WORLD_8 + TAITO_DSWA_BITS_1_TO_3 + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPSETTING( 0x08, "every 80k" ) PORT_DIPSETTING( 0x0c, "80k only" ) @@ -1336,16 +1230,11 @@ static INPUT_PORTS_START( crimec ) PORT_DIPSETTING( 0xc0, DEF_STR( On ) ) PORT_START_TAG("IN0") - TAITO_B_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + TAITO_JOY_UDLR_2_BUTTONS( 1 ) PORT_START_TAG("IN1") - TAITO_B_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + TAITO_JOY_UDLR_2_BUTTONS( 2 ) - /* IN2 */ TAITO_B_SYSTEM_INPUT INPUT_PORTS_END @@ -1354,11 +1243,11 @@ static INPUT_PORTS_START( crimecj ) PORT_DIPNAME( 0x01, 0x01, "Hi Score" ) PORT_DIPSETTING( 0x01, "Scribble" ) PORT_DIPSETTING( 0x00, "3 Characters" ) - TAITO_B_DSWA_2_4 - TAITO_COINAGE_JAPAN_8 + TAITO_DSWA_BITS_1_TO_3 + TAITO_COINAGE_JAPAN_OLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPSETTING( 0x08, "every 80k" ) PORT_DIPSETTING( 0x0c, "80k only" ) @@ -1376,16 +1265,11 @@ static INPUT_PORTS_START( crimecj ) PORT_DIPSETTING( 0xc0, DEF_STR( On ) ) PORT_START_TAG("IN0") - TAITO_B_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + TAITO_JOY_UDLR_2_BUTTONS( 1 ) PORT_START_TAG("IN1") - TAITO_B_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + TAITO_JOY_UDLR_2_BUTTONS( 2 ) - /* IN2 */ TAITO_B_SYSTEM_INPUT INPUT_PORTS_END @@ -1394,11 +1278,11 @@ static INPUT_PORTS_START( crimecu ) PORT_DIPNAME( 0x01, 0x01, "Hi Score" ) PORT_DIPSETTING( 0x01, "Scribble" ) PORT_DIPSETTING( 0x00, "3 Characters" ) - TAITO_B_DSWA_2_4 - TAITO_COINAGE_US_8 + TAITO_DSWA_BITS_1_TO_3 + TAITO_COINAGE_US PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPSETTING( 0x08, "every 80k" ) PORT_DIPSETTING( 0x0c, "80k only" ) @@ -1416,16 +1300,11 @@ static INPUT_PORTS_START( crimecu ) PORT_DIPSETTING( 0xc0, DEF_STR( On ) ) PORT_START_TAG("IN0") - TAITO_B_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + TAITO_JOY_UDLR_2_BUTTONS( 1 ) PORT_START_TAG("IN1") - TAITO_B_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + TAITO_JOY_UDLR_2_BUTTONS( 2 ) - /* IN2 */ TAITO_B_SYSTEM_INPUT INPUT_PORTS_END @@ -1434,11 +1313,11 @@ static INPUT_PORTS_START( tetrist ) PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - TAITO_B_DSWA_2_4 - TAITO_COINAGE_JAPAN_8 + TAITO_DSWA_BITS_1_TO_3 + TAITO_COINAGE_JAPAN_OLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1459,29 +1338,21 @@ static INPUT_PORTS_START( tetrist ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START_TAG("IN0") - TAITO_B_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + TAITO_JOY_UDLR_2_BUTTONS( 1 ) PORT_START_TAG("IN1") - TAITO_B_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + TAITO_JOY_UDLR_2_BUTTONS( 2 ) - /* IN2 */ TAITO_B_SYSTEM_INPUT INPUT_PORTS_END static INPUT_PORTS_START( ashura ) PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) ) - TAITO_B_DSWA_2_4 - TAITO_COINAGE_JAPAN_8 + TAITO_MACHINE_COCKTAIL + TAITO_COINAGE_JAPAN_OLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPSETTING( 0x08, "every 100k" ) PORT_DIPSETTING( 0x0c, "every 150k" ) @@ -1500,29 +1371,21 @@ static INPUT_PORTS_START( ashura ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START_TAG("IN0") - TAITO_B_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + TAITO_JOY_UDLR_2_BUTTONS( 1 ) PORT_START_TAG("IN1") - TAITO_B_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + TAITO_JOY_UDLR_2_BUTTONS( 2 ) - /* IN2 */ TAITO_B_SYSTEM_INPUT INPUT_PORTS_END static INPUT_PORTS_START( ashurau ) PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) ) - TAITO_B_DSWA_2_4 - TAITO_COINAGE_US_8 + TAITO_MACHINE_COCKTAIL + TAITO_COINAGE_US PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPSETTING( 0x08, "every 100k" ) PORT_DIPSETTING( 0x0c, "every 150k" ) @@ -1541,16 +1404,11 @@ static INPUT_PORTS_START( ashurau ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START_TAG("IN0") - TAITO_B_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + TAITO_JOY_UDLR_2_BUTTONS( 1 ) PORT_START_TAG("IN1") - TAITO_B_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + TAITO_JOY_UDLR_2_BUTTONS( 2 ) - /* IN2 */ TAITO_B_SYSTEM_INPUT INPUT_PORTS_END @@ -1611,10 +1469,10 @@ static INPUT_PORTS_START( hitice ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_8 + TAITO_COINAGE_JAPAN_OLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, "Timer count" ) PORT_DIPSETTING( 0x0c, "1 sec = 58/60" ) PORT_DIPSETTING( 0x04, "1 sec = 56/60" ) @@ -1663,7 +1521,7 @@ static INPUT_PORTS_START( hitice ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) - PORT_START_TAG("IN56") /* IN5 IN6 */ + PORT_START_TAG("P3_P4") /* IN5 IN6 */ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3) @@ -1684,14 +1542,11 @@ INPUT_PORTS_END static INPUT_PORTS_START( rambo3 ) PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) // all 5 "unused" in manual - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - TAITO_B_DSWA_2_4 - TAITO_COINAGE_WORLD_8 + TAITO_MACHINE_NO_COCKTAIL // all 5 "unused" in manual + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1712,25 +1567,17 @@ static INPUT_PORTS_START( rambo3 ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START_TAG("IN0") - TAITO_B_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + TAITO_JOY_UDLR_2_BUTTONS( 1 ) PORT_START_TAG("IN1") - TAITO_B_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + TAITO_JOY_UDLR_2_BUTTONS( 2 ) - /* IN2 */ TAITO_B_SYSTEM_INPUT INPUT_PORTS_END static INPUT_PORTS_START( rambo3a ) - PORT_START /* DSW A */ - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - TAITO_B_DSWA_2_4 + PORT_START_TAG("DSWA") /* DSW A */ + TAITO_MACHINE_NO_COCKTAIL /* Coinage similar to US, but there are some differences */ PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x10, DEF_STR( 3C_1C ) ) @@ -1744,7 +1591,7 @@ static INPUT_PORTS_START( rambo3a ) PORT_DIPSETTING( 0x00, "Same as Start or 1C/1C (if Coinage 4C/3C)" ) PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1794,16 +1641,16 @@ static INPUT_PORTS_START( rambo3a ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) - PORT_START_TAG("IN3") + PORT_START_TAG("TRACKX1") PORT_BIT( 0xffff, 0x0000, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(70) PORT_KEYDELTA(30) PORT_REVERSE PORT_PLAYER(1) - PORT_START_TAG("IN4") + PORT_START_TAG("TRACKY1") PORT_BIT( 0xffff, 0x0000, IPT_TRACKBALL_X ) PORT_SENSITIVITY(70) PORT_KEYDELTA(30) PORT_PLAYER(1) - PORT_START_TAG("IN5") + PORT_START_TAG("TRACKX2") PORT_BIT( 0xffff, 0x0000, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(70) PORT_KEYDELTA(30) PORT_REVERSE PORT_PLAYER(2) - PORT_START_TAG("IN6") + PORT_START_TAG("TRACKY2") PORT_BIT( 0xffff, 0x0000, IPT_TRACKBALL_X ) PORT_SENSITIVITY(70) PORT_KEYDELTA(30) PORT_PLAYER(2) INPUT_PORTS_END @@ -1884,14 +1731,11 @@ INPUT_PORTS_END static INPUT_PORTS_START( spacedxo ) PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) ) - TAITO_B_DSWA_2_4 - TAITO_COINAGE_JAPAN_NEW_8 + TAITO_MACHINE_COCKTAIL + TAITO_COINAGE_JAPAN_NEW PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, "Match Point" ) PORT_DIPSETTING( 0x08, "4" ) PORT_DIPSETTING( 0x0c, "3" ) @@ -1968,7 +1812,6 @@ static INPUT_PORTS_START( spacedxo ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - INPUT_PORTS_END static INPUT_PORTS_START( qzshowby ) @@ -2045,14 +1888,11 @@ INPUT_PORTS_END static INPUT_PORTS_START( viofight ) PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) // all 7 "unused" in manual - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - TAITO_B_DSWA_2_4 - TAITO_COINAGE_WORLD_8 + TAITO_MACHINE_NO_COCKTAIL // all 7 "unused" in manual + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2073,31 +1913,17 @@ static INPUT_PORTS_START( viofight ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START_TAG("IN0") - TAITO_B_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + TAITO_JOY_UDLR_3_BUTTONS( 1 ) PORT_START_TAG("IN1") - TAITO_B_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + TAITO_JOY_UDLR_2_BUTTONS( 2 ) - /* IN2 */ TAITO_B_SYSTEM_INPUT INPUT_PORTS_END static INPUT_PORTS_START( silentd ) /* World Version */ PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) /* Listed as "NOT USED" in the manual and only shown as "OFF" */ - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x08, DEF_STR( On ) ) + TAITO_MACHINE_NO_COCKTAIL /* Listed as "NOT USED" in the manual and only shown as "OFF" */ PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x10, DEF_STR( 3C_1C ) ) @@ -2121,7 +1947,7 @@ static INPUT_PORTS_START( silentd ) /* World Version */ PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, "Invulnerability (Cheat)" ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2212,20 +2038,11 @@ INPUT_PORTS_END static INPUT_PORTS_START( silentdj ) PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) /* Listed as "NOT USED" in the manual and only shown as "OFF" */ - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_8 + TAITO_MACHINE_NO_COCKTAIL /* Listed as "NOT USED" in the manual and only shown as "OFF" */ + TAITO_COINAGE_JAPAN_OLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, "Invulnerability (Cheat)" ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2307,14 +2124,11 @@ INPUT_PORTS_END static INPUT_PORTS_START( selfeena ) PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - TAITO_B_DSWA_2_4 - TAITO_COINAGE_JAPAN_NEW_8 + TAITO_MACHINE_NO_COCKTAIL + TAITO_COINAGE_JAPAN_NEW PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPSETTING( 0x0c, "100k only" ) PORT_DIPSETTING( 0x08, "200k only" ) @@ -2365,14 +2179,11 @@ INPUT_PORTS_END static INPUT_PORTS_START( ryujin ) PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - TAITO_B_DSWA_2_4 - TAITO_COINAGE_JAPAN_NEW_8 + TAITO_MACHINE_NO_COCKTAIL + TAITO_COINAGE_JAPAN_NEW PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Lives ) ) PORT_DIPSETTING( 0x00, "1" ) PORT_DIPSETTING( 0x04, "2" ) @@ -2447,7 +2258,7 @@ static INPUT_PORTS_START( sbm ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START_TAG("DSWB") /* DSW B */ //+-ok - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c index 8f77d1ca2a0..e22801adf4b 100644 --- a/src/mame/drivers/taito_f2.c +++ b/src/mame/drivers/taito_f2.c @@ -289,6 +289,7 @@ Notes: ***************************************************************************/ #include "driver.h" +#include "taitoipt.h" #include "cpu/m68000/m68000.h" #include "video/taitoic.h" #include "audio/taitosnd.h" @@ -359,13 +360,13 @@ static READ16_HANDLER( growl_dsw_r ) switch (offset) { case 0x00: - return input_port_read_indexed(machine,3); /* DSW A */ + return input_port_read(machine, "DSWA"); case 0x01: - return input_port_read_indexed(machine,4); /* DSW B */ + return input_port_read(machine, "DSWB"); } -logerror("CPU #0 PC %06x: warning - read unmapped dsw_r offset %06x\n",activecpu_get_pc(),offset); + logerror("CPU #0 PC %06x: warning - read unmapped dsw_r offset %06x\n", activecpu_get_pc(), offset); return 0xff; } @@ -375,17 +376,17 @@ static READ16_HANDLER( growl_input_r ) switch (offset) { case 0x00: - return input_port_read_indexed(machine,0); /* IN0 */ + return input_port_read(machine, "IN0"); case 0x01: - return input_port_read_indexed(machine,1); /* IN1 */ + return input_port_read(machine, "IN1"); case 0x02: - return input_port_read_indexed(machine,2); /* IN2 */ + return input_port_read(machine, "IN2"); } -logerror("CPU #0 PC %06x: warning - read unmapped input_r offset %06x\n",activecpu_get_pc(),offset); + logerror("CPU #0 PC %06x: warning - read unmapped input_r offset %06x\n", activecpu_get_pc(), offset); return 0xff; } @@ -395,31 +396,31 @@ static READ16_HANDLER( footchmp_input_r ) switch (offset) { case 0x00: - return input_port_read_indexed(machine,3); /* DSW A */ + return input_port_read(machine, "DSWA"); case 0x01: - return input_port_read_indexed(machine,4); /* DSW B */ + return input_port_read(machine, "DSWB"); case 0x02: - return input_port_read_indexed(machine,2); /* IN2 */ + return input_port_read(machine, "IN2"); -// case 0x03: -// return (coin_word & mem_mask); +// case 0x03: +// return (coin_word & mem_mask); case 0x05: - return input_port_read_indexed(machine,0); /* IN0 */ + return input_port_read(machine, "IN0"); case 0x06: - return input_port_read_indexed(machine,1); /* IN1 */ + return input_port_read(machine, "IN1"); case 0x07: - return input_port_read_indexed(machine,5); /* IN3 */ + return input_port_read(machine, "IN3"); case 0x08: - return input_port_read_indexed(machine,6); /* IN4 */ + return input_port_read(machine, "IN4"); } -logerror("CPU #0 PC %06x: warning - read unmapped input offset %06x\n",activecpu_get_pc(),offset); + logerror("CPU #0 PC %06x: warning - read unmapped input offset %06x\n", activecpu_get_pc(), offset); return 0xff; } @@ -429,31 +430,31 @@ static READ16_HANDLER( ninjak_input_r ) switch (offset) { case 0x00: - return (input_port_read_indexed(machine,3) << 8); /* DSW A */ + return (input_port_read(machine, "DSWA") << 8); case 0x01: - return (input_port_read_indexed(machine,4) << 8); /* DSW B */ + return (input_port_read(machine, "DSWB") << 8); case 0x02: - return (input_port_read_indexed(machine,0) << 8); /* IN 0 */ + return (input_port_read(machine, "IN0") << 8); case 0x03: - return (input_port_read_indexed(machine,1) << 8); /* IN 1 */ + return (input_port_read(machine, "IN1") << 8); case 0x04: - return (input_port_read_indexed(machine,5) << 8); /* IN 3 */ + return (input_port_read(machine, "IN3") << 8); case 0x05: - return (input_port_read_indexed(machine,6) << 8); /* IN 4 */ + return (input_port_read(machine, "IN4") << 8); case 0x06: - return (input_port_read_indexed(machine,2) << 8); /* IN 2 */ + return (input_port_read(machine, "IN2") << 8); -// case 0x07: -// return (coin_word & mem_mask); +// case 0x07: +// return (coin_word & mem_mask); } -logerror("CPU #0 PC %06x: warning - read unmapped input offset %06x\n",activecpu_get_pc(),offset); + logerror("CPU #0 PC %06x: warning - read unmapped input offset %06x\n", activecpu_get_pc(), offset); return 0xff; } @@ -466,19 +467,19 @@ static READ16_HANDLER( cameltry_paddle_r ) switch (offset) { case 0x00: - curr = input_port_read_indexed(machine,5); /* Paddle A */ + curr = input_port_read(machine, "PADDLE1"); res = curr - last[0]; last[0] = curr; return res; case 0x02: - curr = input_port_read_indexed(machine,6); /* Paddle B */ + curr = input_port_read(machine, "PADDLE2"); res = curr - last[1]; last[1] = curr; return res; } -logerror("CPU #0 PC %06x: warning - read unmapped paddle offset %06x\n",activecpu_get_pc(),offset); + logerror("CPU #0 PC %06x: warning - read unmapped paddle offset %06x\n", activecpu_get_pc(), offset); return 0; } @@ -488,13 +489,13 @@ static READ16_HANDLER( driftout_paddle_r ) switch (offset) { case 0x00: - return input_port_read_indexed(machine,5); /* Paddle A */ + return input_port_read(machine, "PADDLE1"); case 0x01: - return input_port_read_indexed(machine,6); /* Paddle B */ + return input_port_read(machine, "PADDLE2"); } -logerror("CPU #0 PC %06x: warning - read unmapped paddle offset %06x\n",activecpu_get_pc(),offset); + logerror("CPU #0 PC %06x: warning - read unmapped paddle offset %06x\n", activecpu_get_pc(), offset); return 0xff; } @@ -504,25 +505,25 @@ static READ16_HANDLER( deadconx_input_r ) switch (offset) { case 0x00: - return input_port_read_indexed(machine,3); /* DSW A */ + return input_port_read(machine, "DSWA"); case 0x01: - return input_port_read_indexed(machine,4); /* DSW B */ + return input_port_read(machine, "DSWB"); case 0x02: - return input_port_read_indexed(machine,2); /* IN2 */ + return input_port_read(machine, "IN2"); -// case 0x03: -// return (coin_word & mem_mask); +// case 0x03: +// return (coin_word & mem_mask); case 0x05: - return input_port_read_indexed(machine,0); /* IN0 */ + return input_port_read(machine, "IN0"); case 0x06: - return input_port_read_indexed(machine,1); /* IN1 */ + return input_port_read(machine, "IN1"); } -logerror("CPU #0 PC %06x: warning - read unmapped input offset %06x\n",activecpu_get_pc(),offset); + logerror("CPU #0 PC %06x: warning - read unmapped input offset %06x\n", activecpu_get_pc(), offset); return 0xff; } @@ -533,16 +534,16 @@ static READ16_HANDLER( mjnquest_dsw_r ) { case 0x00: { - return (input_port_read_indexed(machine,5) << 8) + input_port_read_indexed(machine,7); /* DSW A + coin */ + return (input_port_read(machine, "IN5") << 8) + input_port_read(machine, "DSWA"); /* DSW A + coin */ } case 0x01: { - return (input_port_read_indexed(machine,6) << 8) + input_port_read_indexed(machine,8); /* DSW B + coin */ + return (input_port_read(machine, "IN6") << 8) + input_port_read(machine, "DSWB"); /* DSW B + coin */ } } - logerror("CPU #0 PC %06x: warning - read unmapped dsw_r offset %06x\n",activecpu_get_pc(),offset); + logerror("CPU #0 PC %06x: warning - read unmapped dsw_r offset %06x\n", activecpu_get_pc(), offset); return 0xff; } @@ -552,23 +553,23 @@ static READ16_HANDLER( mjnquest_input_r ) switch (mjnquest_input) { case 0x01: - return input_port_read_indexed(machine,0); /* IN0 */ + return input_port_read(machine, "IN0"); case 0x02: - return input_port_read_indexed(machine,1); /* IN1 */ + return input_port_read(machine, "IN1"); case 0x04: - return input_port_read_indexed(machine,2); /* IN2 */ + return input_port_read(machine, "IN2"); case 0x08: - return input_port_read_indexed(machine,3); /* IN3 */ + return input_port_read(machine, "IN3"); case 0x10: - return input_port_read_indexed(machine,4); /* IN4 */ + return input_port_read(machine, "IN4"); } -logerror("CPU #0 mjnquest_input %06x: warning - read unknown input %06x\n",activecpu_get_pc(),mjnquest_input); + logerror("CPU #0 mjnquest_input %06x: warning - read unknown input %06x\n", activecpu_get_pc(), mjnquest_input); return 0xff; } @@ -583,13 +584,13 @@ static READ16_HANDLER( quizhq_input1_r ) switch (offset) { case 0x00: - return input_port_read_indexed(machine,4); /* DSW B */ + return input_port_read(machine, "DSWB"); case 0x01: - return input_port_read_indexed(machine,0); /* IN0 */ + return input_port_read(machine, "IN0"); } -logerror("CPU #0 PC %06x: warning - read unmapped input_r offset %06x\n",activecpu_get_pc(),offset); + logerror("CPU #0 PC %06x: warning - read unmapped input_r offset %06x\n", activecpu_get_pc(), offset); return 0xff; } @@ -599,16 +600,16 @@ static READ16_HANDLER( quizhq_input2_r ) switch (offset) { case 0x00: - return input_port_read_indexed(machine,3); /* DSW A */ + return input_port_read(machine, "DSWA"); case 0x01: - return input_port_read_indexed(machine,1); /* IN1 */ + return input_port_read(machine, "IN1"); case 0x02: - return input_port_read_indexed(machine,2); /* IN2 */ + return input_port_read(machine, "IN2"); } -logerror("CPU #0 PC %06x: warning - read unmapped input_r offset %06x\n",activecpu_get_pc(),offset); + logerror("CPU #0 PC %06x: warning - read unmapped input_r offset %06x\n", activecpu_get_pc(), offset); return 0xff; } @@ -618,16 +619,16 @@ static READ16_HANDLER( yesnoj_input_r ) switch (offset) { case 0x00: - return input_port_read_indexed(machine,0); /* IN0 */ + return input_port_read(machine, "IN0"); /* case 0x01 only used if "printer" DSW is on, and appears to be printer status byte */ case 0x02: - return input_port_read_indexed(machine,1); /* IN1 */ + return input_port_read(machine, "IN1"); } -logerror("CPU #0 PC %06x: warning - read unmapped input_r offset %06x\n",activecpu_get_pc(),offset); + logerror("CPU #0 PC %06x: warning - read unmapped input_r offset %06x\n", activecpu_get_pc(), offset); return 0x0; } @@ -635,18 +636,18 @@ logerror("CPU #0 PC %06x: warning - read unmapped input_r offset %06x\n",activec static READ16_HANDLER( yesnoj_dsw_r ) { #ifdef MAME_DEBUG - logerror("CPU #0 PC = %06x: read yesnoj DSW %01x\n",activecpu_get_pc(),yesnoj_dsw); + logerror("CPU #0 PC = %06x: read yesnoj DSW %01x\n", activecpu_get_pc(), yesnoj_dsw); #endif yesnoj_dsw = 1 - yesnoj_dsw; /* game reads same word twice to get DSW A then B so we toggle */ if (yesnoj_dsw) { - return input_port_read_indexed(machine,2); + return input_port_read(machine, "DSWA"); } else { - return input_port_read_indexed(machine,3); + return input_port_read(machine, "DSWB"); } } @@ -1166,8 +1167,8 @@ static ADDRESS_MAP_START( growl_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300000, 0x30000f) AM_READ(growl_dsw_r) AM_RANGE(0x320000, 0x32000f) AM_READ(growl_input_r) AM_RANGE(0x400000, 0x400003) AM_READ(taitof2_msb_sound_r) - AM_RANGE(0x508000, 0x50800f) AM_READ(input_port_5_word_r) /* IN3 */ - AM_RANGE(0x50c000, 0x50c00f) AM_READ(input_port_6_word_r) /* IN4 */ + AM_RANGE(0x508000, 0x50800f) AM_READ_PORT("IN3") + AM_RANGE(0x50c000, 0x50c00f) AM_READ_PORT("IN4") AM_RANGE(0x800000, 0x80ffff) AM_READ(TC0100SCN_word_0_r) /* tilemaps */ AM_RANGE(0x820000, 0x82000f) AM_READ(TC0100SCN_ctrl_word_0_r) AM_RANGE(0x900000, 0x90ffff) AM_READ(SMH_RAM) @@ -1741,74 +1742,7 @@ ADDRESS_MAP_END INPUT PORTS, DIPs ***********************************************************/ -#define TAITO_COINAGE_WORLD_8 \ - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) ) \ - PORT_DIPSETTING( 0x10, DEF_STR( 3C_1C ) ) \ - PORT_DIPSETTING( 0x20, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) \ - PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_B ) ) \ - PORT_DIPSETTING( 0xc0, DEF_STR( 1C_2C ) ) \ - PORT_DIPSETTING( 0x80, DEF_STR( 1C_3C ) ) \ - PORT_DIPSETTING( 0x40, DEF_STR( 1C_4C ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 1C_6C ) ) - -#define TAITO_COINAGE_JAPAN_8 \ - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) ) \ - PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) \ - PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) ) \ - PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_B ) ) \ - PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) \ - PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) ) - -/* This is a new Japanese coinage used in later TAITO games */ -#define TAITO_COINAGE_JAPAN_NEW_8 \ - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) ) \ - PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) \ - PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) ) \ - PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_B ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) ) \ - PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) ) \ - PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) ) - -#define TAITO_COINAGE_US_8 \ - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coinage ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) ) \ - PORT_DIPSETTING( 0x10, DEF_STR( 3C_1C ) ) \ - PORT_DIPSETTING( 0x20, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) \ - PORT_DIPNAME( 0xc0, 0xc0, "Price to Continue" ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) ) \ - PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0x80, DEF_STR( 1C_1C ) ) \ - PORT_DIPSETTING( 0xc0, "Same as Start" ) - -#define TAITO_DIFFICULTY_8 \ - PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) \ - PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) \ - PORT_DIPSETTING( 0x03, DEF_STR( Medium ) ) \ - PORT_DIPSETTING( 0x01, DEF_STR( Hard ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) - -#define TAITO_F2_PLAYERS_INPUT( player ) \ - PORT_START \ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(player) PORT_8WAY \ - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(player) PORT_8WAY \ - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(player) PORT_8WAY \ - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(player) PORT_8WAY \ - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(player) \ - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(player) -/* 0x40 and 0x80 are not always the same in all games, so they are not included here */ - #define TAITO_F2_SYSTEM_INPUT \ - PORT_START \ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT ) \ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) \ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) \ @@ -1829,10 +1763,10 @@ static INPUT_PORTS_START( finalb ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_WORLD_8 + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1852,17 +1786,13 @@ static INPUT_PORTS_START( finalb ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - /* IN0 */ - TAITO_F2_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) + PORT_START_TAG("IN0") + TAITO_JOY_UDLR_3_BUTTONS_START( 1 ) - /* IN1 */ - TAITO_F2_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) + PORT_START_TAG("IN1") + TAITO_JOY_UDLR_3_BUTTONS_START( 2 ) - /* IN2 */ + PORT_START_TAG("IN2") TAITO_F2_SYSTEM_INPUT /* controls below are DIP selectable */ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) /* 1P sen.sw.? */ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) /* 1P ducking? */ @@ -1874,7 +1804,7 @@ static INPUT_PORTS_START( finalbj ) PORT_INCLUDE(finalb) PORT_MODIFY("DSWA") - TAITO_COINAGE_JAPAN_8 + TAITO_COINAGE_JAPAN_OLD INPUT_PORTS_END @@ -1890,10 +1820,10 @@ static INPUT_PORTS_START( dondokod ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_WORLD_8 + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPSETTING( 0x0c, "10k and 100k" ) PORT_DIPSETTING( 0x08, "10k and 150k" ) @@ -1911,17 +1841,13 @@ static INPUT_PORTS_START( dondokod ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - /* IN0 */ - TAITO_F2_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) + PORT_START_TAG("IN0") + TAITO_JOY_UDLR_2_BUTTONS_START( 1 ) - /* IN1 */ - TAITO_F2_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) + PORT_START_TAG("IN1") + TAITO_JOY_UDLR_2_BUTTONS_START( 2 ) - /* IN2 */ + PORT_START_TAG("IN2") TAITO_F2_SYSTEM_INPUT PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1933,14 +1859,14 @@ static INPUT_PORTS_START( dondokdu ) PORT_INCLUDE(dondokod) PORT_MODIFY("DSWA") - TAITO_COINAGE_US_8 + TAITO_COINAGE_US INPUT_PORTS_END static INPUT_PORTS_START( dondokdj ) PORT_INCLUDE(dondokod) PORT_MODIFY("DSWA") - TAITO_COINAGE_JAPAN_8 + TAITO_COINAGE_JAPAN_OLD INPUT_PORTS_END @@ -1956,10 +1882,10 @@ static INPUT_PORTS_START( megab ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_WORLD_8 + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPSETTING( 0x0c, "100k only" ) PORT_DIPSETTING( 0x04, "150k only" ) @@ -1977,17 +1903,13 @@ static INPUT_PORTS_START( megab ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - /* IN0 */ - TAITO_F2_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_START_TAG("IN0") + TAITO_JOY_UDLR_2_BUTTONS( 1 ) - /* IN1 */ - TAITO_F2_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_START_TAG("IN1") + TAITO_JOY_UDLR_2_BUTTONS( 2 ) - /* IN2 */ + PORT_START_TAG("IN2") TAITO_F2_SYSTEM_INPUT PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) @@ -1999,7 +1921,7 @@ static INPUT_PORTS_START( megabj ) PORT_INCLUDE(megab) PORT_MODIFY("DSWA") - TAITO_COINAGE_JAPAN_8 + TAITO_COINAGE_JAPAN_OLD INPUT_PORTS_END @@ -2015,10 +1937,10 @@ static INPUT_PORTS_START( thundfox ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_WORLD_8 + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, "Timer" ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x04, DEF_STR( On ) ) @@ -2037,17 +1959,13 @@ static INPUT_PORTS_START( thundfox ) PORT_DIPSETTING( 0x00, DEF_STR( Single ) ) PORT_DIPSETTING( 0x80, DEF_STR( Dual ) ) - /* IN0 */ - TAITO_F2_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) + PORT_START_TAG("IN0") + TAITO_JOY_UDLR_3_BUTTONS_START( 1 ) - /* IN0 */ - TAITO_F2_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) + PORT_START_TAG("IN1") + TAITO_JOY_UDLR_3_BUTTONS_START( 2 ) - /* IN2 */ + PORT_START_TAG("IN2") TAITO_F2_SYSTEM_INPUT PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -2059,14 +1977,14 @@ static INPUT_PORTS_START( thndfoxu ) PORT_INCLUDE(thundfox) PORT_MODIFY("DSWA") - TAITO_COINAGE_US_8 + TAITO_COINAGE_US INPUT_PORTS_END static INPUT_PORTS_START( thndfoxj ) PORT_INCLUDE(thundfox) PORT_MODIFY("DSWA") - TAITO_COINAGE_JAPAN_NEW_8 + TAITO_COINAGE_JAPAN_NEW INPUT_PORTS_END @@ -2082,10 +2000,10 @@ static INPUT_PORTS_START( cameltry ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_US_8 + TAITO_COINAGE_US PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, "Start remain time" ) PORT_DIPSETTING( 0x00, "35" ) PORT_DIPSETTING( 0x04, "40" ) @@ -2103,7 +2021,7 @@ static INPUT_PORTS_START( cameltry ) PORT_DIPSETTING( 0x80, DEF_STR( Single ) ) PORT_DIPSETTING( 0x00, DEF_STR( Dual ) ) - PORT_START /* IN0 */ + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -2113,7 +2031,7 @@ static INPUT_PORTS_START( cameltry ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START /* IN1 */ + PORT_START_TAG("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 ) @@ -2123,17 +2041,17 @@ static INPUT_PORTS_START( cameltry ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - /* IN2 */ + PORT_START_TAG("IN2") TAITO_F2_SYSTEM_INPUT PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* Paddle A */ + PORT_START_TAG("PADDLE1") /* Paddle A */ PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_PLAYER(1) - PORT_START /* Paddle B */ + PORT_START_TAG("PADDLE2") /* Paddle B */ PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_PLAYER(2) INPUT_PORTS_END @@ -2141,7 +2059,7 @@ static INPUT_PORTS_START( cameltrj ) PORT_INCLUDE(cameltry) PORT_MODIFY("DSWA") - TAITO_COINAGE_JAPAN_8 + TAITO_COINAGE_JAPAN_OLD INPUT_PORTS_END static INPUT_PORTS_START( qtorimon ) @@ -2156,10 +2074,10 @@ static INPUT_PORTS_START( qtorimon ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unused ) ) PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_8 + TAITO_COINAGE_JAPAN_OLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2178,7 +2096,7 @@ static INPUT_PORTS_START( qtorimon ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* IN0 */ + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) @@ -2188,7 +2106,7 @@ static INPUT_PORTS_START( qtorimon ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START /* IN1 */ + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) @@ -2198,7 +2116,7 @@ static INPUT_PORTS_START( qtorimon ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - /* IN2 */ + PORT_START_TAG("IN2") TAITO_F2_SYSTEM_INPUT PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -2218,10 +2136,10 @@ static INPUT_PORTS_START( liquidk ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_WORLD_8 + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPSETTING( 0x0c, "30k and 100k" ) PORT_DIPSETTING( 0x08, "30k and 150k" ) @@ -2239,17 +2157,13 @@ static INPUT_PORTS_START( liquidk ) PORT_DIPSETTING( 0x80, DEF_STR( Single ) ) PORT_DIPSETTING( 0x00, DEF_STR( Dual ) ) - /* IN0 */ - TAITO_F2_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) + PORT_START_TAG("IN0") + TAITO_JOY_UDLR_2_BUTTONS_START( 1 ) - /* IN1 */ - TAITO_F2_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) + PORT_START_TAG("IN1") + TAITO_JOY_UDLR_2_BUTTONS_START( 2 ) - /* IN2 */ + PORT_START_TAG("IN2") TAITO_F2_SYSTEM_INPUT PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -2261,7 +2175,7 @@ static INPUT_PORTS_START( liquidku ) PORT_INCLUDE(liquidk) PORT_MODIFY("DSWA") - TAITO_COINAGE_US_8 + TAITO_COINAGE_US INPUT_PORTS_END @@ -2277,10 +2191,10 @@ static INPUT_PORTS_START( mizubaku ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_NEW_8 + TAITO_COINAGE_JAPAN_NEW PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPSETTING( 0x0c, "30k and 100k" ) PORT_DIPSETTING( 0x08, "30k and 150k" ) @@ -2298,17 +2212,13 @@ static INPUT_PORTS_START( mizubaku ) PORT_DIPSETTING( 0x80, DEF_STR( Single ) ) PORT_DIPSETTING( 0x00, DEF_STR( Dual ) ) - /* IN0 */ - TAITO_F2_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) + PORT_START_TAG("IN0") + TAITO_JOY_UDLR_2_BUTTONS_START( 1 ) - /* IN1 */ - TAITO_F2_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) + PORT_START_TAG("IN1") + TAITO_JOY_UDLR_2_BUTTONS_START( 2 ) - /* IN2 */ + PORT_START_TAG("IN2") TAITO_F2_SYSTEM_INPUT PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -2328,10 +2238,10 @@ static INPUT_PORTS_START( ssi ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_WORLD_8 + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, "Shields" ) PORT_DIPSETTING( 0x00, DEF_STR( None )) PORT_DIPSETTING( 0x0c, "1") @@ -2349,17 +2259,13 @@ static INPUT_PORTS_START( ssi ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x40, DEF_STR( On ) ) - /* IN0 */ - TAITO_F2_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) + PORT_START_TAG("IN0") + TAITO_JOY_UDLR_2_BUTTONS_START( 1 ) - /* IN1 */ - TAITO_F2_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) + PORT_START_TAG("IN1") + TAITO_JOY_UDLR_2_BUTTONS_START( 2 ) - /* IN2 */ + PORT_START_TAG("IN2") TAITO_F2_SYSTEM_INPUT PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -2371,22 +2277,18 @@ static INPUT_PORTS_START( majest12 ) PORT_INCLUDE(ssi) PORT_MODIFY("DSWA") - TAITO_COINAGE_JAPAN_NEW_8 + TAITO_COINAGE_JAPAN_NEW INPUT_PORTS_END static INPUT_PORTS_START( growl ) - /* IN0 */ - TAITO_F2_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) + PORT_START_TAG("IN0") + TAITO_JOY_UDLR_3_BUTTONS_START( 1 ) - /* IN1 */ - TAITO_F2_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) + PORT_START_TAG("IN1") + TAITO_JOY_UDLR_3_BUTTONS_START( 2 ) - /* IN2 */ + PORT_START_TAG("IN2") TAITO_F2_SYSTEM_INPUT PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -2404,10 +2306,10 @@ static INPUT_PORTS_START( growl ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_WORLD_8 + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2426,7 +2328,7 @@ static INPUT_PORTS_START( growl ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* IN3 */ + PORT_START_TAG("IN3") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3) @@ -2444,7 +2346,7 @@ static INPUT_PORTS_START( growl ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START4 ) - PORT_START /* IN4 */ + PORT_START_TAG("IN4") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) @@ -2459,14 +2361,14 @@ static INPUT_PORTS_START( growlu ) PORT_INCLUDE(growl) PORT_MODIFY("DSWA") - TAITO_COINAGE_US_8 + TAITO_COINAGE_US INPUT_PORTS_END static INPUT_PORTS_START( runark ) PORT_INCLUDE(growl) PORT_MODIFY("DSWA") - TAITO_COINAGE_JAPAN_NEW_8 + TAITO_COINAGE_JAPAN_NEW INPUT_PORTS_END @@ -2482,10 +2384,10 @@ static INPUT_PORTS_START( pulirula ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_WORLD_8 + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, "Magic" ) PORT_DIPSETTING( 0x0c, "3" ) PORT_DIPSETTING( 0x08, "4" ) @@ -2503,17 +2405,13 @@ static INPUT_PORTS_START( pulirula ) PORT_DIPSETTING( 0x00, DEF_STR( Single ) ) PORT_DIPSETTING( 0x80, DEF_STR( Dual ) ) - /* IN0 */ - TAITO_F2_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) + PORT_START_TAG("IN0") + TAITO_JOY_UDLR_3_BUTTONS_START( 1 ) - /* IN1 */ - TAITO_F2_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) + PORT_START_TAG("IN1") + TAITO_JOY_UDLR_3_BUTTONS_START( 2 ) - /* IN2 */ + PORT_START_TAG("IN2") TAITO_F2_SYSTEM_INPUT PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -2525,7 +2423,7 @@ static INPUT_PORTS_START( pulirulj ) PORT_INCLUDE(pulirula) PORT_MODIFY("DSWA") - TAITO_COINAGE_JAPAN_NEW_8 + TAITO_COINAGE_JAPAN_NEW INPUT_PORTS_END @@ -2541,10 +2439,10 @@ static INPUT_PORTS_START( qzquest ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_NEW_8 + TAITO_COINAGE_JAPAN_NEW PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 //?? + TAITO_DIFFICULTY //?? PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2564,7 +2462,7 @@ static INPUT_PORTS_START( qzquest ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* IN0 */ + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) @@ -2574,7 +2472,7 @@ static INPUT_PORTS_START( qzquest ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START /* IN1 */ + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) @@ -2584,7 +2482,7 @@ static INPUT_PORTS_START( qzquest ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - /* IN2 */ + PORT_START_TAG("IN2") TAITO_F2_SYSTEM_INPUT PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -2604,10 +2502,10 @@ static INPUT_PORTS_START( qzchikyu ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_NEW_8 + TAITO_COINAGE_JAPAN_NEW PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 //?? + TAITO_DIFFICULTY //?? PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2627,7 +2525,7 @@ static INPUT_PORTS_START( qzchikyu ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* IN0 */ + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) @@ -2637,7 +2535,7 @@ static INPUT_PORTS_START( qzchikyu ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START /* IN1 */ + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) @@ -2647,7 +2545,7 @@ static INPUT_PORTS_START( qzchikyu ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - /* IN2 */ + PORT_START_TAG("IN2") TAITO_F2_SYSTEM_INPUT PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -2656,17 +2554,13 @@ static INPUT_PORTS_START( qzchikyu ) INPUT_PORTS_END static INPUT_PORTS_START( footchmp ) - /* IN0 */ - TAITO_F2_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) + PORT_START_TAG("IN0") + TAITO_JOY_UDLR_2_BUTTONS_START( 1 ) - /* IN1 */ - TAITO_F2_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) + PORT_START_TAG("IN1") + TAITO_JOY_UDLR_2_BUTTONS_START( 2 ) - PORT_START /* IN2 */ + PORT_START_TAG("IN2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) @@ -2687,10 +2581,10 @@ static INPUT_PORTS_START( footchmp ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_WORLD_8 + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Game_Time ) ) PORT_DIPSETTING( 0x00, "1.5 Minutes" ) PORT_DIPSETTING( 0x0c, " 2 Minutes" ) @@ -2708,15 +2602,11 @@ static INPUT_PORTS_START( footchmp ) PORT_DIPSETTING( 0x00, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x80, "European" ) - /* IN3 */ - TAITO_F2_PLAYERS_INPUT( 3 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 ) + PORT_START_TAG("IN3") + TAITO_JOY_UDLR_2_BUTTONS_START( 3 ) - /* IN4 */ - TAITO_F2_PLAYERS_INPUT( 4 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4 ) + PORT_START_TAG("IN4") + TAITO_JOY_UDLR_2_BUTTONS_START( 4 ) INPUT_PORTS_END static INPUT_PORTS_START( hthero ) @@ -2769,17 +2659,13 @@ static INPUT_PORTS_START( hthero ) INPUT_PORTS_END static INPUT_PORTS_START( ninjak ) - /* IN0 */ - TAITO_F2_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) + PORT_START_TAG("IN0") + TAITO_JOY_UDLR_2_BUTTONS_START( 1 ) - /* IN1 */ - TAITO_F2_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) + PORT_START_TAG("IN1") + TAITO_JOY_UDLR_2_BUTTONS_START( 2 ) - PORT_START /* IN2 */ + PORT_START_TAG("IN2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) @@ -2800,10 +2686,10 @@ static INPUT_PORTS_START( ninjak ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_WORLD_8 + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, "Cabinet Type" ) PORT_DIPSETTING( 0x0c, "2 players" ) PORT_DIPSETTING( 0x08, "TROG (4 players / 2 coin slots)" ) @@ -2821,29 +2707,25 @@ static INPUT_PORTS_START( ninjak ) PORT_DIPSETTING( 0x00, "1 Player only" ) PORT_DIPSETTING( 0x80, "Multiplayer" ) - /* IN3 */ - TAITO_F2_PLAYERS_INPUT( 3 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 ) + PORT_START_TAG("IN3") + TAITO_JOY_UDLR_2_BUTTONS_START( 3 ) - /* IN4 */ - TAITO_F2_PLAYERS_INPUT( 4 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START4 ) + PORT_START_TAG("IN4") + TAITO_JOY_UDLR_2_BUTTONS_START( 4 ) INPUT_PORTS_END static INPUT_PORTS_START( ninjaku ) PORT_INCLUDE(ninjak) PORT_MODIFY("DSWA") - TAITO_COINAGE_US_8 + TAITO_COINAGE_US INPUT_PORTS_END static INPUT_PORTS_START( ninjakj ) PORT_INCLUDE(ninjak) PORT_MODIFY("DSWA") - TAITO_COINAGE_JAPAN_NEW_8 + TAITO_COINAGE_JAPAN_NEW INPUT_PORTS_END @@ -2859,10 +2741,10 @@ static INPUT_PORTS_START( driftout ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_8 + TAITO_COINAGE_JAPAN_OLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, "Control" ) /* correct acc. to service mode */ PORT_DIPSETTING( 0x0c, DEF_STR( Joystick ) ) PORT_DIPSETTING( 0x08, "Paddle" ) @@ -2881,25 +2763,23 @@ static INPUT_PORTS_START( driftout ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - /* IN0 */ - TAITO_F2_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) + PORT_START_TAG("IN0") + TAITO_JOY_UDLR_2_BUTTONS_START( 1 ) - PORT_START /* IN1 */ + PORT_START_TAG("IN1") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* 2P not used? */ - /* IN2 */ + PORT_START_TAG("IN2") TAITO_F2_SYSTEM_INPUT PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* Paddle A */ + PORT_START_TAG("PADDLE1") /* Paddle A */ PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(1) - PORT_START /* Paddle B */ + PORT_START_TAG("PADDLE2") /* Paddle B */ PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(2) INPUT_PORTS_END @@ -2915,10 +2795,10 @@ static INPUT_PORTS_START( gunfront ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_WORLD_8 + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPSETTING( 0x08, "10k and every 80k" ) PORT_DIPSETTING( 0x0c, "20k and every 80k" ) @@ -2936,17 +2816,13 @@ static INPUT_PORTS_START( gunfront ) PORT_DIPSETTING( 0x00, DEF_STR( Single ) ) PORT_DIPSETTING( 0x80, DEF_STR( Dual ) ) - /* IN0 */ - TAITO_F2_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) + PORT_START_TAG("IN0") + TAITO_JOY_UDLR_2_BUTTONS_START( 1 ) - /* IN1 */ - TAITO_F2_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) + PORT_START_TAG("IN1") + TAITO_JOY_UDLR_2_BUTTONS_START( 2 ) - /* IN2 */ + PORT_START_TAG("IN2") TAITO_F2_SYSTEM_INPUT PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -2958,7 +2834,7 @@ static INPUT_PORTS_START( gunfronj ) PORT_INCLUDE(gunfront) PORT_MODIFY("DSWA") - TAITO_COINAGE_JAPAN_NEW_8 + TAITO_COINAGE_JAPAN_NEW INPUT_PORTS_END @@ -2974,10 +2850,10 @@ static INPUT_PORTS_START( metalb ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_WORLD_8 + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPSETTING( 0x04, "80k and every 160k" ) PORT_DIPSETTING( 0x0c, "70k and every 150k" ) @@ -2995,17 +2871,13 @@ static INPUT_PORTS_START( metalb ) PORT_DIPSETTING( 0x00, DEF_STR( Single ) ) PORT_DIPSETTING( 0x80, DEF_STR( Dual ) ) - /* IN0 */ - TAITO_F2_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) + PORT_START_TAG("IN0") + TAITO_JOY_UDLR_3_BUTTONS_START( 1 ) - /* IN1 */ - TAITO_F2_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) + PORT_START_TAG("IN1") + TAITO_JOY_UDLR_3_BUTTONS_START( 2 ) - /* IN2 */ + PORT_START_TAG("IN2") TAITO_F2_SYSTEM_INPUT PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -3017,27 +2889,23 @@ static INPUT_PORTS_START( metalbj ) PORT_INCLUDE(metalb) PORT_MODIFY("DSWA") - TAITO_COINAGE_JAPAN_NEW_8 + TAITO_COINAGE_JAPAN_NEW INPUT_PORTS_END static INPUT_PORTS_START( deadconx ) - /* IN0 */ - TAITO_F2_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) + PORT_START_TAG("IN0") + TAITO_JOY_UDLR_2_BUTTONS_START( 1 ) - /* IN1 */ - TAITO_F2_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) + PORT_START_TAG("IN1") + TAITO_JOY_UDLR_2_BUTTONS_START( 2 ) - PORT_START /* IN2 */ + PORT_START_TAG("IN2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service A") PORT_CODE(KEYCODE_9) - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service B") PORT_CODE(KEYCODE_0) - PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service C") PORT_CODE(KEYCODE_MINUS) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service A") PORT_CODE(KEYCODE_9) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service B") PORT_CODE(KEYCODE_0) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service C") PORT_CODE(KEYCODE_MINUS) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_TILT ) PORT_START_TAG("DSWA") @@ -3051,10 +2919,10 @@ static INPUT_PORTS_START( deadconx ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_WORLD_8 + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") /* DSW B, missing a timer speed maybe? */ - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On) ) @@ -3078,7 +2946,7 @@ static INPUT_PORTS_START( deadconj ) PORT_INCLUDE(deadconx) PORT_MODIFY("DSWA") - TAITO_COINAGE_JAPAN_NEW_8 + TAITO_COINAGE_JAPAN_NEW INPUT_PORTS_END @@ -3094,10 +2962,10 @@ static INPUT_PORTS_START( dinorex ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_WORLD_8 + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, "Damage" ) PORT_DIPSETTING( 0x08, "Small" ) PORT_DIPSETTING( 0x0c, DEF_STR( Normal ) ) @@ -3116,17 +2984,13 @@ static INPUT_PORTS_START( dinorex ) PORT_DIPSETTING( 0x00, DEF_STR( Single ) ) PORT_DIPSETTING( 0x80, DEF_STR( Dual ) ) - /* IN0 */ - TAITO_F2_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) + PORT_START_TAG("IN0") + TAITO_JOY_UDLR_3_BUTTONS_START( 1 ) - /* IN1 */ - TAITO_F2_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) + PORT_START_TAG("IN1") + TAITO_JOY_UDLR_3_BUTTONS_START( 2 ) - /* IN2 */ + PORT_START_TAG("IN2") TAITO_F2_SYSTEM_INPUT PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -3138,22 +3002,18 @@ static INPUT_PORTS_START( dinorexj ) PORT_INCLUDE(dinorex) PORT_MODIFY("DSWA") - TAITO_COINAGE_JAPAN_NEW_8 + TAITO_COINAGE_JAPAN_NEW INPUT_PORTS_END static INPUT_PORTS_START( solfigtr ) - /* IN0 */ - TAITO_F2_PLAYERS_INPUT( 1 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) + PORT_START_TAG("IN0") + TAITO_JOY_UDLR_3_BUTTONS_START( 1 ) - /* IN1 */ - TAITO_F2_PLAYERS_INPUT( 2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) + PORT_START_TAG("IN1") + TAITO_JOY_UDLR_3_BUTTONS_START( 2 ) - /* IN2 */ + PORT_START_TAG("IN2") TAITO_F2_SYSTEM_INPUT PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -3171,10 +3031,10 @@ static INPUT_PORTS_START( solfigtr ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_WORLD_8 + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -3196,7 +3056,7 @@ static INPUT_PORTS_START( solfigtr ) INPUT_PORTS_END static INPUT_PORTS_START( koshien ) - PORT_START /* DSW A, one lets you control fielders ? */ + PORT_START_TAG("DSWA") /* DSW A, one lets you control fielders ? */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -3207,10 +3067,10 @@ static INPUT_PORTS_START( koshien ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_NEW_8 + TAITO_COINAGE_JAPAN_NEW PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, "Timer" ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x04, DEF_STR( On ) ) @@ -3229,7 +3089,7 @@ static INPUT_PORTS_START( koshien ) PORT_DIPSETTING( 0x00, DEF_STR( Single ) ) PORT_DIPSETTING( 0x80, DEF_STR( Dual ) ) - PORT_START /* IN1 */ + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) @@ -3239,14 +3099,14 @@ static INPUT_PORTS_START( koshien ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - /* IN2 */ + PORT_START_TAG("IN1") TAITO_F2_SYSTEM_INPUT PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* IN0 */ + PORT_START_TAG("IN2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -3258,7 +3118,7 @@ static INPUT_PORTS_START( koshien ) INPUT_PORTS_END static INPUT_PORTS_START( quizhq ) - PORT_START /* IN0 */ + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) @@ -3268,7 +3128,7 @@ static INPUT_PORTS_START( quizhq ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START /* IN1 */ + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) @@ -3278,7 +3138,7 @@ static INPUT_PORTS_START( quizhq ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - /* IN2 */ + PORT_START_TAG("IN2") TAITO_F2_SYSTEM_INPUT PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -3296,10 +3156,10 @@ static INPUT_PORTS_START( quizhq ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_NEW_8 + TAITO_COINAGE_JAPAN_NEW PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, "Time" ) PORT_DIPSETTING( 0x0c, "5 seconds" ) PORT_DIPSETTING( 0x08, "10 seconds" ) @@ -3330,10 +3190,10 @@ static INPUT_PORTS_START( qjinsei ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_NEW_8 + TAITO_COINAGE_JAPAN_NEW PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -3353,7 +3213,7 @@ static INPUT_PORTS_START( qjinsei ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* IN0 */ + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) @@ -3363,7 +3223,7 @@ static INPUT_PORTS_START( qjinsei ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START /* IN1 */ + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) @@ -3373,7 +3233,7 @@ static INPUT_PORTS_START( qjinsei ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - /* IN2 */ + PORT_START_TAG("IN2") TAITO_F2_SYSTEM_INPUT PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -3391,10 +3251,10 @@ static INPUT_PORTS_START( qcrayon ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_NEW_8 + TAITO_COINAGE_JAPAN_NEW PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, "Default Time" ) /* Can be affected ingame by some items and/or player location */ PORT_DIPSETTING( 0x00, "6 seconds" ) PORT_DIPSETTING( 0x04, "7 seconds" ) @@ -3405,7 +3265,7 @@ static INPUT_PORTS_START( qcrayon ) PORT_DIPUNUSED( 0x40, IP_ACTIVE_LOW ) PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW ) - PORT_START /* IN0 */ + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) @@ -3415,7 +3275,7 @@ static INPUT_PORTS_START( qcrayon ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START /* IN1 */ + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) @@ -3425,7 +3285,7 @@ static INPUT_PORTS_START( qcrayon ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - /* IN2 */ + PORT_START_TAG("IN2") TAITO_F2_SYSTEM_INPUT PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -3443,10 +3303,10 @@ static INPUT_PORTS_START( qcrayon2 ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_NEW_8 + TAITO_COINAGE_JAPAN_NEW PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPUNUSED( 0x04, IP_ACTIVE_LOW ) /* These 2 Dip Switches were designed to change the default timer */ PORT_DIPUNUSED( 0x08, IP_ACTIVE_LOW ) /* but the 10 seconds setting is duplicated 4 times in the tables */ PORT_DIPUNUSED( 0x10, IP_ACTIVE_LOW ) @@ -3456,7 +3316,7 @@ static INPUT_PORTS_START( qcrayon2 ) PORT_DIPSETTING( 0x80, DEF_STR( Joystick ) ) PORT_DIPSETTING( 0x00, "4 Buttons" ) - PORT_START /* IN0 */ + PORT_START_TAG("IN0") /* Joystick Control */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("DSWB",0x80,PORTCOND_EQUALS,0x80) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_CONDITION("DSWB",0x80,PORTCOND_EQUALS,0x80) @@ -3476,7 +3336,7 @@ static INPUT_PORTS_START( qcrayon2 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_CONDITION("DSWB",0x80,PORTCOND_EQUALS,0x00) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_CONDITION("DSWB",0x80,PORTCOND_EQUALS,0x00) - PORT_START /* IN1 */ + PORT_START_TAG("IN1") /* Joystick Control */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("DSWB",0x80,PORTCOND_EQUALS,0x80) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_CONDITION("DSWB",0x80,PORTCOND_EQUALS,0x80) @@ -3496,7 +3356,7 @@ static INPUT_PORTS_START( qcrayon2 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_CONDITION("DSWB",0x80,PORTCOND_EQUALS,0x00) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_CONDITION("DSWB",0x80,PORTCOND_EQUALS,0x00) - /* IN2 */ + PORT_START_TAG("IN2") TAITO_F2_SYSTEM_INPUT PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -3516,10 +3376,10 @@ static INPUT_PORTS_START( yuyugogo ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_NEW_8 + TAITO_COINAGE_JAPAN_NEW PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -3539,7 +3399,7 @@ static INPUT_PORTS_START( yuyugogo ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* IN0 */ + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) @@ -3549,7 +3409,7 @@ static INPUT_PORTS_START( yuyugogo ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START /* IN1 */ + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) @@ -3559,7 +3419,7 @@ static INPUT_PORTS_START( yuyugogo ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - /* IN2 */ + PORT_START_TAG("IN2") TAITO_F2_SYSTEM_INPUT PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -3568,52 +3428,52 @@ static INPUT_PORTS_START( yuyugogo ) INPUT_PORTS_END static INPUT_PORTS_START( mjnquest ) - PORT_START /* IN0 */ - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M ) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) + PORT_START_TAG("IN0") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) + 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 /* IN1 */ - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N ) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) + PORT_START_TAG("IN1") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN2 */ - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) + PORT_START_TAG("IN2") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) + 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 /* IN3 */ - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) + PORT_START_TAG("IN3") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN4 */ + PORT_START_TAG("IN4") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN5 */ + PORT_START_TAG("IN5") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) // ? PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN6 */ + PORT_START_TAG("IN6") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN7:DSW A */ + PORT_START_TAG("DSWA") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -3624,10 +3484,10 @@ static INPUT_PORTS_START( mjnquest ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_NEW_8 + TAITO_COINAGE_JAPAN_NEW - PORT_START /* IN8:DSW B */ - TAITO_DIFFICULTY_8 + PORT_START_TAG("DSWB") + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -3649,18 +3509,18 @@ static INPUT_PORTS_START( mjnquest ) INPUT_PORTS_END static INPUT_PORTS_START( yesnoj ) // apparently no test mode, though text in rom suggests printer test - PORT_START /* IN0 */ + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) - /* IN1 */ + PORT_START_TAG("IN1") TAITO_F2_SYSTEM_INPUT PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* DSW A ??? */ + PORT_START_TAG("DSWA") /* DSW A ??? */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -3686,7 +3546,7 @@ static INPUT_PORTS_START( yesnoj ) // apparently no test mode, though text in PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* DSW B ? */ + PORT_START_TAG("DSWB") /* DSW B ? */ PORT_DIPNAME( 0x01, 0x00, "Results Printer" ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x01, DEF_STR( On ) ) diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c index 2806bdf64e5..e97eddfce7b 100644 --- a/src/mame/drivers/taito_f3.c +++ b/src/mame/drivers/taito_f3.c @@ -56,28 +56,28 @@ static READ32_HANDLER( f3_control_r ) switch (offset) { case 0x0: /* MSW: Test switch, coins, eeprom access, LSW: Player Buttons, Start, Tilt, Service */ - e=eeprom_read_bit(); - e=e|(e<<8); - return ((e | input_port_read_indexed(machine, 2) | (input_port_read_indexed(machine, 2)<<8))<<16) /* top byte may be mirror of bottom byte?? see bubblem */ - | input_port_read_indexed(machine, 1); + e = eeprom_read_bit(); + e = e | (e<<8); + return ((e | input_port_read(machine, "EEPROM") | (input_port_read(machine, "EEPROM")<<8))<<16) /* top byte may be mirror of bottom byte?? see bubblem */ + | input_port_read(machine, "IN1"); case 0x1: /* MSW: Coin counters/lockouts are readable, LSW: Joysticks (Player 1 & 2) */ - return (coin_word[0]<<16) | input_port_read_indexed(machine, 0) | 0xff00; + return (coin_word[0]<<16) | input_port_read(machine, "IN0") | 0xff00; case 0x2: /* Analog control 1 */ - return ((input_port_read_indexed(machine, 3)&0xf)<<12) | ((input_port_read_indexed(machine, 3)&0xff0)>>4); + return ((input_port_read(machine, "DIAL1") & 0xf)<<12) | ((input_port_read(machine, "DIAL1") & 0xff0)>>4); case 0x3: /* Analog control 2 */ - return ((input_port_read_indexed(machine, 4)&0xf)<<12) | ((input_port_read_indexed(machine, 4)&0xff0)>>4); + return ((input_port_read(machine, "DIAL2") & 0xf)<<12) | ((input_port_read(machine, "DIAL2") & 0xff0)>>4); case 0x4: /* Player 3 & 4 fire buttons (Player 2 top fire buttons in Kaiser Knuckle) */ - return input_port_read_indexed(machine, 5)<<8; + return input_port_read(machine, "IN2")<<8; case 0x5: /* Player 3 & 4 joysticks (Player 1 top fire buttons in Kaiser Knuckle) */ - return (coin_word[1]<<16) | input_port_read_indexed(machine, 6); + return (coin_word[1]<<16) | input_port_read(machine, "IN3"); } - logerror("CPU #0 PC %06x: warning - read unmapped control address %06x\n",activecpu_get_pc(),offset); + logerror("CPU #0 PC %06x: warning - read unmapped control address %06x\n", activecpu_get_pc(), offset); return 0xffffffff; } @@ -88,8 +88,10 @@ static WRITE32_HANDLER( f3_control_w ) case 0x00: /* Watchdog */ watchdog_reset(machine); return; + case 0x01: /* Coin counters & lockouts */ - if (ACCESSING_BITS_24_31) { + if (ACCESSING_BITS_24_31) + { coin_lockout_w(0,~data & 0x01000000); coin_lockout_w(1,~data & 0x02000000); coin_counter_w(0, data & 0x04000000); @@ -97,15 +99,19 @@ static WRITE32_HANDLER( f3_control_w ) coin_word[0]=(data>>16)&0xffff; } return; + case 0x04: /* Eeprom */ - if (ACCESSING_BITS_0_7) { + if (ACCESSING_BITS_0_7) + { eeprom_set_clock_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE); eeprom_write_bit(data & 0x04); eeprom_set_cs_line((data & 0x10) ? CLEAR_LINE : ASSERT_LINE); } return; + case 0x05: /* Player 3 & 4 coin counters */ - if (ACCESSING_BITS_24_31) { + if (ACCESSING_BITS_24_31) + { coin_lockout_w(2,~data & 0x01000000); coin_lockout_w(3,~data & 0x02000000); coin_counter_w(2, data & 0x04000000); @@ -189,7 +195,7 @@ ADDRESS_MAP_END /******************************************************************************/ static INPUT_PORTS_START( f3 ) - PORT_START + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY @@ -199,7 +205,7 @@ static INPUT_PORTS_START( f3 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) - PORT_START + PORT_START_TAG("IN1") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) @@ -217,7 +223,7 @@ static INPUT_PORTS_START( f3 ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_START3 ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START4 ) - PORT_START + PORT_START_TAG("EEPROM") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* Eprom data bit */ PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -227,13 +233,13 @@ static INPUT_PORTS_START( f3 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN4 ) - PORT_START + PORT_START_TAG("DIAL1") PORT_BIT( 0xfff, 0x000, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(25) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X) PORT_PLAYER(1) - PORT_START + PORT_START_TAG("DIAL2") PORT_BIT( 0xfff, 0x000, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(25) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M) PORT_PLAYER(2) - PORT_START + PORT_START_TAG("IN2") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3) @@ -243,7 +249,7 @@ static INPUT_PORTS_START( f3 ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(4) - PORT_START + PORT_START_TAG("IN3") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3) @@ -255,57 +261,15 @@ static INPUT_PORTS_START( f3 ) INPUT_PORTS_END static INPUT_PORTS_START( kn ) - PORT_START - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) - - PORT_START - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_TILT ) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_SERVICE1 ) /* Service */ - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_SERVICE2 ) /* Only on some games */ - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_SERVICE3 ) - PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_START2 ) - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_START3 ) - PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START4 ) - - PORT_START - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* Eprom data bit */ - PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW ) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) /* Another service mode */ - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN4 ) - - PORT_START - PORT_BIT( 0xfff, 0x000, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(25) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X) PORT_PLAYER(1) - - PORT_START - PORT_BIT( 0xfff, 0x000, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(25) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M) PORT_PLAYER(2) - - PORT_START - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(2) - PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START + PORT_INCLUDE( f3 ) + + PORT_MODIFY("IN2") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(2) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(2) + PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_MODIFY("IN3") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c index a4cb189ca7a..e5029a69fb4 100644 --- a/src/mame/drivers/taito_l.c +++ b/src/mame/drivers/taito_l.c @@ -49,9 +49,9 @@ puzznici note */ - #include "driver.h" #include "deprecat.h" +#include "taitoipt.h" #include "cpu/z80/z80.h" #include "audio/taitosnd.h" #include "sound/2203intf.h" @@ -540,15 +540,15 @@ static READ8_HANDLER( mux_r ) switch(mux_ctrl) { case 0: - return input_port_read_indexed(machine, 0); + return input_port_read(machine, "DSWA"); case 1: - return input_port_read_indexed(machine, 1); + return input_port_read(machine, "DSWB"); case 2: - return input_port_read_indexed(machine, 2); + return input_port_read(machine, "IN0"); case 3: - return input_port_read_indexed(machine, 3); + return input_port_read(machine, "IN1"); case 7: - return input_port_read_indexed(machine, 4); + return input_port_read(machine, "IN2"); default: logerror("Mux read from unknown port %d (%04x)\n", mux_ctrl, activecpu_get_pc()); return 0xff; @@ -660,7 +660,6 @@ static READ8_HANDLER( horshoes_trackx_hi_r ) - #define COMMON_BANKS_READ \ AM_RANGE(0x0000, 0x5fff) AM_READ(SMH_ROM) \ AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_BANK1) \ @@ -719,11 +718,11 @@ static ADDRESS_MAP_START( fhawk_2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc800, 0xc800) AM_READ(SMH_NOP) AM_RANGE(0xc801, 0xc801) AM_READ(taitosound_comm_r) AM_RANGE(0xe000, 0xffff) AM_READ(shared_r) - AM_RANGE(0xd000, 0xd000) AM_READ(input_port_0_r) - AM_RANGE(0xd001, 0xd001) AM_READ(input_port_1_r) - AM_RANGE(0xd002, 0xd002) AM_READ(input_port_2_r) - AM_RANGE(0xd003, 0xd003) AM_READ(input_port_3_r) - AM_RANGE(0xd007, 0xd007) AM_READ(input_port_4_r) + AM_RANGE(0xd000, 0xd000) AM_READ_PORT("DSWA") + AM_RANGE(0xd001, 0xd001) AM_READ_PORT("DSWB") + AM_RANGE(0xd002, 0xd002) AM_READ_PORT("IN0") + AM_RANGE(0xd003, 0xd003) AM_READ_PORT("IN1") + AM_RANGE(0xd007, 0xd007) AM_READ_PORT("IN2") ADDRESS_MAP_END static ADDRESS_MAP_START( fhawk_2_writemem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -840,11 +839,11 @@ static ADDRESS_MAP_START( champwr_2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM) AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK6) AM_RANGE(0xc000, 0xdfff) AM_READ(shared_r) - AM_RANGE(0xe000, 0xe000) AM_READ(input_port_0_r) - AM_RANGE(0xe001, 0xe001) AM_READ(input_port_1_r) - AM_RANGE(0xe002, 0xe002) AM_READ(input_port_2_r) - AM_RANGE(0xe003, 0xe003) AM_READ(input_port_3_r) - AM_RANGE(0xe007, 0xe007) AM_READ(input_port_4_r) + AM_RANGE(0xe000, 0xe000) AM_READ_PORT("DSWA") + AM_RANGE(0xe001, 0xe001) AM_READ_PORT("DSWB") + AM_RANGE(0xe002, 0xe002) AM_READ_PORT("IN0") + AM_RANGE(0xe003, 0xe003) AM_READ_PORT("IN1") + AM_RANGE(0xe007, 0xe007) AM_READ_PORT("IN2") AM_RANGE(0xe008, 0xe00f) AM_READ(SMH_NOP) AM_RANGE(0xe800, 0xe800) AM_READ(SMH_NOP) AM_RANGE(0xe801, 0xe801) AM_READ(taitosound_comm_r) @@ -907,11 +906,11 @@ static ADDRESS_MAP_START( kurikint_2_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe000, 0xe7ff) AM_READ(shared_r) AM_RANGE(0xe800, 0xe800) AM_READ(YM2203_status_port_0_r) #if 0 - AM_RANGE(0xd000, 0xd000) AM_READ(input_port_0_r) - AM_RANGE(0xd001, 0xd001) AM_READ(input_port_1_r) - AM_RANGE(0xd002, 0xd002) AM_READ(input_port_2_r) - AM_RANGE(0xd003, 0xd003) AM_READ(input_port_3_r) - AM_RANGE(0xd007, 0xd007) AM_READ(input_port_4_r) + AM_RANGE(0xd000, 0xd000) AM_READ_PORT("DSWA") + AM_RANGE(0xd001, 0xd001) AM_READ_PORT("DSWB") + AM_RANGE(0xd002, 0xd002) AM_READ_PORT("IN0") + AM_RANGE(0xd003, 0xd003) AM_READ_PORT("IN1") + AM_RANGE(0xd007, 0xd007) AM_READ_PORT("IN2") #endif ADDRESS_MAP_END @@ -982,9 +981,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( palamed_readmem, ADDRESS_SPACE_PROGRAM, 8 ) COMMON_BANKS_READ COMMON_SINGLE_READ - AM_RANGE(0xa800, 0xa800) AM_READ(input_port_2_r) - AM_RANGE(0xa801, 0xa801) AM_READ(input_port_3_r) - AM_RANGE(0xa802, 0xa802) AM_READ(input_port_4_r) + AM_RANGE(0xa800, 0xa800) AM_READ_PORT("IN0") + AM_RANGE(0xa801, 0xa801) AM_READ_PORT("IN1") + AM_RANGE(0xa802, 0xa802) AM_READ_PORT("IN2") AM_RANGE(0xb001, 0xb001) AM_READ(SMH_NOP) // Watchdog or interrupt ack ADDRESS_MAP_END @@ -999,9 +998,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cachat_readmem, ADDRESS_SPACE_PROGRAM, 8 ) COMMON_BANKS_READ COMMON_SINGLE_READ - AM_RANGE(0xa800, 0xa800) AM_READ(input_port_2_r) - AM_RANGE(0xa801, 0xa801) AM_READ(input_port_3_r) - AM_RANGE(0xa802, 0xa802) AM_READ(input_port_4_r) + AM_RANGE(0xa800, 0xa800) AM_READ_PORT("IN0") + AM_RANGE(0xa801, 0xa801) AM_READ_PORT("IN1") + AM_RANGE(0xa802, 0xa802) AM_READ_PORT("IN2") AM_RANGE(0xb001, 0xb001) AM_READ(SMH_NOP) // Watchdog or interrupt ack (value ignored) AM_RANGE(0xfff8, 0xfff8) AM_READ(rombankswitch_r) ADDRESS_MAP_END @@ -1038,11 +1037,11 @@ static ADDRESS_MAP_START( evilston_readmem, ADDRESS_SPACE_PROGRAM, 8 ) COMMON_BANKS_READ AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_RAM) AM_RANGE(0xa000, 0xa7ff) AM_READ(SMH_RAM) - AM_RANGE(0xa800, 0xa800) AM_READ(input_port_0_r) - AM_RANGE(0xa801, 0xa801) AM_READ(input_port_1_r) - AM_RANGE(0xa802, 0xa802) AM_READ(input_port_2_r) - AM_RANGE(0xa803, 0xa803) AM_READ(input_port_3_r) - AM_RANGE(0xa807, 0xa807) AM_READ(input_port_4_r) + AM_RANGE(0xa800, 0xa800) AM_READ_PORT("DSWA") + AM_RANGE(0xa801, 0xa801) AM_READ_PORT("DSWB") + AM_RANGE(0xa802, 0xa802) AM_READ_PORT("IN0") + AM_RANGE(0xa803, 0xa803) AM_READ_PORT("IN1") + AM_RANGE(0xa807, 0xa807) AM_READ_PORT("IN2") ADDRESS_MAP_END @@ -1087,73 +1086,8 @@ ADDRESS_MAP_END INPUT PORTS, DIPs ***********************************************************/ -#define TAITO_COINAGE_WORLD_8 \ - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) ) \ - PORT_DIPSETTING( 0x10, DEF_STR( 3C_1C ) ) \ - PORT_DIPSETTING( 0x20, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) \ - PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_B ) ) \ - PORT_DIPSETTING( 0xc0, DEF_STR( 1C_2C ) ) \ - PORT_DIPSETTING( 0x80, DEF_STR( 1C_3C ) ) \ - PORT_DIPSETTING( 0x40, DEF_STR( 1C_4C ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 1C_6C ) ) - -#define TAITO_COINAGE_JAPAN_8 \ - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) ) \ - PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) \ - PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) ) \ - PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_B ) ) \ - PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) \ - PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) ) - -#define TAITO_COINAGE_JAPAN_NEW_8 \ - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) ) \ - PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) \ - PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) ) \ - PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_B ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) ) \ - PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) ) \ - PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) ) - -#define TAITO_COINAGE_US_8 \ - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coinage ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) ) \ - PORT_DIPSETTING( 0x10, DEF_STR( 3C_1C ) ) \ - PORT_DIPSETTING( 0x20, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) \ - PORT_DIPNAME( 0xc0, 0xc0, "Price to Continue" ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) ) \ - PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0x80, DEF_STR( 1C_1C ) ) \ - PORT_DIPSETTING( 0xc0, "Same as Start" ) - -#define TAITO_DIFFICULTY_8 \ - PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) \ - PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) \ - PORT_DIPSETTING( 0x03, DEF_STR( Medium ) ) \ - PORT_DIPSETTING( 0x01, DEF_STR( Hard ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) - -#define TAITO_L_PLAYERS_INPUT( player ) \ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(player) PORT_8WAY \ - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(player) PORT_8WAY \ - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(player) PORT_8WAY \ - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(player) PORT_8WAY \ - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(player) \ - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(player) \ - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - #define TAITO_L_SYSTEM_INPUT( type, impulse ) \ - PORT_START_TAG("IN3")\ + PORT_START_TAG("IN2")\ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT ) \ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) \ PORT_BIT( 0x04, type, IPT_COIN1 ) PORT_IMPULSE(impulse) \ @@ -1163,25 +1097,13 @@ ADDRESS_MAP_END PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 ) \ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) -#define TAITO_L_DSWA_2_4 \ - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) ) \ - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) \ - PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) \ - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) \ - PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - static INPUT_PORTS_START( fhawk ) PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) ) - TAITO_L_DSWA_2_4 - TAITO_COINAGE_WORLD_8 + TAITO_MACHINE_COCKTAIL + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) ) // all in manual PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1201,23 +1123,21 @@ static INPUT_PORTS_START( fhawk ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START_TAG("IN0") - TAITO_L_PLAYERS_INPUT( 1 ) + TAITO_JOY_UDLR_2_BUTTONS( 1 ) + PORT_START_TAG("IN1") - TAITO_L_PLAYERS_INPUT( 2 ) + TAITO_JOY_UDLR_2_BUTTONS( 2 ) TAITO_L_SYSTEM_INPUT( IP_ACTIVE_LOW, 4 ) INPUT_PORTS_END static INPUT_PORTS_START( fhawkj ) PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) ) - TAITO_L_DSWA_2_4 - TAITO_COINAGE_JAPAN_8 + TAITO_MACHINE_COCKTAIL + TAITO_COINAGE_JAPAN_OLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) ) // all in manual PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1237,22 +1157,21 @@ static INPUT_PORTS_START( fhawkj ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START_TAG("IN0") - TAITO_L_PLAYERS_INPUT( 1 ) + TAITO_JOY_UDLR_2_BUTTONS( 1 ) + PORT_START_TAG("IN1") - TAITO_L_PLAYERS_INPUT( 2 ) + TAITO_JOY_UDLR_2_BUTTONS( 2 ) + TAITO_L_SYSTEM_INPUT( IP_ACTIVE_LOW, 4 ) INPUT_PORTS_END static INPUT_PORTS_START( raimais ) PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) ) - TAITO_L_DSWA_2_4 - TAITO_COINAGE_WORLD_8 + TAITO_MACHINE_COCKTAIL + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPSETTING( 0x08, "80k and 160k" ) PORT_DIPSETTING( 0x0c, "80k only" ) @@ -1271,24 +1190,22 @@ static INPUT_PORTS_START( raimais ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START_TAG("IN0") - TAITO_L_PLAYERS_INPUT( 1 ) + TAITO_JOY_UDLR_2_BUTTONS( 1 ) + PORT_START_TAG("IN1") - TAITO_L_PLAYERS_INPUT( 2 ) + TAITO_JOY_UDLR_2_BUTTONS( 2 ) TAITO_L_SYSTEM_INPUT( IP_ACTIVE_HIGH, 1 ) INPUT_PORTS_END static INPUT_PORTS_START( raimaisj ) PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) ) - TAITO_L_DSWA_2_4 - TAITO_COINAGE_JAPAN_8 + TAITO_MACHINE_COCKTAIL + TAITO_COINAGE_JAPAN_OLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPSETTING( 0x08, "80k and 160k" ) PORT_DIPSETTING( 0x0c, "80k only" ) @@ -1307,166 +1224,129 @@ static INPUT_PORTS_START( raimaisj ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START_TAG("IN0") - TAITO_L_PLAYERS_INPUT( 1 ) + TAITO_JOY_UDLR_2_BUTTONS( 1 ) PORT_START_TAG("IN1") - TAITO_L_PLAYERS_INPUT( 2 ) + TAITO_JOY_UDLR_2_BUTTONS( 2 ) TAITO_L_SYSTEM_INPUT( IP_ACTIVE_HIGH, 1 ) INPUT_PORTS_END -#define CHAMPWR_DSWB \ - PORT_START_TAG("DSWB") \ - TAITO_DIFFICULTY_8 \ - PORT_DIPNAME( 0x0c, 0x0c, "Time" ) \ - PORT_DIPSETTING( 0x08, "2 minutes" ) \ - PORT_DIPSETTING( 0x0c, "3 minutes" ) \ - PORT_DIPSETTING( 0x04, "4 minutes" ) \ - PORT_DIPSETTING( 0x00, "5 minutes" ) \ - PORT_DIPNAME( 0x30, 0x30, "'1 minute' Lasts:" ) \ - PORT_DIPSETTING( 0x00, "30 sec" ) \ - PORT_DIPSETTING( 0x10, "40 sec" ) \ - PORT_DIPSETTING( 0x30, "50 sec" ) \ - PORT_DIPSETTING( 0x20, "60 sec" ) \ - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Allow_Continue ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) \ - PORT_DIPSETTING( 0x40, DEF_STR( On ) ) \ - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unused ) ) \ - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - -#define CHAMPWR_INPUTS \ - PORT_START_TAG("IN0") \ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) \ - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) \ - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 ) \ - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 ) \ - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) \ - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) \ - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_TILT ) \ - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) \ - \ - PORT_START_TAG("IN1") \ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(1) \ - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1) \ - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - \ - PORT_START_TAG("IN2") \ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) \ - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) \ - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) \ - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) \ - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) \ - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) \ - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) \ - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) - static INPUT_PORTS_START( champwr ) PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) // all 2 in manual - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) + TAITO_MACHINE_NO_COCKTAIL // all 2 in manual + TAITO_COINAGE_WORLD + + PORT_START_TAG("DSWB") + TAITO_DIFFICULTY + PORT_DIPNAME( 0x0c, 0x0c, "Time" ) + PORT_DIPSETTING( 0x08, "2 minutes" ) + PORT_DIPSETTING( 0x0c, "3 minutes" ) + PORT_DIPSETTING( 0x04, "4 minutes" ) + PORT_DIPSETTING( 0x00, "5 minutes" ) + PORT_DIPNAME( 0x30, 0x30, "'1 minute' Lasts:" ) + PORT_DIPSETTING( 0x00, "30 sec" ) + PORT_DIPSETTING( 0x10, "40 sec" ) + PORT_DIPSETTING( 0x30, "50 sec" ) + PORT_DIPSETTING( 0x20, "60 sec" ) + PORT_DIPNAME( 0x40, 0x40, DEF_STR( Allow_Continue ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x40, DEF_STR( On ) ) + PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unused ) ) + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - TAITO_L_DSWA_2_4 - TAITO_COINAGE_WORLD_8 - CHAMPWR_DSWB + PORT_START_TAG("IN0") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) + + PORT_START_TAG("IN1") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(1) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - CHAMPWR_INPUTS + PORT_START_TAG("IN2") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) INPUT_PORTS_END static INPUT_PORTS_START( champwrj ) - PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - TAITO_L_DSWA_2_4 - TAITO_COINAGE_JAPAN_8 + PORT_INCLUDE( champwr ) - CHAMPWR_DSWB - - CHAMPWR_INPUTS + PORT_MODIFY("DSWA") + TAITO_COINAGE_JAPAN_OLD INPUT_PORTS_END static INPUT_PORTS_START( champwru ) - PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - TAITO_L_DSWA_2_4 - TAITO_COINAGE_US_8 + PORT_INCLUDE( champwr ) - CHAMPWR_DSWB - - CHAMPWR_INPUTS + PORT_MODIFY("DSWA") + TAITO_COINAGE_US INPUT_PORTS_END -#define KURIKIN_DSWB \ - PORT_START_TAG("DSWB") \ - TAITO_DIFFICULTY_8 \ - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) \ - PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) \ - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) \ - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) \ - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) \ - PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) \ - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) \ - PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) \ - PORT_DIPNAME( 0x40, 0x40, "Bosses' messages" ) \ - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) \ - PORT_DIPSETTING( 0x40, DEF_STR( On ) ) \ - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Allow_Continue ) ) \ - PORT_DIPSETTING( 0x80, "5 Times" ) \ - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - static INPUT_PORTS_START( kurikint ) PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) ) - TAITO_L_DSWA_2_4 - TAITO_COINAGE_WORLD_8 + TAITO_MACHINE_COCKTAIL + TAITO_COINAGE_WORLD - KURIKIN_DSWB + PORT_START_TAG("DSWB") + TAITO_DIFFICULTY + PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x40, 0x40, "Bosses' messages" ) + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x40, DEF_STR( On ) ) + PORT_DIPNAME( 0x80, 0x80, DEF_STR( Allow_Continue ) ) + PORT_DIPSETTING( 0x80, "5 Times" ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START_TAG("IN0") - TAITO_L_PLAYERS_INPUT( 1 ) + TAITO_JOY_UDLR_2_BUTTONS( 1 ) PORT_START_TAG("IN1") - TAITO_L_PLAYERS_INPUT( 2 ) + TAITO_JOY_UDLR_2_BUTTONS( 2 ) TAITO_L_SYSTEM_INPUT( IP_ACTIVE_HIGH, 4 ) INPUT_PORTS_END static INPUT_PORTS_START( kurikinj ) - PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) ) - TAITO_L_DSWA_2_4 - TAITO_COINAGE_JAPAN_8 - - KURIKIN_DSWB - - PORT_START_TAG("IN0") - TAITO_L_PLAYERS_INPUT( 1 ) - - PORT_START_TAG("IN1") - TAITO_L_PLAYERS_INPUT( 2 ) + PORT_INCLUDE( kurikint ) - TAITO_L_SYSTEM_INPUT( IP_ACTIVE_HIGH, 4 ) + PORT_MODIFY("DSWA") + TAITO_COINAGE_JAPAN_OLD INPUT_PORTS_END static INPUT_PORTS_START( kurikina ) - PORT_START_TAG("DSWA") + PORT_INCLUDE( kurikint ) + + PORT_MODIFY("DSWA") PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) ) @@ -1479,9 +1359,9 @@ static INPUT_PORTS_START( kurikina ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - TAITO_COINAGE_WORLD_8 + TAITO_COINAGE_WORLD - PORT_START_TAG("DSWB") + PORT_MODIFY("DSWB") PORT_DIPNAME( 0x01, 0x01, "Level Select (Cheat)") PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1505,22 +1385,11 @@ static INPUT_PORTS_START( kurikina ) PORT_DIPNAME( 0x80, 0x80, "Slow Motion (Cheat)") PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - - PORT_START_TAG("IN0") - TAITO_L_PLAYERS_INPUT( 1 ) - - PORT_START_TAG("IN1") - TAITO_L_PLAYERS_INPUT( 2 ) - - TAITO_L_SYSTEM_INPUT( IP_ACTIVE_HIGH, 4 ) INPUT_PORTS_END static INPUT_PORTS_START( puzznic ) PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) ) - TAITO_L_DSWA_2_4 + TAITO_MACHINE_COCKTAIL /* There is no Coin B in the Manuals */ PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) @@ -1536,7 +1405,7 @@ static INPUT_PORTS_START( puzznic ) PORT_START_TAG("DSWB") /* Difficulty controls the Timer Speed (how many seconds are there in a minute) */ - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, "Retries" ) PORT_DIPSETTING( 0x00, "0" ) PORT_DIPSETTING( 0x04, "1" ) @@ -1590,11 +1459,11 @@ static INPUT_PORTS_START( plotting ) PORT_DIPNAME( 0x01, 0x01, "Play Mode" ) PORT_DIPSETTING( 0x00, "1 Player" ) PORT_DIPSETTING( 0x01, "2 Player" ) - TAITO_L_DSWA_2_4 - TAITO_COINAGE_WORLD_8 + TAITO_DSWA_BITS_1_TO_3 + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1639,12 +1508,12 @@ static INPUT_PORTS_START( palamed ) PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - TAITO_L_DSWA_2_4 - TAITO_COINAGE_JAPAN_NEW_8 + TAITO_DSWA_BITS_1_TO_3 + TAITO_COINAGE_JAPAN_NEW PORT_START_TAG("DSWB") /* Difficulty controls how fast the dice lines fall*/ - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, "Games for VS Victory" ) PORT_DIPSETTING( 0x08, "1 Game" ) PORT_DIPSETTING( 0x0c, "2 Games" ) @@ -1698,17 +1567,11 @@ static INPUT_PORTS_START( cachat ) PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x00, DEF_STR( Flip_Screen ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x02, DEF_STR( On ) ) - PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_NEW_8 + TAITO_DSWA_BITS_1_TO_3 + TAITO_COINAGE_JAPAN_NEW PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1764,17 +1627,11 @@ static INPUT_PORTS_START( tubeit ) PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x00, DEF_STR( Flip_Screen ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x02, DEF_STR( On ) ) - PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_WORLD_8 + TAITO_DSWA_BITS_1_TO_3 + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1830,18 +1687,12 @@ static INPUT_PORTS_START( horshoes ) PORT_DIPNAME( 0x01, 0x01, "Beer Frame Message" ) PORT_DIPSETTING( 0x01, "Break Time" ) PORT_DIPSETTING( 0x00, "Beer Frame" ) - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_US_8 /* According to the "United States Version" manual listing */ + TAITO_DSWA_BITS_1_TO_3 + TAITO_COINAGE_US /* According to the "United States Version" manual listing */ PORT_START_TAG("DSWB") /* Not for sure, the CPU seems to play better when set to Hardest */ - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x0c, 0x0c, "Time" ) PORT_DIPSETTING( 0x08, "20 sec" ) PORT_DIPSETTING( 0x0c, "30 sec" ) @@ -1914,7 +1765,7 @@ static INPUT_PORTS_START( plgirls ) PORT_START_TAG("DSWB") /* Difficulty controls the Ball Speed */ - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1977,7 +1828,7 @@ static INPUT_PORTS_START( plgirls2 ) PORT_DIPNAME( 0x08, 0x08, "Coin Mode" ) /* Coin Mode B not supported yet */ PORT_DIPSETTING( 0x08, "Mode A" ) PORT_DIPSETTING( 0x00, "Mode B" ) - TAITO_COINAGE_JAPAN_8 + TAITO_COINAGE_JAPAN_OLD /* Coin 1 is DSW 1, 5&6 - Coin 2 is DSW 1, 7&8 @@ -1997,7 +1848,7 @@ Mode B | Coin | 1cn/4pl |on |off| PORT_START_TAG("DSWB") /* Difficulty controls the number of hits requiered to destroy enemies */ - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, "Time" ) /* Simply listed as "Time", what exactly does it refer to? */ PORT_DIPSETTING( 0x04, "2 Seconds" ) PORT_DIPSETTING( 0x00, "3 Seconds" ) @@ -2059,10 +1910,10 @@ static INPUT_PORTS_START( cubybop ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_NEW_8 + TAITO_COINAGE_JAPAN_NEW PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2114,16 +1965,12 @@ static INPUT_PORTS_START( cubybop ) INPUT_PORTS_END static INPUT_PORTS_START( evilston ) - PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) ) - TAITO_L_DSWA_2_4 - TAITO_COINAGE_WORLD_8 + TAITO_MACHINE_COCKTAIL + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") - TAITO_DIFFICULTY_8 + TAITO_DIFFICULTY PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2135,11 +1982,11 @@ static INPUT_PORTS_START( evilston ) PORT_DIPSETTING( 0x20, "2" ) PORT_DIPSETTING( 0x10, "1" ) PORT_DIPSETTING( 0x00, "4" ) - PORT_DIPNAME( 0xc0, 0x00, DEF_STR( Language ) ) - PORT_DIPSETTING( 0x00, DEF_STR( English ) ) - PORT_DIPSETTING( 0x80, DEF_STR( English ) ) - PORT_DIPSETTING( 0x40, DEF_STR( English ) ) - PORT_DIPSETTING( 0xc0, DEF_STR( Japanese ) ) + PORT_DIPNAME( 0xc0, 0x00, DEF_STR( Language ) ) + PORT_DIPSETTING( 0x00, DEF_STR( English ) ) + PORT_DIPSETTING( 0x80, DEF_STR( English ) ) + PORT_DIPSETTING( 0x40, DEF_STR( English ) ) + PORT_DIPSETTING( 0xc0, DEF_STR( Japanese ) ) PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) @@ -2164,7 +2011,6 @@ static INPUT_PORTS_START( evilston ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL - INPUT_PORTS_END diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c index d9c0868180d..4127a220512 100644 --- a/src/mame/drivers/taito_z.c +++ b/src/mame/drivers/taito_z.c @@ -771,6 +771,7 @@ J1100256A VIDEO PCB ***************************************************************************/ #include "driver.h" +#include "taitoipt.h" #include "cpu/m68000/m68000.h" #include "machine/eeprom.h" #include "video/taitoic.h" @@ -1013,7 +1014,7 @@ static WRITE16_HANDLER( spacegun_output_bypass_w ) break; default: - TC0220IOC_w( machine,offset,data ); /* might be a 510NIO ! */ + TC0220IOC_w(machine, offset, data); /* might be a 510NIO ! */ } } @@ -1026,23 +1027,23 @@ static READ16_HANDLER( contcirc_input_bypass_r ) { /* Bypass TC0220IOC controller for analog input */ - UINT8 port = TC0220IOC_port_r(machine,0); /* read port number */ + UINT8 port = TC0220IOC_port_r(machine, 0); /* read port number */ int steer = 0; - int fake = input_port_read_indexed(machine,6); + int fake = input_port_read(machine, "FAKE"); - if (!(fake &0x10)) /* Analogue steer (the real control method) */ + if (!(fake & 0x10)) /* Analogue steer (the real control method) */ { /* center around zero and reduce span to 0xc0 */ - steer = ((input_port_read_indexed(machine,5) - 0x80) * 0xc0) / 0x100; + steer = ((input_port_read(machine, "STEER") - 0x80) * 0xc0) / 0x100; } else /* Digital steer */ { - if (fake &0x4) + if (fake & 0x04) { steer = 0x60; } - else if (fake &0x8) + else if (fake & 0x08) { steer = 0xff9f; } @@ -1051,13 +1052,13 @@ static READ16_HANDLER( contcirc_input_bypass_r ) switch (port) { case 0x08: - return steer &0xff; + return steer & 0xff; case 0x09: return steer >> 8; default: - return TC0220IOC_portreg_r( machine,offset ); + return TC0220IOC_portreg_r(machine, offset); } } @@ -1066,22 +1067,22 @@ static READ16_HANDLER( chasehq_input_bypass_r ) { /* Bypass TC0220IOC controller for extra inputs */ - UINT8 port = TC0220IOC_port_r(machine,0); /* read port number */ + UINT8 port = TC0220IOC_port_r(machine, 0); /* read port number */ int steer = 0; - int fake = input_port_read_indexed(machine,10); + int fake = input_port_read(machine, "FAKE"); - if (!(fake &0x10)) /* Analogue steer (the real control method) */ + if (!(fake & 0x10)) /* Analogue steer (the real control method) */ { /* center around zero */ - steer = input_port_read_indexed(machine,9) - 0x80; + steer = input_port_read(machine, "STEER") - 0x80; } else /* Digital steer */ { - if (fake &0x4) + if (fake & 0x04) { steer = 0xff80; } - else if (fake &0x8) + else if (fake & 0x08) { steer = 0x7f; } @@ -1090,25 +1091,25 @@ static READ16_HANDLER( chasehq_input_bypass_r ) switch (port) { case 0x08: - return input_port_read_indexed(machine,5); + return input_port_read(machine, "UNK1"); case 0x09: - return input_port_read_indexed(machine,6); + return input_port_read(machine, "UNK2"); case 0x0a: - return input_port_read_indexed(machine,7); + return input_port_read(machine, "UNK3"); case 0x0b: - return input_port_read_indexed(machine,8); + return input_port_read(machine, "UNK4"); case 0x0c: - return steer &0xff; + return steer & 0xff; case 0x0d: return steer >> 8; default: - return TC0220IOC_portreg_r( machine, offset ); + return TC0220IOC_portreg_r(machine, offset); } } @@ -1118,19 +1119,19 @@ static READ16_HANDLER( bshark_stick_r ) switch (offset) { case 0x00: - return input_port_read_indexed(machine,5); + return input_port_read(machine, "STICKX"); case 0x01: - return input_port_read_indexed(machine,6); + return input_port_read(machine, "X_ADJUST"); case 0x02: - return input_port_read_indexed(machine,7); + return input_port_read(machine, "STICKY"); case 0x03: - return input_port_read_indexed(machine,8); + return input_port_read(machine, "Y_ADJUST"); } -logerror("CPU #0 PC %06x: warning - read unmapped stick offset %06x\n",activecpu_get_pc(),offset); + logerror("CPU #0 PC %06x: warning - read unmapped stick offset %06x\n", activecpu_get_pc(), offset); return 0xff; } @@ -1141,19 +1142,19 @@ static READ16_HANDLER( nightstr_stick_r ) switch (offset) { case 0x00: - return input_port_read_indexed(machine,5); + return input_port_read(machine, "STICKX"); case 0x01: - return input_port_read_indexed(machine,6); + return input_port_read(machine, "STICKY"); case 0x02: - return input_port_read_indexed(machine,7); + return input_port_read(machine, "X_ADJUST"); case 0x03: - return input_port_read_indexed(machine,8); + return input_port_read(machine, "Y_ADJUST"); } -logerror("CPU #0 PC %06x: warning - read unmapped stick offset %06x\n",activecpu_get_pc(),offset); + logerror("CPU #0 PC %06x: warning - read unmapped stick offset %06x\n", activecpu_get_pc(), offset); return 0xff; } @@ -1173,20 +1174,20 @@ static WRITE16_HANDLER( bshark_stick_w ) static READ16_HANDLER( sci_steer_input_r ) { int steer = 0; - int fake = input_port_read_indexed(machine,6); + int fake = input_port_read(machine, "FAKE"); - if (!(fake &0x10)) /* Analogue steer (the real control method) */ + if (!(fake & 0x10)) /* Analogue steer (the real control method) */ { /* center around zero and reduce span to 0xc0 */ - steer = ((input_port_read_indexed(machine,5) - 0x80) * 0xc0) / 0x100; + steer = ((input_port_read(machine, "STEER") - 0x80) * 0xc0) / 0x100; } else /* Digital steer */ { - if (fake &0x4) + if (fake & 0x04) { steer = 0xffa0; } - else if (fake &0x8) + else if (fake & 0x08) { steer = 0x5f; } @@ -1201,7 +1202,7 @@ static READ16_HANDLER( sci_steer_input_r ) return (steer & 0xff00) >> 8; } -logerror("CPU #0 PC %06x: warning - read unmapped steer input offset %06x\n",activecpu_get_pc(),offset); + logerror("CPU #0 PC %06x: warning - read unmapped steer input offset %06x\n", activecpu_get_pc(), offset); return 0xff; } @@ -1215,7 +1216,7 @@ static READ16_HANDLER( spacegun_input_bypass_r ) return eeprom_r(); default: - return TC0220IOC_r( machine, offset ); /* might be a 510NIO ! */ + return TC0220IOC_r(machine, offset); /* might be a 510NIO ! */ } } @@ -1224,19 +1225,19 @@ static READ16_HANDLER( spacegun_lightgun_r ) switch (offset) { case 0x00: - return input_port_read_indexed(machine,5); /* P1X */ + return input_port_read(machine, "STICKX1"); case 0x01: - return input_port_read_indexed(machine,6); /* P1Y */ + return input_port_read(machine, "STICKY1"); case 0x02: - return input_port_read_indexed(machine,7); /* P2X */ + return input_port_read(machine, "STICKX2"); case 0x03: - return input_port_read_indexed(machine,8); /* P2Y */ + return input_port_read(machine, "STICKY2"); } - return 0x0; + return 0x00; } static WRITE16_HANDLER( spacegun_lightgun_w ) @@ -1256,20 +1257,20 @@ static WRITE16_HANDLER( spacegun_lightgun_w ) static READ16_HANDLER( dblaxle_steer_input_r ) { int steer = 0; - int fake = input_port_read_indexed(machine,6); + int fake = input_port_read(machine, "FAKE"); - if (!(fake &0x10)) /* Analogue steer (the real control method) */ + if (!(fake & 0x10)) /* Analogue steer (the real control method) */ { /* center around zero and reduce span to 0x80 */ - steer = ((input_port_read_indexed(machine,5) - 0x80) * 0x80) / 0x100; + steer = ((input_port_read(machine, "STEER") - 0x80) * 0x80) / 0x100; } else /* Digital steer */ { - if (fake &0x4) + if (fake & 0x04) { steer = 0xffc0; } - else if (fake &0x8) + else if (fake & 0x08) { steer = 0x3f; } @@ -1281,10 +1282,11 @@ static READ16_HANDLER( dblaxle_steer_input_r ) return steer >> 8; case 0x05: - return steer &0xff; + return steer & 0xff; } -logerror("CPU #0 PC %06x: warning - read unmapped steer input offset %02x\n",activecpu_get_pc(),offset); + logerror("CPU #0 PC %06x: warning - read unmapped steer input offset %02x\n", activecpu_get_pc(), offset); + return 0x00; } @@ -1405,7 +1407,7 @@ static WRITE8_HANDLER( taitoz_pancontrol ) static WRITE16_HANDLER( spacegun_pancontrol ) { if (ACCESSING_BITS_0_7) - taitoz_pancontrol(machine,offset,data & 0xff); + taitoz_pancontrol(machine, offset, data & 0xff); } @@ -2189,52 +2191,9 @@ ADDRESS_MAP_END PORT_DIPSETTING( 0xfe, "+7E" ) \ PORT_DIPSETTING( 0xff, "+7F" ) -#define TAITO_Z_COINAGE_JAPAN_8 \ - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW A:5,6") \ - PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) \ - PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) ) \ - PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW A:7,8") \ - PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) ) \ - PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) ) - -#define TAITO_Z_COINAGE_WORLD_8 \ - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW A:5,6") \ - PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) ) \ - PORT_DIPSETTING( 0x10, DEF_STR( 3C_1C ) ) \ - PORT_DIPSETTING( 0x20, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) \ - PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW A:7,8") \ - PORT_DIPSETTING( 0xc0, DEF_STR( 1C_2C ) ) \ - PORT_DIPSETTING( 0x80, DEF_STR( 1C_3C ) ) \ - PORT_DIPSETTING( 0x40, DEF_STR( 1C_4C ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( 1C_6C ) ) - -#define TAITO_Z_COINAGE_US_8 \ - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW A:5,6") \ - PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) ) \ - PORT_DIPSETTING( 0x10, DEF_STR( 3C_1C ) ) \ - PORT_DIPSETTING( 0x20, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) ) \ - PORT_DIPNAME( 0xc0, 0xc0, "Price to Continue" ) PORT_DIPLOCATION("SW A:7,8") \ - PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) ) \ - PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0x80, DEF_STR( 1C_1C ) ) \ - PORT_DIPSETTING( 0xc0, "Same as Start" ) - -#define TAITO_Z_DIFFICULTY_8 \ - PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW B:1,2")\ - PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) \ - PORT_DIPSETTING( 0x03, DEF_STR( Normal ) ) \ - PORT_DIPSETTING( 0x01, DEF_STR( Hard ) ) \ - PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) - static INPUT_PORTS_START( contcirc ) - PORT_START_TAG("DSW1") /* DSW A */ + PORT_START_TAG("DSWA") /* DSW A */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW A:1") PORT_DIPSETTING( 0x01, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x00, "Cockpit" ) // analogue accelerator pedal @@ -2245,9 +2204,9 @@ static INPUT_PORTS_START( contcirc ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW A:4") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_Z_COINAGE_WORLD_8 + TAITO_COINAGE_WORLD_LOC(SW A) - PORT_START_TAG("DSW2") /* DSW B */ + PORT_START_TAG("DSWB") /* DSW B */ PORT_DIPNAME( 0x03, 0x03, "Difficulty 1 (time/speed)" ) PORT_DIPLOCATION("SW B:1,2") PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x03, DEF_STR( Normal ) ) @@ -2267,7 +2226,7 @@ static INPUT_PORTS_START( contcirc ) PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW B:7" ) PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW B:8" ) - 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_HIGH, IPT_COIN2 ) @@ -2277,7 +2236,7 @@ static INPUT_PORTS_START( contcirc ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) /* main accel key */ - PORT_START /* IN1: b3 not mapped: standardized on holding b4=lo gear */ + PORT_START_TAG("IN1") /* IN1: b3 not mapped: standardized on holding b4=lo gear */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT ) @@ -2287,12 +2246,13 @@ static INPUT_PORTS_START( contcirc ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) /* main brake key */ - PORT_START /* IN2, unused */ + PORT_START_TAG("IN2") /* IN2, unused */ + PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN3, "handle" i.e. steering */ + PORT_START_TAG("STEER") /* IN3, "handle" i.e. steering */ PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(15) PORT_REVERSE PORT_PLAYER(1) - PORT_START /* IN4, fake allowing digital steer */ + PORT_START_TAG("FAKE") /* IN4, fake allowing digital steer */ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1) PORT_DIPNAME( 0x10, 0x00, "Steering type" ) @@ -2303,12 +2263,12 @@ INPUT_PORTS_END static INPUT_PORTS_START( contcrcu ) PORT_INCLUDE(contcirc) - PORT_MODIFY("DSW1") - TAITO_Z_COINAGE_JAPAN_8 // confirmed + PORT_MODIFY("DSWA") // confirmed + TAITO_COINAGE_JAPAN_OLD_LOC(SW A) INPUT_PORTS_END static INPUT_PORTS_START( chasehq ) // IN3-6 perhaps used with cockpit setup? // - PORT_START_TAG("DSW1") /* DSW A */ + PORT_START_TAG("DSWA") /* DSW A */ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW A:1,2") /* US Manual states DIPS 1 & 2 "MUST REMAIN OFF" */ PORT_DIPSETTING( 0x03, "Upright / Steering Lock" ) PORT_DIPSETTING( 0x02, "Upright / No Steering Lock" ) @@ -2318,10 +2278,10 @@ static INPUT_PORTS_START( chasehq ) // IN3-6 perhaps used with cockpit setup? // PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW A:4") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_Z_COINAGE_WORLD_8 + TAITO_COINAGE_WORLD_LOC(SW A) - PORT_START_TAG("DSW2") /* DSW B */ - TAITO_Z_DIFFICULTY_8 + PORT_START_TAG("DSWB") /* DSW B */ + TAITO_DIFFICULTY_LOC(SW B) PORT_DIPNAME( 0x0c, 0x0c, "Timer Setting" ) PORT_DIPLOCATION("SW B:3,4") PORT_DIPSETTING( 0x08, "70 Seconds" ) PORT_DIPSETTING( 0x04, "65 Seconds" ) @@ -2340,7 +2300,7 @@ static INPUT_PORTS_START( chasehq ) // IN3-6 perhaps used with cockpit setup? // PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x80, DEF_STR( On ) ) - PORT_START /* 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_HIGH, IPT_COIN1 ) @@ -2350,7 +2310,7 @@ static INPUT_PORTS_START( chasehq ) // IN3-6 perhaps used with cockpit setup? // PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* IN1 */ + PORT_START_TAG("IN1") /* IN1 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) /* turbo */ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -2360,9 +2320,10 @@ static INPUT_PORTS_START( chasehq ) // IN3-6 perhaps used with cockpit setup? // PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* IN2, unused */ + PORT_START_TAG("IN2") /* IN2, unused */ + PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN3, ??? */ + PORT_START_TAG("UNK1") /* IN3, ??? */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -2372,7 +2333,7 @@ static INPUT_PORTS_START( chasehq ) // IN3-6 perhaps used with cockpit setup? // PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* IN4, ??? */ + PORT_START_TAG("UNK2") /* IN4, ??? */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -2382,7 +2343,7 @@ static INPUT_PORTS_START( chasehq ) // IN3-6 perhaps used with cockpit setup? // PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* IN5, ??? */ + PORT_START_TAG("UNK3") /* IN5, ??? */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -2392,7 +2353,7 @@ static INPUT_PORTS_START( chasehq ) // IN3-6 perhaps used with cockpit setup? // PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* IN6, ??? */ + PORT_START_TAG("UNK4") /* IN6, ??? */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -2402,10 +2363,10 @@ static INPUT_PORTS_START( chasehq ) // IN3-6 perhaps used with cockpit setup? // PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* IN7, steering */ + PORT_START_TAG("STEER") /* IN7, steering */ PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(15) PORT_PLAYER(1) - PORT_START /* IN8, fake allowing digital steer */ + PORT_START_TAG("FAKE") /* IN8, fake allowing digital steer */ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1) PORT_DIPNAME( 0x10, 0x00, "Steering type" ) @@ -2416,22 +2377,22 @@ INPUT_PORTS_END static INPUT_PORTS_START( chasehqj ) PORT_INCLUDE(chasehq) - PORT_MODIFY("DSW1") - TAITO_Z_COINAGE_JAPAN_8 + PORT_MODIFY("DSWA") + TAITO_COINAGE_JAPAN_OLD_LOC(SW A) INPUT_PORTS_END static INPUT_PORTS_START( enforce ) - PORT_START /* DSW A */ + PORT_START_TAG("DSWA") /* DSW A */ PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW A:1" ) PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "SW A:2" ) PORT_SERVICE_DIPLOC( 0x04, 0x04, "SW A:3" ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW A:4") - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) // Says SHIFT HI in test mode !? + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) // Says SHIFT HI in test mode !? PORT_DIPSETTING( 0x08, DEF_STR( On ) ) // Says SHIFT LO in test mode !? - TAITO_Z_COINAGE_JAPAN_8 + TAITO_COINAGE_JAPAN_OLD_LOC(SW A) - PORT_START /* DSW B */ - TAITO_Z_DIFFICULTY_8 + PORT_START_TAG("DSWB") /* DSW B */ + TAITO_DIFFICULTY_LOC(SW B) PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "SW B:3" ) PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "SW B:4" ) PORT_DIPNAME( 0x10, 0x00, "Background scenery" ) PORT_DIPLOCATION("SW B:5") @@ -2441,7 +2402,7 @@ static INPUT_PORTS_START( enforce ) PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW B:7" ) PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW B:8" ) - 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_HIGH, IPT_COIN2 ) @@ -2451,7 +2412,7 @@ static INPUT_PORTS_START( enforce ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) - PORT_START /* IN1 */ + PORT_START_TAG("IN1") /* IN1 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) /* Bomb */ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) /* Laser */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT ) @@ -2460,10 +2421,13 @@ static INPUT_PORTS_START( enforce ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) + + PORT_START_TAG("IN2") /* IN2, unused */ + PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END static INPUT_PORTS_START( bshark ) - PORT_START_TAG("DSW1") /* DSW A */ + PORT_START_TAG("DSWA") /* DSW A */ PORT_DIPNAME( 0x01, 0x01, "Mirror screen" ) PORT_DIPLOCATION("SW A:1") // manual says it must be off PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -2472,10 +2436,10 @@ static INPUT_PORTS_START( bshark ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW A:4") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_Z_COINAGE_US_8 + TAITO_COINAGE_US_LOC(SW A) - PORT_START_TAG("DSW2") /* DSW B */ - TAITO_Z_DIFFICULTY_8 + PORT_START_TAG("DSWB") /* DSW B */ + TAITO_DIFFICULTY_LOC(SW B) PORT_DIPNAME( 0x0c, 0x04, "Speed of Sight" ) PORT_DIPLOCATION("SW B:3,4") PORT_DIPSETTING( 0x0c, "Slow" ) PORT_DIPSETTING( 0x08, DEF_STR( Medium ) ) @@ -2486,7 +2450,7 @@ static INPUT_PORTS_START( bshark ) PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW B:7" ) PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW B:8" ) - PORT_START /* IN0 */ + PORT_START_TAG("IN0") /* IN0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -2496,9 +2460,10 @@ static INPUT_PORTS_START( bshark ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* IN1, unused */ + PORT_START_TAG("IN1") /* IN1, unused */ + PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN2, b2-5 affect sound num in service mode but otherwise useless (?) */ + PORT_START_TAG("IN2") /* IN2, b2-5 affect sound num in service mode but otherwise useless (?) */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) @@ -2508,28 +2473,28 @@ static INPUT_PORTS_START( bshark ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) /* "Fire" */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) /* same as "Fire" */ - PORT_START /* values chosen to match allowed crosshair area */ + PORT_START_TAG("STICKX") /* values chosen to match allowed crosshair area */ PORT_BIT( 0xff, 0x00, IPT_AD_STICK_X ) PORT_MINMAX(0xcc,0x35) PORT_SENSITIVITY(20) PORT_KEYDELTA(4) PORT_REVERSE PORT_PLAYER(1) - PORT_START /* "X adjust" */ /* declare as DIP SWITCH instead of VARIABLE REGISTER */ + PORT_START_TAG("X_ADJUST") /* declare as DIP SWITCH instead of VARIABLE REGISTER */ TAITO_Z_ANALOG_ADJUST( "Adjust Stick H (VARIABLE REGISTER)" ) - PORT_START /* values chosen to match allowed crosshair area */ + PORT_START_TAG("STICKY") /* values chosen to match allowed crosshair area */ PORT_BIT( 0xff, 0x00, IPT_AD_STICK_Y ) PORT_MINMAX(0xd5,0x32) PORT_SENSITIVITY(20) PORT_KEYDELTA(4) PORT_PLAYER(1) - PORT_START /* "Y adjust" */ /* declare as DIP SWITCH instead of VARIABLE REGISTER */ + PORT_START_TAG("Y_ADJUST") /* declare as DIP SWITCH instead of VARIABLE REGISTER */ TAITO_Z_ANALOG_ADJUST( "Adjust Stick V (VARIABLE REGISTER)" ) INPUT_PORTS_END static INPUT_PORTS_START( bsharkj ) PORT_INCLUDE(bshark) - PORT_MODIFY("DSW1") - TAITO_Z_COINAGE_JAPAN_8 + PORT_MODIFY("DSWA") + TAITO_COINAGE_JAPAN_OLD_LOC(SW A) INPUT_PORTS_END static INPUT_PORTS_START( sci ) - PORT_START_TAG("DSW1") /* DSW A */ + PORT_START_TAG("DSWA") /* DSW A */ PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW A:1") PORT_DIPSETTING( 0x01, "Cockpit" ) PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) @@ -2538,10 +2503,10 @@ static INPUT_PORTS_START( sci ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW A:4") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_Z_COINAGE_WORLD_8 + TAITO_COINAGE_WORLD_LOC(SW A) - PORT_START_TAG("DSW2") /* DSW B */ - TAITO_Z_DIFFICULTY_8 + PORT_START_TAG("DSWB") /* DSW B */ + TAITO_DIFFICULTY_LOC(SW B) PORT_DIPNAME( 0x0c, 0x0c, "Timer Setting" ) PORT_DIPLOCATION("SW B:3,4") PORT_DIPSETTING( 0x08, "70 Seconds" ) PORT_DIPSETTING( 0x04, "65 Seconds" ) @@ -2560,7 +2525,7 @@ static INPUT_PORTS_START( sci ) PORT_DIPSETTING( 0x80, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x00, DEF_STR( Low ) ) - PORT_START /* IN0 */ + PORT_START_TAG("IN0") /* IN0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) /* fire */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) @@ -2570,7 +2535,7 @@ static INPUT_PORTS_START( sci ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* IN1 */ + PORT_START_TAG("IN1") /* IN1 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) /* turbo */ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) /* "center" */ @@ -2580,12 +2545,13 @@ static INPUT_PORTS_START( sci ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* IN2, unused */ + PORT_START_TAG("IN2") /* IN2, unused */ + PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN3, steering */ + PORT_START_TAG("STEER") /* IN3, steering */ PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(15) PORT_PLAYER(1) - PORT_START /* IN4, fake allowing digital steer */ + PORT_START_TAG("FAKE") /* IN4, fake allowing digital steer */ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1) PORT_DIPNAME( 0x10, 0x00, "Steering type" ) @@ -2596,19 +2562,19 @@ INPUT_PORTS_END static INPUT_PORTS_START( sciu ) PORT_INCLUDE(sci) - PORT_MODIFY("DSW1") - TAITO_Z_COINAGE_US_8 + PORT_MODIFY("DSWA") + TAITO_COINAGE_US_LOC(SW A) INPUT_PORTS_END static INPUT_PORTS_START( scij ) PORT_INCLUDE(sci) - PORT_MODIFY("DSW1") - TAITO_Z_COINAGE_JAPAN_8 + PORT_MODIFY("DSWA") + TAITO_COINAGE_JAPAN_OLD_LOC(SW A) INPUT_PORTS_END static INPUT_PORTS_START( nightstr ) - PORT_START_TAG("DSW1") /* DSW A */ + PORT_START_TAG("DSWA") /* DSW A */ PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW A:1") PORT_DIPSETTING( 0x01, "Cockpit" ) PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) @@ -2617,10 +2583,10 @@ static INPUT_PORTS_START( nightstr ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW A:4") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_Z_COINAGE_WORLD_8 + TAITO_COINAGE_WORLD_LOC(SW A) - PORT_START_TAG("DSW2") /* DSW B */ - TAITO_Z_DIFFICULTY_8 + PORT_START_TAG("DSWB") /* DSW B */ + TAITO_DIFFICULTY_LOC(SW B) PORT_DIPNAME( 0x0c, 0x0c, "Bonus Shields" ) PORT_DIPLOCATION("SW B:3,4") PORT_DIPSETTING( 0x08, "3" ) PORT_DIPSETTING( 0x04, "2" ) @@ -2638,7 +2604,7 @@ static INPUT_PORTS_START( nightstr ) PORT_DIPSETTING( 0x80, "7 Shots / Second" ) PORT_DIPSETTING( 0x00, "10 Shots / Second" ) - 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 ) @@ -2648,9 +2614,10 @@ static INPUT_PORTS_START( nightstr ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_TILT ) - PORT_START /* IN1, unused */ + PORT_START_TAG("IN1") /* IN1, unused */ + PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN2 */ + PORT_START_TAG("IN2") /* IN2 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) @@ -2660,35 +2627,35 @@ static INPUT_PORTS_START( nightstr ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) - PORT_START + PORT_START_TAG("STICKX") PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(60) PORT_KEYDELTA(15) PORT_PLAYER(1) - PORT_START + PORT_START_TAG("STICKY") PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(60) PORT_KEYDELTA(15) PORT_REVERSE PORT_PLAYER(1) - PORT_START /* X offset */ /* declare as DIP SWITCH instead of VARIABLE REGISTER */ + PORT_START_TAG("X_ADJUST") /* declare as DIP SWITCH instead of VARIABLE REGISTER */ TAITO_Z_ANALOG_ADJUST( "Adjust Stick H (VARIABLE REGISTER)" ) - PORT_START /* Y offset */ /* declare as DIP SWITCH instead of VARIABLE REGISTER */ + PORT_START_TAG("Y_ADJUST") /* declare as DIP SWITCH instead of VARIABLE REGISTER */ TAITO_Z_ANALOG_ADJUST( "Adjust Stick V (VARIABLE REGISTER)" ) INPUT_PORTS_END static INPUT_PORTS_START( nghtstrj ) PORT_INCLUDE( nightstr ) - PORT_MODIFY("DSW1") - TAITO_Z_COINAGE_JAPAN_8 + PORT_MODIFY("DSWA") + TAITO_COINAGE_JAPAN_OLD_LOC(SW A) INPUT_PORTS_END static INPUT_PORTS_START( nghtstru ) PORT_INCLUDE( nightstr ) - PORT_MODIFY("DSW1") - TAITO_Z_COINAGE_US_8 + PORT_MODIFY("DSWA") + TAITO_COINAGE_US_LOC(SW A) INPUT_PORTS_END static INPUT_PORTS_START( aquajack ) - PORT_START_TAG("DSW1") /* DSW A */ + PORT_START_TAG("DSWA") /* DSW A */ PORT_DIPNAME( 0x80, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW A:1") PORT_DIPSETTING( 0x80, "Cockpit" ) PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) @@ -2708,7 +2675,7 @@ static INPUT_PORTS_START( aquajack ) PORT_DIPSETTING( 0x02, DEF_STR( 1C_4C ) ) /* 2 Coins to Continue */ PORT_DIPSETTING( 0x00, DEF_STR( 1C_6C ) ) /* 3 Coins to Continue */ - PORT_START_TAG("DSW2") /* DSW B */ + PORT_START_TAG("DSWB") /* DSW B */ PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW B:2,1") PORT_DIPSETTING( 0x40, DEF_STR( Easy ) ) PORT_DIPSETTING( 0xc0, DEF_STR( Normal ) ) @@ -2734,7 +2701,7 @@ static INPUT_PORTS_START( aquajack ) /* PORT_DIPSETTING( 0x01, "Normal Game" ) */ /* PORT_DIPSETTING( 0x00, "Endless Game" ) */ - PORT_START /* IN0 */ + PORT_START_TAG("IN0") /* IN0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) @@ -2744,7 +2711,7 @@ static INPUT_PORTS_START( aquajack ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* IN1 */ + PORT_START_TAG("IN1") /* IN1 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) @@ -2754,14 +2721,14 @@ static INPUT_PORTS_START( aquajack ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* IN2, what is it ??? */ + PORT_START_TAG("IN2") /* IN2, what is it ??? */ PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(1) INPUT_PORTS_END static INPUT_PORTS_START( aquajckj ) PORT_INCLUDE(aquajack) - PORT_MODIFY("DSW1") + PORT_MODIFY("DSWA") PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW A:6,5") PORT_DIPSETTING( 0x08, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x0c, DEF_STR( 1C_1C ) ) @@ -2775,7 +2742,7 @@ static INPUT_PORTS_START( aquajckj ) INPUT_PORTS_END static INPUT_PORTS_START( spacegun ) - PORT_START /* DSW A */ + PORT_START_TAG("DSWA") /* DSW A */ PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW A:1" ) // Manual says Always Off PORT_DIPNAME( 0x02, 0x02, "Always have gunsight power up" ) PORT_DIPLOCATION("SW A:2") PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) @@ -2784,10 +2751,10 @@ static INPUT_PORTS_START( spacegun ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW A:4") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_Z_COINAGE_WORLD_8 + TAITO_COINAGE_WORLD_LOC(SW A) - PORT_START /* DSW B */ - TAITO_Z_DIFFICULTY_8 + PORT_START_TAG("DSWB") /* DSW B */ + TAITO_DIFFICULTY_LOC(SW B) PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "SW B:3" ) // Manual lists dips 3 through 6 and 8 as Always off PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "SW B:4" ) PORT_DIPUNUSED_DIPLOC( 0x10, 0x10, "SW B:5" ) @@ -2799,7 +2766,7 @@ static INPUT_PORTS_START( spacegun ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* IN0 */ + PORT_START_TAG("IN0") /* IN0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 ) @@ -2809,9 +2776,10 @@ static INPUT_PORTS_START( spacegun ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2) - PORT_START /* IN1, unused */ + PORT_START_TAG("IN1") /* IN1, unused */ + PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN2 */ + PORT_START_TAG("IN2") /* IN2 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) @@ -2821,21 +2789,21 @@ static INPUT_PORTS_START( spacegun ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("STICKX1") PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(22) PORT_REVERSE PORT_PLAYER(1) - PORT_START + PORT_START_TAG("STICKY1") PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(22) PORT_PLAYER(1) - PORT_START + PORT_START_TAG("STICKX2") PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(20) PORT_KEYDELTA(22) PORT_REVERSE PORT_PLAYER(2) - PORT_START + PORT_START_TAG("STICKY2") PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_SENSITIVITY(20) PORT_KEYDELTA(22) PORT_PLAYER(2) INPUT_PORTS_END static INPUT_PORTS_START( dblaxle ) - PORT_START_TAG("DSW1") /* DSW A */ + PORT_START_TAG("DSWA") /* DSW A */ PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW A:1" ) PORT_DIPNAME( 0x02, 0x02, "Gear shift" ) PORT_DIPLOCATION("SW A:2") PORT_DIPSETTING( 0x02, DEF_STR( Normal ) ) @@ -2844,10 +2812,10 @@ static INPUT_PORTS_START( dblaxle ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW A:4") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_Z_COINAGE_US_8 + TAITO_COINAGE_US_LOC(SW A) - PORT_START_TAG("DSW2") /* DSW B */ - TAITO_Z_DIFFICULTY_8 + PORT_START_TAG("DSWB") /* DSW B */ + TAITO_DIFFICULTY_LOC(SW B) PORT_DIPNAME( 0x04, 0x00, "Multi-machine hookup ?" ) PORT_DIPLOCATION("SW B:3") // doesn't boot if on PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x04, DEF_STR( On ) ) @@ -2861,7 +2829,7 @@ static INPUT_PORTS_START( dblaxle ) PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW B:7" ) PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW B:8" ) - PORT_START /* IN0 */ + PORT_START_TAG("IN0") /* IN0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) /* shift */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) @@ -2871,7 +2839,7 @@ static INPUT_PORTS_START( dblaxle ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_PLAYER(1) /* "back" */ - PORT_START /* IN1 */ + PORT_START_TAG("IN1") /* IN1 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) /* nitro */ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) /* "center" */ @@ -2881,12 +2849,13 @@ static INPUT_PORTS_START( dblaxle ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* IN2, unused */ + PORT_START_TAG("IN2") /* IN2, unused */ + PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* IN3, steering */ + PORT_START_TAG("STEER") /* IN3, steering */ PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(40) PORT_KEYDELTA(10) PORT_PLAYER(1) - PORT_START /* IN4, fake allowing digital steer */ + PORT_START_TAG("FAKE") /* IN4, fake allowing digital steer */ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_PLAYER(1) PORT_DIPNAME( 0x10, 0x00, "Steering type" ) @@ -2897,8 +2866,8 @@ INPUT_PORTS_END static INPUT_PORTS_START( pwheelsj ) PORT_INCLUDE(dblaxle) - PORT_MODIFY("DSW1") - TAITO_Z_COINAGE_JAPAN_8 + PORT_MODIFY("DSWA") + TAITO_COINAGE_JAPAN_OLD_LOC(SW A) INPUT_PORTS_END @@ -4693,4 +4662,3 @@ GAME( 1990, spacegun, 0, spacegun, spacegun, bshark, ORIENTATION_FLIP_X GAME( 1991, dblaxle, 0, dblaxle, dblaxle, taitoz, ROT0, "Taito America Corporation", "Double Axle (US)", GAME_IMPERFECT_GRAPHICS ) GAME( 1991, pwheelsj, dblaxle, dblaxle, pwheelsj, taitoz, ROT0, "Taito Corporation", "Power Wheels (Japan)", GAME_IMPERFECT_GRAPHICS ) GAME( 1991, racingb, 0, racingb, dblaxle, taitoz, ROT0, "Taito Corporation Japan", "Racing Beat (World)", GAME_IMPERFECT_GRAPHICS | GAME_NOT_WORKING ) - diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c index 75a7c738306..e67c2b43e22 100644 --- a/src/mame/drivers/taitojc.c +++ b/src/mame/drivers/taitojc.c @@ -420,7 +420,7 @@ static READ32_HANDLER ( jc_control_r ) { if (ACCESSING_BITS_24_31) { - r |= ((input_port_read_indexed(machine, 0) & 0x2) << 2) << 24; + r |= ((input_port_read(machine, "COINS") & 0x2) << 2) << 24; } return r; } @@ -429,7 +429,7 @@ static READ32_HANDLER ( jc_control_r ) if (ACCESSING_BITS_24_31) { UINT32 data = eeprom_read_bit() & 1; - data |= input_port_read_indexed(machine, 0) & 0xfe; + data |= input_port_read(machine, "COINS") & 0xfe; r |= data << 24; } return r; @@ -438,7 +438,7 @@ static READ32_HANDLER ( jc_control_r ) { if (ACCESSING_BITS_24_31) { - r |= input_port_read_indexed(machine, 1) << 24; + r |= input_port_read(machine, "START") << 24; } return r; } @@ -446,7 +446,7 @@ static READ32_HANDLER ( jc_control_r ) { if (ACCESSING_BITS_24_31) { - r |= input_port_read_indexed(machine, 2) << 24; + r |= input_port_read(machine, "UNUSED") << 24; } return r; } @@ -462,7 +462,7 @@ static READ32_HANDLER ( jc_control_r ) { if (ACCESSING_BITS_24_31) { - r |= input_port_read_indexed(machine, 3) << 24; + r |= input_port_read(machine, "BUTTONS") << 24; } return r; } @@ -868,7 +868,10 @@ static WRITE8_HANDLER(hc11_data_w) static READ8_HANDLER(hc11_analog_r) { - return input_port_read_indexed(machine, 4 + offset); + static const char *portnames[] = { "ANALOG1", "ANALOG2", "ANALOG3", "ANALOG4", + "ANALOG5", "ANALOG6", "ANALOG7", "ANALOG8" }; + + return input_port_read_safe(machine, portnames[offset], 0); } @@ -1082,168 +1085,163 @@ ADDRESS_MAP_END #ifdef UNUSED_DEFINITION static INPUT_PORTS_START( taitojc ) - PORT_START - PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_COIN4) - PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_COIN3) - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_COIN2) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_COIN1) - PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE1 ) - //PORT_SERVICE(0x02, 0x00) - - PORT_START - PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_START4) - PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_START3) - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_START2) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_START1) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_SERVICE3) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_SERVICE2) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_TILT) - - PORT_START - PORT_BIT(0xff, IP_ACTIVE_LOW, IPT_UNUSED) - - PORT_START - PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON1) - PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON2) - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_BUTTON3) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_BUTTON4) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_BUTTON5) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_BUTTON6) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_BUTTON7) - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON8) - + PORT_START_TAG("COINS") + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_COIN4) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_COIN3) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_COIN2) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_COIN1) + PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE1 ) + //PORT_SERVICE(0x02, 0x00) + + PORT_START_TAG("START") + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_START4) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_START3) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_START2) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_START1) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_SERVICE3) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_SERVICE2) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_TILT) + + PORT_START_TAG("UNUSED") + PORT_BIT(0xff, IP_ACTIVE_LOW, IPT_UNUSED) + + PORT_START_TAG("BUTTONS") + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON1) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON2) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_BUTTON3) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_BUTTON4) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_BUTTON5) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_BUTTON6) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_BUTTON7) + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON8) INPUT_PORTS_END #endif static INPUT_PORTS_START( dendeg ) - PORT_START - PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_COIN1) - PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE1 ) - - PORT_START - PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_START1) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_TILT) - - PORT_START - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON7) // Horn - PORT_BIT(0xfe, IP_ACTIVE_LOW, IPT_UNUSED) - - PORT_START - PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON6) // Mascon 5 - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_BUTTON4) // Mascon 3 - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_BUTTON2) // Mascon 1 - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_BUTTON5) // Mascon 4 - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_BUTTON3) // Mascon 2 - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1) // Mascon 0 + PORT_START_TAG("COINS") + PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_COIN1) + PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE1 ) + + PORT_START_TAG("START") + PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_START1) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_TILT) + + PORT_START_TAG("UNUSED") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON7) // Horn + PORT_BIT(0xfe, IP_ACTIVE_LOW, IPT_UNUSED) + + PORT_START_TAG("BUTTONS") + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON6) // Mascon 5 + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_BUTTON4) // Mascon 3 + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_BUTTON2) // Mascon 1 + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_BUTTON5) // Mascon 4 + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_BUTTON3) // Mascon 2 + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1) // Mascon 0 PORT_START_TAG("ANALOG1") // Brake - PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5) - + PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5) INPUT_PORTS_END static INPUT_PORTS_START( landgear ) - PORT_START - PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_COIN1) - PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE1 ) + PORT_START_TAG("COINS") + PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_COIN1) + PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE1 ) - PORT_START - PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_START1) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_TILT) + PORT_START_TAG("START") + PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_START1) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_TILT) - PORT_START - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1) // View button - PORT_BIT(0xfe, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_START_TAG("UNUSED") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1) // View button + PORT_BIT(0xfe, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_START - PORT_BIT(0xff, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_START_TAG("BUTTONS") + PORT_BIT(0xff, IP_ACTIVE_LOW, IPT_UNUSED) PORT_START_TAG("ANALOG1") // Lever X - PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0xff, 0x00) PORT_SENSITIVITY(35) PORT_KEYDELTA(5) + PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0xff, 0x00) PORT_SENSITIVITY(35) PORT_KEYDELTA(5) PORT_START_TAG("ANALOG2") // Lever Y - PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(0xff, 0x00) PORT_SENSITIVITY(35) PORT_KEYDELTA(5) + PORT_BIT( 0xff, 0x80, IPT_AD_STICK_Y ) PORT_MINMAX(0xff, 0x00) PORT_SENSITIVITY(35) PORT_KEYDELTA(5) PORT_START_TAG("ANALOG3") // Throttle - PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5) - + PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5) INPUT_PORTS_END static INPUT_PORTS_START( sidebs ) - PORT_START - PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_COIN1) - PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE1 ) - - PORT_START - PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_START1) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_SERVICE3) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_SERVICE2) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_TILT) - - PORT_START - PORT_BIT(0xfe, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1) // View button - - PORT_START - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_BUTTON2) // Shift down - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON3) // Shift up - PORT_BIT(0xfc, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_START_TAG("COINS") + PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_COIN1) + PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE1 ) + + PORT_START_TAG("START") + PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_START1) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_SERVICE3) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_SERVICE2) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_TILT) + + PORT_START_TAG("UNUSED") + PORT_BIT(0xfe, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1) // View button + + PORT_START_TAG("BUTTONS") + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_BUTTON2) // Shift down + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON3) // Shift up + PORT_BIT(0xfc, IP_ACTIVE_LOW, IPT_UNUSED) PORT_START_TAG("ANALOG1") // Steering - PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5) + PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5) PORT_START_TAG("ANALOG2") // Acceleration - PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5) + PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5) PORT_START_TAG("ANALOG3") // Brake - PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5) - + PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5) INPUT_PORTS_END // TODO static INPUT_PORTS_START( dangcurv ) - PORT_START - PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_COIN1) - PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE1 ) - - PORT_START - PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_START1) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_SERVICE3) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_SERVICE2) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_TILT) - - PORT_START - PORT_BIT(0xfe, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1) // View button - - PORT_START - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_BUTTON2) // Shift down - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON3) // Shift up - PORT_BIT(0xfc, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_START_TAG("COINS") + PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_COIN1) + PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE1 ) + + PORT_START_TAG("START") + PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_START1) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_SERVICE3) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_SERVICE2) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_TILT) + + PORT_START_TAG("UNUSED") + PORT_BIT(0xfe, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1) // View button + + PORT_START_TAG("BUTTONS") + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_BUTTON2) // Shift down + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON3) // Shift up + PORT_BIT(0xfc, IP_ACTIVE_LOW, IPT_UNUSED) PORT_START_TAG("ANALOG1") // Steering - PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5) + PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5) PORT_START_TAG("ANALOG2") // Acceleration - PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5) + PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5) PORT_START_TAG("ANALOG3") // Brake - PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5) - + PORT_BIT( 0xff, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0x00, 0xff) PORT_SENSITIVITY(35) PORT_KEYDELTA(5) INPUT_PORTS_END diff --git a/src/mame/drivers/taitosj.c b/src/mame/drivers/taitosj.c index 027eb616024..8933766ec0f 100644 --- a/src/mame/drivers/taitosj.c +++ b/src/mame/drivers/taitosj.c @@ -214,12 +214,12 @@ static ADDRESS_MAP_START( taitosj_main_nomcu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd300, 0xd300) AM_MIRROR(0x00ff) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_video_priority) AM_RANGE(0xd400, 0xd403) AM_MIRROR(0x00f0) AM_READ(SMH_RAM) AM_BASE(&taitosj_collision_reg) AM_RANGE(0xd404, 0xd404) AM_MIRROR(0x00f3) AM_READ(taitosj_gfxrom_r) - AM_RANGE(0xd408, 0xd408) AM_MIRROR(0x00f0) AM_READ(input_port_0_r) /* IN0 */ - AM_RANGE(0xd409, 0xd409) AM_MIRROR(0x00f0) AM_READ(input_port_1_r) /* IN1 */ - AM_RANGE(0xd40a, 0xd40a) AM_MIRROR(0x00f0) AM_READ(input_port_5_r) /* DSW1 */ - AM_RANGE(0xd40b, 0xd40b) AM_MIRROR(0x00f0) AM_READ(input_port_2_r) /* IN2 */ - AM_RANGE(0xd40c, 0xd40c) AM_MIRROR(0x00f0) AM_READ(input_port_3_r) /* Service */ - AM_RANGE(0xd40d, 0xd40d) AM_MIRROR(0x00f0) AM_READ(input_port_4_r) + AM_RANGE(0xd408, 0xd408) AM_MIRROR(0x00f0) AM_READ_PORT("IN0") + AM_RANGE(0xd409, 0xd409) AM_MIRROR(0x00f0) AM_READ_PORT("IN1") + AM_RANGE(0xd40a, 0xd40a) AM_MIRROR(0x00f0) AM_READ_PORT("DSW1") /* DSW1 */ + AM_RANGE(0xd40b, 0xd40b) AM_MIRROR(0x00f0) AM_READ_PORT("IN2") + AM_RANGE(0xd40c, 0xd40c) AM_MIRROR(0x00f0) AM_READ_PORT("IN3") /* Service */ + AM_RANGE(0xd40d, 0xd40d) AM_MIRROR(0x00f0) AM_READ_PORT("IN4") AM_RANGE(0xd40e, 0xd40e) AM_MIRROR(0x00f0) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0xd40f, 0xd40f) AM_MIRROR(0x00f0) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w) /* DSW2 and DSW3 */ AM_RANGE(0xd500, 0xd505) AM_MIRROR(0x00f0) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_scroll) @@ -254,12 +254,12 @@ static ADDRESS_MAP_START( taitosj_main_mcu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd300, 0xd300) AM_MIRROR(0x00ff) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_video_priority) AM_RANGE(0xd400, 0xd403) AM_MIRROR(0x00f0) AM_READ(SMH_RAM) AM_BASE(&taitosj_collision_reg) AM_RANGE(0xd404, 0xd404) AM_MIRROR(0x00f3) AM_READ(taitosj_gfxrom_r) - AM_RANGE(0xd408, 0xd408) AM_MIRROR(0x00f0) AM_READ(input_port_0_r) /* IN0 */ - AM_RANGE(0xd409, 0xd409) AM_MIRROR(0x00f0) AM_READ(input_port_1_r) /* IN1 */ - AM_RANGE(0xd40a, 0xd40a) AM_MIRROR(0x00f0) AM_READ(input_port_5_r) /* DSW1 */ - AM_RANGE(0xd40b, 0xd40b) AM_MIRROR(0x00f0) AM_READ(input_port_2_r) /* IN2 */ - AM_RANGE(0xd40c, 0xd40c) AM_MIRROR(0x00f0) AM_READ(input_port_3_r) /* Service */ - AM_RANGE(0xd40d, 0xd40d) AM_MIRROR(0x00f0) AM_READ(input_port_4_r) + AM_RANGE(0xd408, 0xd408) AM_MIRROR(0x00f0) AM_READ_PORT("IN0") + AM_RANGE(0xd409, 0xd409) AM_MIRROR(0x00f0) AM_READ_PORT("IN1") + AM_RANGE(0xd40a, 0xd40a) AM_MIRROR(0x00f0) AM_READ_PORT("DSW1") /* DSW1 */ + AM_RANGE(0xd40b, 0xd40b) AM_MIRROR(0x00f0) AM_READ_PORT("IN2") + AM_RANGE(0xd40c, 0xd40c) AM_MIRROR(0x00f0) AM_READ_PORT("IN3") /* Service */ + AM_RANGE(0xd40d, 0xd40d) AM_MIRROR(0x00f0) AM_READ_PORT("IN4") AM_RANGE(0xd40e, 0xd40e) AM_MIRROR(0x00f0) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0xd40f, 0xd40f) AM_MIRROR(0x00f0) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w) /* DSW2 and DSW3 */ AM_RANGE(0xd500, 0xd505) AM_MIRROR(0x00f0) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_scroll) @@ -320,12 +320,12 @@ static ADDRESS_MAP_START( kikstart_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd300, 0xd300) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_video_priority) AM_RANGE(0xd400, 0xd403) AM_READ(SMH_RAM) AM_BASE(&taitosj_collision_reg) AM_RANGE(0xd404, 0xd404) AM_READ(taitosj_gfxrom_r) - AM_RANGE(0xd408, 0xd408) AM_READ(input_port_0_r) /* IN0 */ - AM_RANGE(0xd409, 0xd409) AM_READ(input_port_1_r) /* IN1 */ - AM_RANGE(0xd40a, 0xd40a) AM_READ(input_port_5_r) /* DSW1 */ - AM_RANGE(0xd40b, 0xd40b) AM_READ(input_port_2_r) /* IN2 */ - AM_RANGE(0xd40c, 0xd40c) AM_READ(input_port_3_r) /* IN3 */ - AM_RANGE(0xd40d, 0xd40d) AM_READ(input_port_4_r) /* IN4 */ + AM_RANGE(0xd408, 0xd408) AM_MIRROR(0x00f0) AM_READ_PORT("IN0") + AM_RANGE(0xd409, 0xd409) AM_MIRROR(0x00f0) AM_READ_PORT("IN1") + AM_RANGE(0xd40a, 0xd40a) AM_MIRROR(0x00f0) AM_READ_PORT("DSW1") /* DSW1 */ + AM_RANGE(0xd40b, 0xd40b) AM_MIRROR(0x00f0) AM_READ_PORT("IN2") + AM_RANGE(0xd40c, 0xd40c) AM_MIRROR(0x00f0) AM_READ_PORT("IN3") /* Service */ + AM_RANGE(0xd40d, 0xd40d) AM_MIRROR(0x00f0) AM_READ_PORT("IN4") AM_RANGE(0xd40e, 0xd40e) AM_WRITE(AY8910_control_port_0_w) AM_RANGE(0xd40f, 0xd40f) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w) /* DSW2 and DSW3 */ AM_RANGE(0xd508, 0xd508) AM_WRITE(taitosj_collision_reg_clear_w) @@ -363,7 +363,6 @@ static ADDRESS_MAP_START( taitosj_mcu_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END - #define DSW2_PORT \ PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_A ) ) \ PORT_DIPSETTING( 0x0f, DEF_STR( 9C_1C ) ) \ @@ -481,9 +480,6 @@ ADDRESS_MAP_END PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_8WAY PORT_COCKTAIL\ PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_SPECIAL ) // from sound CPU - - - static INPUT_PORTS_START( spaceskr ) COMMON_IN0 diff --git a/src/mame/drivers/tankbatt.c b/src/mame/drivers/tankbatt.c index 51d31ed81cf..8edb965dbcf 100644 --- a/src/mame/drivers/tankbatt.c +++ b/src/mame/drivers/tankbatt.c @@ -80,24 +80,24 @@ static READ8_HANDLER( tankbatt_in0_r ) { int val; - val = input_port_read_indexed(machine, 0); - return ((val << (7-offset)) & 0x80); + val = input_port_read(machine, "P1"); + return ((val << (7 - offset)) & 0x80); } static READ8_HANDLER( tankbatt_in1_r ) { int val; - val = input_port_read_indexed(machine, 1); - return ((val << (7-offset)) & 0x80); + val = input_port_read(machine, "P2"); + return ((val << (7 - offset)) & 0x80); } static READ8_HANDLER( tankbatt_dsw_r ) { int val; - val = input_port_read_indexed(machine, 2); - return ((val << (7-offset)) & 0x80); + val = input_port_read(machine, "DSW"); + return ((val << (7 - offset)) & 0x80); } static WRITE8_HANDLER( tankbatt_interrupt_enable_w ) @@ -173,53 +173,53 @@ ADDRESS_MAP_END static INTERRUPT_GEN( tankbatt_interrupt ) { - if ((input_port_read_indexed(machine, 0) & 0x60) == 0) cpunum_set_input_line(machine, 0,0,HOLD_LINE); + if ((input_port_read(machine, "P1") & 0x60) == 0) cpunum_set_input_line(machine, 0,0,HOLD_LINE); else if (tankbatt_nmi_enable) cpunum_set_input_line(machine, 0,INPUT_LINE_NMI,PULSE_LINE); } static INPUT_PORTS_START( tankbatt ) - PORT_START /* IN0 */ - PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY - PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY - PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY - PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY - PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) + PORT_START_TAG("P1") /* IN0 */ + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BIT( 0x60, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2) - PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_TILT ) - - PORT_START /* IN1 */ - PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL - PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL - PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL - PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL - PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL - PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_START2 ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_TILT ) + + PORT_START_TAG("P2") /* IN1 */ + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_COCKTAIL + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 ) PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) - PORT_START /* DSW */ + PORT_START_TAG("DSW") /* DSW */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) ) + PORT_DIPSETTING( 0x01, DEF_STR( Upright ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) ) PORT_DIPNAME( 0x06, 0x06, DEF_STR( Coinage ) ) - PORT_DIPSETTING( 0x04, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x06, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) ) + PORT_DIPSETTING( 0x04, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0x06, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) ) PORT_DIPNAME( 0x18, 0x08, DEF_STR( Bonus_Life ) ) - PORT_DIPSETTING( 0x00, "10000" ) - PORT_DIPSETTING( 0x10, "15000" ) - PORT_DIPSETTING( 0x08, "20000" ) - PORT_DIPSETTING( 0x18, DEF_STR( None ) ) + PORT_DIPSETTING( 0x00, "10000" ) + PORT_DIPSETTING( 0x10, "15000" ) + PORT_DIPSETTING( 0x08, "20000" ) + PORT_DIPSETTING( 0x18, DEF_STR( None ) ) PORT_DIPNAME( 0x20, 0x00, DEF_STR( Lives ) ) - PORT_DIPSETTING( 0x20, "2" ) - PORT_DIPSETTING( 0x00, "3" ) + PORT_DIPSETTING( 0x20, "2" ) + PORT_DIPSETTING( 0x00, "3" ) PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c index 8ef3a8eed63..7ddc092f13d 100644 --- a/src/mame/drivers/tatsumi.c +++ b/src/mame/drivers/tatsumi.c @@ -161,12 +161,22 @@ static WRITE16_HANDLER(cyclwarr_cpu_bb_w) { COMBINE_DATA(&cyclwarr_cpub_ram[offs static READ16_HANDLER(cyclwarr_palette_r) { return paletteram16[offset]; } static READ16_HANDLER(cyclwarr_sprite_r) { return spriteram16[offset]; } static WRITE16_HANDLER(cyclwarr_sprite_w) { COMBINE_DATA(&spriteram16[offset]); } -static READ16_HANDLER(cyclwarr_input_r) { return input_port_read_indexed(machine, offset); } -static READ16_HANDLER(cyclwarr_input2_r) { return input_port_read_indexed(machine, offset+4); } static WRITE16_HANDLER(bigfight_a20000_w) { COMBINE_DATA(&bigfight_a20000[offset]); } static WRITE16_HANDLER(bigfight_a40000_w) { COMBINE_DATA(&bigfight_a40000[offset]); } static WRITE16_HANDLER(bigfight_a60000_w) { COMBINE_DATA(&bigfight_a60000[offset]); } +static READ16_HANDLER(cyclwarr_input_r) +{ + static const char *port[] = { "SERVICE", "P1", "P2", "DSW3" }; + return input_port_read(machine, port[offset]); +} + +static READ16_HANDLER(cyclwarr_input2_r) +{ + static const char *port2[] = { "DSW1", "DSW2", "P3", "P4" }; + return input_port_read(machine, port2[offset]); +} + static WRITE16_HANDLER(cyclwarr_sound_w) { soundlatch_w(machine, 0, data >> 8); @@ -180,7 +190,7 @@ static ADDRESS_MAP_START( apache3_v30_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x08000, 0x08fff) AM_RAM_WRITE(apache3_palette_w) AM_BASE(&paletteram16) AM_RANGE(0x0c000, 0x0dfff) AM_RAM_WRITE(roundup5_text_w) AM_BASE(&videoram16) AM_RANGE(0x0e800, 0x0e803) AM_WRITE(SMH_NOP) // CRT - AM_RANGE(0x0f000, 0x0f001) AM_READ(input_port_3_word_r) // Dip 1+2 + AM_RANGE(0x0f000, 0x0f001) AM_READ_PORT("DSW") AM_RANGE(0x0f000, 0x0f001) AM_WRITE(SMH_NOP) // todo AM_RANGE(0x0f800, 0x0f801) AM_READWRITE(apache3_bank_r, apache3_bank_w) AM_RANGE(0x10000, 0x1ffff) AM_READWRITE(apache3_v30_v20_r, apache3_v30_v20_w) @@ -203,7 +213,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( apache3_v20_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x00000, 0x01fff) AM_RAM AM_RANGE(0x04000, 0x04003) AM_NOP // piu select .. ? - AM_RANGE(0x06000, 0x06001) AM_READ(input_port_0_r) // esw + AM_RANGE(0x06000, 0x06001) AM_READ_PORT("IN0") // esw AM_RANGE(0x08000, 0x08000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0x08001, 0x08001) AM_READWRITE(tatsumi_hack_ym2151_r, YM2151_data_port_0_w) AM_RANGE(0x0a000, 0x0a000) AM_READWRITE(tatsumi_hack_oki_r, OKIM6295_data_0_w) @@ -222,7 +232,7 @@ static ADDRESS_MAP_START( roundup5_v30_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x00000, 0x07fff) AM_RAM AM_RANGE(0x08000, 0x0bfff) AM_RAM_WRITE(roundup5_text_w) AM_BASE(&videoram16) AM_RANGE(0x0c000, 0x0c003) AM_WRITE(roundup5_crt_w) - AM_RANGE(0x0d000, 0x0d001) AM_READ(input_port_3_word_r) /* Dip 1+2 */ + AM_RANGE(0x0d000, 0x0d001) AM_READ_PORT("DSW") AM_RANGE(0x0d400, 0x0d40f) AM_WRITE(SMH_RAM) AM_BASE(&roundup5_unknown0) AM_RANGE(0x0d800, 0x0d801) AM_WRITE(SMH_RAM) AM_BASE(&roundup5_unknown1) // VRAM2 X scroll (todo) AM_RANGE(0x0dc00, 0x0dc01) AM_WRITE(SMH_RAM) AM_BASE(&roundup5_unknown2) // VRAM2 Y scroll (todo) @@ -252,9 +262,9 @@ static ADDRESS_MAP_START( roundup5_z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xfff0, 0xfff0) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0xfff1, 0xfff1) AM_READWRITE(tatsumi_hack_ym2151_r, YM2151_data_port_0_w) AM_RANGE(0xfff4, 0xfff4) AM_READWRITE(tatsumi_hack_oki_r, OKIM6295_data_0_w) - AM_RANGE(0xfff8, 0xfff8) AM_READ(input_port_0_r) - AM_RANGE(0xfff9, 0xfff9) AM_READ(input_port_1_r) - AM_RANGE(0xfffc, 0xfffc) AM_READ(input_port_2_r) + AM_RANGE(0xfff8, 0xfff8) AM_READ_PORT("IN0") + AM_RANGE(0xfff9, 0xfff9) AM_READ_PORT("IN1") + AM_RANGE(0xfffc, 0xfffc) AM_READ_PORT("STICKX") AM_RANGE(0xfff9, 0xfff9) AM_WRITE(SMH_NOP) //irq ack? AM_RANGE(0xfffa, 0xfffa) AM_WRITE(SMH_NOP) //irq ack? ADDRESS_MAP_END @@ -362,7 +372,7 @@ ADDRESS_MAP_END /******************************************************************************/ static INPUT_PORTS_START( apache3 ) - PORT_START + PORT_START_TAG("IN0") PORT_SERVICE_NO_TOGGLE( 0x01, IP_ACTIVE_LOW ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME( "Trigger" ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME( "Power" ) @@ -372,13 +382,13 @@ static INPUT_PORTS_START( apache3 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME( "Missile" ) - PORT_START + PORT_START_TAG("STICKX") PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1) - PORT_START + PORT_START_TAG("STICKY") PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1) - PORT_START + PORT_START_TAG("DSW") PORT_DIPNAME( 0x0003, 0x0000, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x0000, "3" ) PORT_DIPSETTING( 0x0001, "4" ) @@ -428,7 +438,7 @@ static INPUT_PORTS_START( apache3 ) INPUT_PORTS_END static INPUT_PORTS_START( roundup5 ) - PORT_START + PORT_START_TAG("IN0") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("Accelerator") PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("Brake") @@ -438,7 +448,7 @@ static INPUT_PORTS_START( roundup5 ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("IN1") PORT_SERVICE_NO_TOGGLE( 0x01, IP_ACTIVE_LOW ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 ) @@ -448,10 +458,10 @@ static INPUT_PORTS_START( roundup5 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("Extra 3") PORT_TOGGLE PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) PORT_NAME("Extra 4") PORT_TOGGLE - PORT_START + PORT_START_TAG("STICKX") PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_PLAYER(1) - PORT_START + PORT_START_TAG("DSW") PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0001, DEF_STR( On ) ) @@ -503,7 +513,7 @@ static INPUT_PORTS_START( roundup5 ) INPUT_PORTS_END static INPUT_PORTS_START( cyclwarr ) - PORT_START + PORT_START_TAG("SERVICE") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) @@ -513,7 +523,7 @@ static INPUT_PORTS_START( cyclwarr ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE4 ) - PORT_START + PORT_START_TAG("P1") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) @@ -523,7 +533,7 @@ static INPUT_PORTS_START( cyclwarr ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) - PORT_START + PORT_START_TAG("P2") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) @@ -533,7 +543,7 @@ static INPUT_PORTS_START( cyclwarr ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) - PORT_START + PORT_START_TAG("DSW3") PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:1") PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -547,7 +557,7 @@ static INPUT_PORTS_START( cyclwarr ) PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("DSW1") PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4") PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) ) @@ -583,7 +593,7 @@ static INPUT_PORTS_START( cyclwarr ) PORT_DIPSETTING( 0x00a0, DEF_STR( 1C_6C ) ) PORT_DIPSETTING( 0x0090, DEF_STR( 1C_7C ) ) - PORT_START + PORT_START_TAG("DSW2") PORT_DIPNAME( 0x0003, 0x0002, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x0000, "5" ) PORT_DIPSETTING( 0x0001, "3" ) @@ -606,7 +616,7 @@ static INPUT_PORTS_START( cyclwarr ) PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("P3") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START3 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3) @@ -616,7 +626,7 @@ static INPUT_PORTS_START( cyclwarr ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3) - PORT_START + PORT_START_TAG("P4") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START4 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4) @@ -628,7 +638,7 @@ static INPUT_PORTS_START( cyclwarr ) INPUT_PORTS_END static INPUT_PORTS_START( bigfight ) - PORT_START + PORT_START_TAG("SERVICE") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) @@ -638,7 +648,7 @@ static INPUT_PORTS_START( bigfight ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE4 ) - PORT_START + PORT_START_TAG("P1") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) @@ -648,7 +658,7 @@ static INPUT_PORTS_START( bigfight ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) - PORT_START + PORT_START_TAG("P2") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) @@ -658,7 +668,7 @@ static INPUT_PORTS_START( bigfight ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) - PORT_START + PORT_START_TAG("DSW3") PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:1") PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -672,7 +682,7 @@ static INPUT_PORTS_START( bigfight ) PORT_DIPSETTING( 0x0008, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("DSW1") PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4") PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) ) @@ -708,7 +718,7 @@ static INPUT_PORTS_START( bigfight ) PORT_DIPSETTING( 0x00a0, DEF_STR( 1C_6C ) ) PORT_DIPSETTING( 0x0090, DEF_STR( 1C_7C ) ) - PORT_START + PORT_START_TAG("DSW2") PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x0000, "1" ) PORT_DIPSETTING( 0x0003, "2" ) @@ -732,7 +742,7 @@ static INPUT_PORTS_START( bigfight ) PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("P3") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START3 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3) @@ -742,7 +752,7 @@ static INPUT_PORTS_START( bigfight ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3) - PORT_START + PORT_START_TAG("P4") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START4 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4) diff --git a/src/mame/drivers/tceptor.c b/src/mame/drivers/tceptor.c index 4ff3ea765f6..17a161460cf 100644 --- a/src/mame/drivers/tceptor.c +++ b/src/mame/drivers/tceptor.c @@ -150,22 +150,22 @@ static UINT8 fix_input1(UINT8 in1, UINT8 in2) static READ8_HANDLER( dsw0_r ) { - return fix_input0(input_port_read_indexed(machine, 0), input_port_read_indexed(machine, 1)); + return fix_input0(input_port_read(machine, "DSW1"), input_port_read(machine, "DSW2")); } static READ8_HANDLER( dsw1_r ) { - return fix_input1(input_port_read_indexed(machine, 0), input_port_read_indexed(machine, 1)); + return fix_input1(input_port_read(machine, "DSW1"), input_port_read(machine, "DSW2")); } static READ8_HANDLER( input0_r ) { - return fix_input0(input_port_read_indexed(machine, 2), input_port_read_indexed(machine, 3)); + return fix_input0(input_port_read(machine, "BUTTONS"), input_port_read(machine, "SERVICE")); } static READ8_HANDLER( input1_r ) { - return fix_input1(input_port_read_indexed(machine, 2), input_port_read_indexed(machine, 3)); + return fix_input1(input_port_read(machine, "BUTTONS"), input_port_read(machine, "SERVICE")); } static READ8_HANDLER( readFF ) @@ -183,9 +183,9 @@ static ADDRESS_MAP_START( m6809_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x43ff) AM_READWRITE(namcos1_cus30_r, namcos1_cus30_w) AM_RANGE(0x4800, 0x4800) AM_WRITE(SMH_NOP) // 3D scope left/right? AM_RANGE(0x4f00, 0x4f00) AM_READ(SMH_NOP) // unknown - AM_RANGE(0x4f01, 0x4f01) AM_READ(input_port_4_r) // analog input (accel) - AM_RANGE(0x4f02, 0x4f02) AM_READ(input_port_5_r) // analog input (left/right) - AM_RANGE(0x4f03, 0x4f03) AM_READ(input_port_6_r) // analog input (up/down) + AM_RANGE(0x4f01, 0x4f01) AM_READ_PORT("PEDAL") // analog input (accel) + AM_RANGE(0x4f02, 0x4f02) AM_READ_PORT("STICKX") // analog input (left/right) + AM_RANGE(0x4f03, 0x4f03) AM_READ_PORT("STICKY") // analog input (up/down) AM_RANGE(0x4f00, 0x4f03) AM_WRITE(SMH_NOP) // analog input control? AM_RANGE(0x5000, 0x5006) AM_WRITE(tceptor_bg_scroll_w) // bg scroll AM_RANGE(0x6000, 0x7fff) AM_RAM AM_SHARE(1) AM_BASE(&m68k_shared_ram) // COM RAM @@ -259,7 +259,7 @@ ADDRESS_MAP_END /*******************************************************************/ static INPUT_PORTS_START( tceptor ) - PORT_START /* DSW 1 */ + PORT_START_TAG("DSW1") /* DSW 1 */ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) ) @@ -282,7 +282,7 @@ static INPUT_PORTS_START( tceptor ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* DSW 2 */ + PORT_START_TAG("DSW2") /* DSW 2 */ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x02, "A" ) PORT_DIPSETTING( 0x03, "B" ) @@ -290,87 +290,38 @@ static INPUT_PORTS_START( tceptor ) PORT_DIPSETTING( 0x00, "D" ) PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* Memory Mapped Port */ + PORT_START_TAG("BUTTONS") /* Memory Mapped Port */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) // shot PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) // bomb PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) // shot PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) // bomb PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* Memory Mapped Port */ + PORT_START_TAG("SERVICE") /* Memory Mapped Port */ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) // TEST SW PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* ADC0809 - 8 CHANNEL ANALOG - CHANNEL 1 */ + PORT_START_TAG("PEDAL") /* ADC0809 - 8 CHANNEL ANALOG - CHANNEL 1 */ PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0xd6) PORT_SENSITIVITY(100) PORT_KEYDELTA(16) PORT_CODE_INC(KEYCODE_Z) - PORT_START /* ADC0809 - 8 CHANNEL ANALOG - CHANNEL 2 */ + PORT_START_TAG("STICKX") /* ADC0809 - 8 CHANNEL ANALOG - CHANNEL 2 */ PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_X ) PORT_MINMAX(0x00,0xfe) PORT_SENSITIVITY(100) PORT_KEYDELTA(16) - PORT_START /* ADC08090 - 8 CHANNEL ANALOG - CHANNEL 3 */ + PORT_START_TAG("STICKY") /* ADC08090 - 8 CHANNEL ANALOG - CHANNEL 3 */ PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_Y ) PORT_MINMAX(0x00,0xfe) PORT_SENSITIVITY(100) PORT_KEYDELTA(16) INPUT_PORTS_END static INPUT_PORTS_START( tceptor2 ) - PORT_START /* DSW 1 */ - PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) - PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) ) - PORT_DIPSETTING( 0x03, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x01, DEF_STR( 3C_2C ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 4C_3C ) ) - PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x06, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x05, DEF_STR( 1C_3C ) ) - PORT_DIPSETTING( 0x04, DEF_STR( 1C_4C ) ) - PORT_DIPNAME( 0x18, 0x18, DEF_STR( Coin_B ) ) - PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x08, DEF_STR( 3C_2C ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 4C_3C ) ) - PORT_DIPSETTING( 0x18, DEF_STR( 1C_1C ) ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Demo_Sounds ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x20, DEF_STR( On ) ) - PORT_DIPNAME( 0x40, 0x40, "Freeze" ) - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_INCLUDE( tceptor ) - PORT_START /* DSW 2 */ - PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) - PORT_DIPSETTING( 0x02, "A" ) - PORT_DIPSETTING( 0x03, "B" ) - PORT_DIPSETTING( 0x01, "C" ) - PORT_DIPSETTING( 0x00, "D" ) + PORT_MODIFY("DSW2") PORT_DIPNAME( 0x04, 0x04, "MODE" ) PORT_DIPSETTING( 0x00, "2D" ) PORT_DIPSETTING( 0x04, "3D" ) PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START /* Memory Mapped Port */ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) // shot - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) // bomb - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) // shot - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) // bomb - PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START /* Memory Mapped Port */ - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) // TEST SW - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START /* ADC0809 - 8 CHANNEL ANALOG - CHANNEL 1 */ - PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0xd6) PORT_SENSITIVITY(100) PORT_KEYDELTA(16) PORT_CODE_INC(KEYCODE_Z) - - PORT_START /* ADC0809 - 8 CHANNEL ANALOG - CHANNEL 2 */ - PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_X ) PORT_MINMAX(0x00,0xfe) PORT_SENSITIVITY(100) PORT_KEYDELTA(16) - - PORT_START /* ADC08090 - 8 CHANNEL ANALOG - CHANNEL 3 */ - PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_Y ) PORT_MINMAX(0x00,0xfe) PORT_SENSITIVITY(100) PORT_KEYDELTA(16) INPUT_PORTS_END diff --git a/src/mame/drivers/tehkanwc.c b/src/mame/drivers/tehkanwc.c index 0867d213f83..74582e2fe41 100644 --- a/src/mame/drivers/tehkanwc.c +++ b/src/mame/drivers/tehkanwc.c @@ -132,32 +132,32 @@ static READ8_HANDLER( tehkanwc_track_0_r ) { int joy; - joy = input_port_read_indexed(machine, 10) >> (2*offset); + joy = input_port_read(machine, "FAKE") >> (2 * offset); if (joy & 1) return -63; if (joy & 2) return 63; - return input_port_read_indexed(machine, 3 + offset) - track0[offset]; + return input_port_read(machine, offset ? "P1Y" : "P1X") - track0[offset]; } static READ8_HANDLER( tehkanwc_track_1_r ) { int joy; - joy = input_port_read_indexed(machine, 10) >> (4+2*offset); + joy = input_port_read(machine, "FAKE") >> (4 + 2 * offset); if (joy & 1) return -63; if (joy & 2) return 63; - return input_port_read_indexed(machine, 6 + offset) - track1[offset]; + return input_port_read(machine, offset ? "P2Y" : "P2X") - track1[offset]; } static WRITE8_HANDLER( tehkanwc_track_0_reset_w ) { /* reset the trackball counters */ - track0[offset] = input_port_read_indexed(machine, 3 + offset) + data; + track0[offset] = input_port_read(machine, offset ? "P1Y" : "P1X") + data; } static WRITE8_HANDLER( tehkanwc_track_1_reset_w ) { /* reset the trackball counters */ - track1[offset] = input_port_read_indexed(machine, 6 + offset) + data; + track1[offset] = input_port_read(machine, offset ? "P2Y" : "P2X") + data; } @@ -246,18 +246,18 @@ static ADDRESS_MAP_START( main_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe800, 0xebff) AM_RAM AM_SHARE(7) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) /* sprites */ AM_RANGE(0xec00, 0xec01) AM_RAM_WRITE(tehkanwc_scroll_x_w) AM_RANGE(0xec02, 0xec02) AM_RAM_WRITE(tehkanwc_scroll_y_w) - AM_RANGE(0xf800, 0xf801) AM_READWRITE(tehkanwc_track_0_r, tehkanwc_track_0_reset_w) /* track 0 x/y */ - AM_RANGE(0xf802, 0xf802) AM_READWRITE(input_port_9_r, gridiron_led0_w) /* Coin & Start */ - AM_RANGE(0xf803, 0xf803) AM_READ(input_port_5_r) /* joy0 - button */ - AM_RANGE(0xf806, 0xf806) AM_READ(input_port_9_r) /* Start */ - AM_RANGE(0xf810, 0xf811) AM_READWRITE(tehkanwc_track_1_r, tehkanwc_track_1_reset_w) /* track 1 x/y */ + AM_RANGE(0xf800, 0xf801) AM_READWRITE(tehkanwc_track_0_r, tehkanwc_track_0_reset_w) /* track 0 x/y */ + AM_RANGE(0xf802, 0xf802) AM_READWRITE(input_port_9_r, gridiron_led0_w) /* Coin & Start */ + AM_RANGE(0xf803, 0xf803) AM_READ_PORT("P1BUT") /* joy0 - button */ + AM_RANGE(0xf806, 0xf806) AM_READ_PORT("SYSTEM") /* Start */ + AM_RANGE(0xf810, 0xf811) AM_READWRITE(tehkanwc_track_1_r, tehkanwc_track_1_reset_w) /* track 1 x/y */ AM_RANGE(0xf812, 0xf812) AM_WRITE(gridiron_led1_w) - AM_RANGE(0xf813, 0xf813) AM_READ(input_port_8_r) /* joy1 - button */ + AM_RANGE(0xf813, 0xf813) AM_READ_PORT("P2BUT") /* joy1 - button */ AM_RANGE(0xf820, 0xf820) AM_READWRITE(soundlatch2_r, sound_command_w) /* answer from the sound CPU */ - AM_RANGE(0xf840, 0xf840) AM_READWRITE(input_port_0_r, sub_cpu_halt_w) /* DSW1 */ - AM_RANGE(0xf850, 0xf850) AM_READWRITE(input_port_1_r, SMH_NOP) /* DSW2, ?? writes 0x00 or 0xff */ + AM_RANGE(0xf840, 0xf840) AM_READ_PORT("DSW1") AM_WRITE(sub_cpu_halt_w) /* DSW1 */ + AM_RANGE(0xf850, 0xf850) AM_READ_PORT("DSW2") AM_WRITE(SMH_NOP) /* DSW2, ?? writes 0x00 or 0xff */ AM_RANGE(0xf860, 0xf860) AM_READWRITE(watchdog_reset_r, tehkanwc_flipscreen_x_w) - AM_RANGE(0xf870, 0xf870) AM_READWRITE(input_port_2_r, tehkanwc_flipscreen_y_w) /* DSW3 */ + AM_RANGE(0xf870, 0xf870) AM_READ_PORT("DSW3") AM_WRITE(tehkanwc_flipscreen_y_w) /* DSW3 */ ADDRESS_MAP_END static ADDRESS_MAP_START( sub_mem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -295,7 +295,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( tehkanwc ) - PORT_START /* DSW1 - Active LOW */ + PORT_START_TAG("DSW1") /* DSW1 - Active LOW */ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) PORT_DIPSETTING ( 0x01, DEF_STR( 2C_1C ) ) PORT_DIPSETTING ( 0x07, DEF_STR( 1C_1C ) ) @@ -320,7 +320,7 @@ static INPUT_PORTS_START( tehkanwc ) PORT_DIPSETTING ( 0x40, "2&2/100%" ) PORT_DIPSETTING ( 0x00, "2&3/67%" ) - PORT_START /* DSW2 - Active LOW */ + PORT_START_TAG("DSW2") /* DSW2 - Active LOW */ PORT_DIPNAME( 0x03, 0x03, "1P Game Time" ) PORT_DIPSETTING ( 0x00, "2:30" ) PORT_DIPSETTING ( 0x01, "2:00" ) @@ -363,7 +363,7 @@ static INPUT_PORTS_START( tehkanwc ) PORT_DIPSETTING ( 0x80, "Timer In" ) PORT_DIPSETTING ( 0x00, "Credit In" ) - PORT_START /* DSW3 - Active LOW */ + PORT_START_TAG("DSW3") /* DSW3 - Active LOW */ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPSETTING ( 0x02, DEF_STR( Easy ) ) PORT_DIPSETTING ( 0x03, DEF_STR( Normal ) ) @@ -376,31 +376,31 @@ static INPUT_PORTS_START( tehkanwc ) PORT_DIPSETTING ( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING ( 0x08, DEF_STR( On ) ) - PORT_START /* IN0 - X AXIS */ + PORT_START_TAG("P1X") /* IN0 - X AXIS */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(0) PORT_PLAYER(1) - PORT_START /* IN0 - Y AXIS */ + PORT_START_TAG("P1Y") /* IN0 - Y AXIS */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(0) PORT_PLAYER(1) - PORT_START /* IN0 - BUTTON */ + PORT_START_TAG("P1BUT") /* IN0 - BUTTON */ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) - PORT_START /* IN1 - X AXIS */ + PORT_START_TAG("P2X") /* IN1 - X AXIS */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(0) PORT_PLAYER(2) - PORT_START /* IN1 - Y AXIS */ + PORT_START_TAG("P2Y") /* IN1 - Y AXIS */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(0) PORT_PLAYER(2) - PORT_START /* IN1 - BUTTON */ + PORT_START_TAG("P2BUT") /* IN1 - BUTTON */ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_START /* IN2 - Active LOW */ + PORT_START_TAG("SYSTEM") /* IN2 - Active LOW */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START /* fake port to emulate trackballs with keyboard */ + PORT_START_TAG("FAKE") /* fake port to emulate trackballs with keyboard */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) @@ -413,7 +413,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( gridiron ) - PORT_START /* DSW1 - Active LOW */ + PORT_START_TAG("DSW1") /* DSW1 - Active LOW */ PORT_DIPNAME( 0x03, 0x03, "Start Credits (P1&P2)/Extra" ) PORT_DIPSETTING ( 0x01, "1&1/200%" ) PORT_DIPSETTING ( 0x03, "1&2/100%" ) @@ -439,7 +439,7 @@ static INPUT_PORTS_START( gridiron ) PORT_DIPSETTING ( 0xc0, "15" ) PORT_DIPSETTING ( 0x80, "10" ) - PORT_START /* DSW2 - Active LOW */ + PORT_START_TAG("DSW2") /* DSW2 - Active LOW */ PORT_DIPNAME( 0x03, 0x03, "1P Game Time" ) PORT_DIPSETTING ( 0x00, "2:30" ) PORT_DIPSETTING ( 0x01, "2:00" ) @@ -482,40 +482,40 @@ static INPUT_PORTS_START( gridiron ) PORT_DIPSETTING ( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING ( 0x80, DEF_STR( On ) ) - PORT_START /* no DSW3 */ + PORT_START_TAG("DSW3") /* no DSW3 */ PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START /* IN0 - X AXIS */ + PORT_START_TAG("P1X") /* IN0 - X AXIS */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_PLAYER(1) - PORT_START /* IN0 - Y AXIS */ + PORT_START_TAG("P1Y") /* IN0 - Y AXIS */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_PLAYER(1) - PORT_START /* IN0 - BUTTON */ + PORT_START_TAG("P1BUT") /* IN0 - BUTTON */ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) - PORT_START /* IN1 - X AXIS */ + PORT_START_TAG("P2X") /* IN1 - X AXIS */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_PLAYER(2) - PORT_START /* IN1 - Y AXIS */ + PORT_START_TAG("P2Y") /* IN1 - Y AXIS */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_PLAYER(2) - PORT_START /* IN1 - BUTTON */ + PORT_START_TAG("P2BUT") /* IN1 - BUTTON */ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_START /* IN2 - Active LOW */ + PORT_START_TAG("SYSTEM") /* IN2 - Active LOW */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START /* no fake port here */ + PORT_START_TAG("FAKE") /* no fake port here */ PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END static INPUT_PORTS_START( teedoff ) - PORT_START /* DSW1 - Active LOW */ + PORT_START_TAG("DSW1") /* DSW1 - Active LOW */ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPSETTING ( 0x02, DEF_STR( 2C_1C ) ) PORT_DIPSETTING ( 0x03, DEF_STR( 1C_1C ) ) @@ -538,7 +538,7 @@ static INPUT_PORTS_START( teedoff ) PORT_DIPSETTING ( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING ( 0x80, DEF_STR( On ) ) - PORT_START /* DSW2 - Active LOW */ + PORT_START_TAG("DSW2") /* DSW2 - Active LOW */ PORT_BIT( 0x07, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_DIPNAME( 0x18, 0x18, "Penalty (Over Par)" ) // Check table at 0x2d67 PORT_DIPSETTING ( 0x10, "1/1/2/3/4" ) // +1 / +2 / +3 / +4 / +5 or +6 @@ -554,28 +554,28 @@ static INPUT_PORTS_START( teedoff ) PORT_DIPSETTING ( 0x40, DEF_STR( Hard ) ) PORT_DIPSETTING ( 0x00, DEF_STR( Hardest ) ) - PORT_START /* no DSW3 */ + PORT_START_TAG("DSW3") /* no DSW3 */ PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START /* IN0 - X AXIS */ + PORT_START_TAG("P1X") /* IN0 - X AXIS */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_PLAYER(1) - PORT_START /* IN0 - Y AXIS */ + PORT_START_TAG("P1Y") /* IN0 - Y AXIS */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_PLAYER(1) - PORT_START /* IN0 - BUTTON */ + PORT_START_TAG("P1BUT") /* IN0 - BUTTON */ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) - PORT_START /* IN1 - X AXIS */ + PORT_START_TAG("P2X") /* IN1 - X AXIS */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_PLAYER(2) - PORT_START /* IN1 - Y AXIS */ + PORT_START_TAG("P2Y") /* IN1 - Y AXIS */ PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(63) PORT_PLAYER(2) - PORT_START /* IN1 - BUTTON */ + PORT_START_TAG("P2BUT") /* IN1 - BUTTON */ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_START /* IN2 - Active LOW */ + PORT_START_TAG("SYSTEM") /* IN2 - Active LOW */ /* "Coin" buttons are read from address 0xf802 */ /* "Start" buttons are read from address 0xf806 */ /* coin input must be active between 2 and 15 frames to be consistently recognized */ @@ -584,7 +584,7 @@ static INPUT_PORTS_START( teedoff ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START /* no fake port here */ + PORT_START_TAG("FAKE") /* no fake port here */ PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END diff --git a/src/mame/drivers/tempest.c b/src/mame/drivers/tempest.c index 45f20040b2e..a00e579b48b 100644 --- a/src/mame/drivers/tempest.c +++ b/src/mame/drivers/tempest.c @@ -348,7 +348,7 @@ static CUSTOM_INPUT( tempest_buttons_r ) static READ8_HANDLER( tempest_IN0_r ) { - int res = input_port_read_indexed(machine, 0); + int res = input_port_read(machine, "IN0"); if (avgdvg_done()) res |= 0x40; @@ -363,13 +363,13 @@ static READ8_HANDLER( tempest_IN0_r ) static READ8_HANDLER( input_port_1_bit_r ) { - return (input_port_read_indexed(machine, 1) & (1 << offset)) ? 0 : 228; + return (input_port_read(machine, "IN1/DSW0") & (1 << offset)) ? 0 : 228; } static READ8_HANDLER( input_port_2_bit_r ) { - return (input_port_read_indexed(machine, 2) & (1 << offset)) ? 0 : 228; + return (input_port_read(machine, "IN2") & (1 << offset)) ? 0 : 228; } @@ -410,8 +410,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_RANGE(0x0800, 0x080f) AM_WRITE(SMH_RAM) AM_BASE(&tempest_colorram) AM_RANGE(0x0c00, 0x0c00) AM_READ(tempest_IN0_r) /* IN0 */ - AM_RANGE(0x0d00, 0x0d00) AM_READ(input_port_3_r) /* DSW1 */ - AM_RANGE(0x0e00, 0x0e00) AM_READ(input_port_4_r) /* DSW2 */ + AM_RANGE(0x0d00, 0x0d00) AM_READ_PORT("DSW1") /* DSW1 */ + AM_RANGE(0x0e00, 0x0e00) AM_READ_PORT("DSW2") /* DSW2 */ AM_RANGE(0x2000, 0x2fff) AM_RAM AM_BASE(&vectorram) AM_SIZE(&vectorram_size) AM_REGION(REGION_CPU1, 0x2000) AM_RANGE(0x3000, 0x3fff) AM_READ(SMH_ROM) AM_RANGE(0x4000, 0x4000) AM_WRITE(tempest_coin_w) diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c index 8d1004b5d06..a4a4f22d8f3 100644 --- a/src/mame/drivers/tetrisp2.c +++ b/src/mame/drivers/tetrisp2.c @@ -263,7 +263,7 @@ static WRITE16_HANDLER( nndmseal_sound_bank_w ) static READ16_HANDLER( tetrisp2_ip_1_word_r ) { - return ( input_port_read(machine, "IN1") & 0xfcff ) | + return ( input_port_read(machine, "SYSTEM") & 0xfcff ) | ( mame_rand(machine) & ~0xfcff ) | ( 1 << (8 + (mame_rand(machine)&1)) ); } @@ -339,7 +339,7 @@ static WRITE16_HANDLER( rocknms_main2sub_w ) static READ16_HANDLER( rocknms_port_0_r ) { - return ((input_port_read_indexed(machine, 0) & 0xfffc ) | (rocknms_sub2main & 0x0003)); + return ((input_port_read(machine, "PLAYERS") & 0xfffc ) | (rocknms_sub2main & 0x0003)); } static WRITE16_HANDLER( rocknms_sub2main_w ) @@ -377,13 +377,13 @@ static ADDRESS_MAP_START( tetrisp2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x600000, 0x60ffff) AM_READ(SMH_RAM ) // Rotation AM_RANGE(0x650000, 0x651fff) AM_READ(SMH_RAM ) // Rotation (mirror) AM_RANGE(0x800002, 0x800003) AM_READ(tetrisp2_sound_r ) // Sound - AM_RANGE(0x900000, 0x903fff) AM_READ(tetrisp2_nvram_r ) // NVRAM - AM_RANGE(0x904000, 0x907fff) AM_READ(tetrisp2_nvram_r ) // NVRAM (mirror) + AM_RANGE(0x900000, 0x903fff) AM_READ(tetrisp2_nvram_r ) // NVRAM + AM_RANGE(0x904000, 0x907fff) AM_READ(tetrisp2_nvram_r ) // NVRAM (mirror) AM_RANGE(0xbe0000, 0xbe0001) AM_READ(SMH_NOP ) // INT-level1 dummy read - AM_RANGE(0xbe0002, 0xbe0003) AM_READ(input_port_0_word_r ) // Inputs + AM_RANGE(0xbe0002, 0xbe0003) AM_READ_PORT("PLAYERS") // Inputs AM_RANGE(0xbe0004, 0xbe0005) AM_READ(tetrisp2_ip_1_word_r ) // Inputs & protection - AM_RANGE(0xbe0008, 0xbe0009) AM_READ(input_port_2_word_r ) // Inputs - AM_RANGE(0xbe000a, 0xbe000b) AM_READ(watchdog_reset16_r ) // Watchdog + AM_RANGE(0xbe0008, 0xbe0009) AM_READ_PORT("DSW") // Inputs + AM_RANGE(0xbe000a, 0xbe000b) AM_READ(watchdog_reset16_r ) // Watchdog ADDRESS_MAP_END static ADDRESS_MAP_START( tetrisp2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -494,15 +494,15 @@ static ADDRESS_MAP_START( rockn1_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x408000, 0x409fff) AM_READ(SMH_RAM ) // ??? AM_RANGE(0x500000, 0x50ffff) AM_READ(SMH_RAM ) // Line AM_RANGE(0x600000, 0x60ffff) AM_READ(SMH_RAM ) // Rotation - AM_RANGE(0x900000, 0x903fff) AM_READ(rockn_nvram_r ) // NVRAM + AM_RANGE(0x900000, 0x903fff) AM_READ(rockn_nvram_r ) // NVRAM AM_RANGE(0xa30000, 0xa30001) AM_READ(rockn_soundvolume_r ) // Sound Volume AM_RANGE(0xa40002, 0xa40003) AM_READ(tetrisp2_sound_r ) // Sound AM_RANGE(0xa44000, 0xa44001) AM_READ(rockn_adpcmbank_r ) // Sound Bank AM_RANGE(0xbe0000, 0xbe0001) AM_READ(SMH_NOP ) // INT-level1 dummy read - AM_RANGE(0xbe0002, 0xbe0003) AM_READ(input_port_0_word_r ) // Inputs - AM_RANGE(0xbe0004, 0xbe0005) AM_READ(input_port_1_word_r ) // Inputs - AM_RANGE(0xbe0008, 0xbe0009) AM_READ(input_port_2_word_r ) // Inputs - AM_RANGE(0xbe000a, 0xbe000b) AM_READ(watchdog_reset16_r ) // Watchdog + AM_RANGE(0xbe0002, 0xbe0003) AM_READ_PORT("PLAYERS") // Inputs + AM_RANGE(0xbe0004, 0xbe0005) AM_READ_PORT("SYSTEM") // Inputs + AM_RANGE(0xbe0008, 0xbe0009) AM_READ_PORT("DSW") // Inputs + AM_RANGE(0xbe000a, 0xbe000b) AM_READ(watchdog_reset16_r) // Watchdog ADDRESS_MAP_END static ADDRESS_MAP_START( rockn1_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -545,15 +545,15 @@ static ADDRESS_MAP_START( rockn2_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x800000, 0x803fff) AM_READ(SMH_RAM ) // Foreground AM_RANGE(0x804000, 0x807fff) AM_READ(SMH_RAM ) // Background AM_RANGE(0x808000, 0x809fff) AM_READ(SMH_RAM ) // ??? - AM_RANGE(0x900000, 0x903fff) AM_READ(rockn_nvram_r ) // NVRAM + AM_RANGE(0x900000, 0x903fff) AM_READ(rockn_nvram_r ) // NVRAM AM_RANGE(0xa30000, 0xa30001) AM_READ(rockn_soundvolume_r ) // Sound Volume AM_RANGE(0xa40002, 0xa40003) AM_READ(tetrisp2_sound_r ) // Sound AM_RANGE(0xa44000, 0xa44001) AM_READ(rockn_adpcmbank_r ) // Sound Bank AM_RANGE(0xbe0000, 0xbe0001) AM_READ(SMH_NOP ) // INT-level1 dummy read - AM_RANGE(0xbe0002, 0xbe0003) AM_READ(input_port_0_word_r ) // Inputs - AM_RANGE(0xbe0004, 0xbe0005) AM_READ(input_port_1_word_r ) // Inputs - AM_RANGE(0xbe0008, 0xbe0009) AM_READ(input_port_2_word_r ) // Inputs - AM_RANGE(0xbe000a, 0xbe000b) AM_READ(watchdog_reset16_r ) // Watchdog + AM_RANGE(0xbe0002, 0xbe0003) AM_READ_PORT("PLAYERS") // Inputs + AM_RANGE(0xbe0004, 0xbe0005) AM_READ_PORT("SYSTEM") // Inputs + AM_RANGE(0xbe0008, 0xbe0009) AM_READ_PORT("DSW") // Inputs + AM_RANGE(0xbe000a, 0xbe000b) AM_READ(watchdog_reset16_r) // Watchdog ADDRESS_MAP_END static ADDRESS_MAP_START( rockn2_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -591,20 +591,20 @@ static ADDRESS_MAP_START( rocknms_main_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x108000, 0x10ffff) AM_READ(SMH_RAM ) // Work RAM AM_RANGE(0x200000, 0x23ffff) AM_READ(tetrisp2_priority_r ) // Priority AM_RANGE(0x300000, 0x31ffff) AM_READ(SMH_RAM ) // Palette -// AM_RANGE(0x500000, 0x50ffff) AM_READ(SMH_RAM ) // Line +// AM_RANGE(0x500000, 0x50ffff) AM_READ(SMH_RAM ) // Line AM_RANGE(0x600000, 0x60ffff) AM_READ(SMH_RAM ) // Rotation AM_RANGE(0x800000, 0x803fff) AM_READ(SMH_RAM ) // Foreground AM_RANGE(0x804000, 0x807fff) AM_READ(SMH_RAM ) // Background -// AM_RANGE(0x808000, 0x809fff) AM_READ(SMH_RAM ) // ??? - AM_RANGE(0x900000, 0x903fff) AM_READ(rockn_nvram_r ) // NVRAM +// AM_RANGE(0x808000, 0x809fff) AM_READ(SMH_RAM ) // ??? + AM_RANGE(0x900000, 0x903fff) AM_READ(rockn_nvram_r ) // NVRAM AM_RANGE(0xa30000, 0xa30001) AM_READ(rockn_soundvolume_r ) // Sound Volume AM_RANGE(0xa40002, 0xa40003) AM_READ(tetrisp2_sound_r ) // Sound AM_RANGE(0xa44000, 0xa44001) AM_READ(rockn_adpcmbank_r ) // Sound Bank AM_RANGE(0xbe0000, 0xbe0001) AM_READ(SMH_NOP ) // INT-level1 dummy read AM_RANGE(0xbe0002, 0xbe0003) AM_READ(rocknms_port_0_r ) // Inputs - AM_RANGE(0xbe0004, 0xbe0005) AM_READ(input_port_1_word_r ) // Inputs - AM_RANGE(0xbe0008, 0xbe0009) AM_READ(input_port_2_word_r ) // Inputs - AM_RANGE(0xbe000a, 0xbe000b) AM_READ(watchdog_reset16_r ) // Watchdog + AM_RANGE(0xbe0004, 0xbe0005) AM_READ_PORT("SYSTEM") // Inputs + AM_RANGE(0xbe0008, 0xbe0009) AM_READ_PORT("DSW") // Inputs + AM_RANGE(0xbe000a, 0xbe000b) AM_READ(watchdog_reset16_r) // Watchdog ADDRESS_MAP_END static ADDRESS_MAP_START( rocknms_main_writemem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -699,7 +699,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( tetrisp2 ) - PORT_START_TAG("IN0") /*$be0002.w*/ + PORT_START_TAG("PLAYERS") /*$be0002.w*/ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) @@ -717,7 +717,7 @@ static INPUT_PORTS_START( tetrisp2 ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("IN1") /*$be0004.w*/ + PORT_START_TAG("SYSTEM") /*$be0004.w*/ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 ) @@ -735,7 +735,7 @@ static INPUT_PORTS_START( tetrisp2 ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN2") //$be0008.w + PORT_START_TAG("DSW") //$be0008.w PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3") PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) ) @@ -796,7 +796,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( teplus2j ) PORT_INCLUDE(tetrisp2) - PORT_MODIFY("IN2") // $be0008.w + PORT_MODIFY("DSW") // $be0008.w PORT_DIPNAME( 0x0040, 0x0040, "Unknown 1-7" ) PORT_DIPLOCATION("SW1:7") /* Free Play in "World" set */ PORT_DIPSETTING( 0x0040, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -932,7 +932,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( rockn ) - PORT_START_TAG("IN0") //$be0002.w + PORT_START_TAG("PLAYERS") //$be0002.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) @@ -950,7 +950,7 @@ static INPUT_PORTS_START( rockn ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN1") //$be0004.w + PORT_START_TAG("SYSTEM") //$be0004.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 ) @@ -968,7 +968,7 @@ static INPUT_PORTS_START( rockn ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN2") //$be0008.w + PORT_START_TAG("DSW") //$be0008.w PORT_DIPNAME( 0x0001, 0x0001, "DIPSW 1-1") // All these used to be marked 'Cheat', can't think why. PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -1022,8 +1022,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( rocknms ) - PORT_START // IN0 - $be0002.w - + PORT_START_TAG("PLAYERS") // IN0 - $be0002.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SPECIAL ) // MAIN -> SUB Communication PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SPECIAL ) // MAIN -> SUB Communication PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) @@ -1032,7 +1031,6 @@ static INPUT_PORTS_START( rocknms ) PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) @@ -1042,7 +1040,7 @@ static INPUT_PORTS_START( rocknms ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) - PORT_START // IN1 - $be0004.w + PORT_START_TAG("SYSTEM") // IN1 - $be0004.w PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 ) @@ -1051,7 +1049,6 @@ static INPUT_PORTS_START( rocknms ) 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_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1061,7 +1058,7 @@ static INPUT_PORTS_START( rocknms ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("IN2") //$be0008.w + PORT_START_TAG("DSW") //$be0008.w PORT_DIPNAME( 0x0001, 0x0001, "DIPSW 1-1") // All these used to be marked 'Cheat', can't think why. PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c index ba150fa397b..9e15be613ca 100644 --- a/src/mame/drivers/thedeep.c +++ b/src/mame/drivers/thedeep.c @@ -154,10 +154,10 @@ static ADDRESS_MAP_START( thedeep_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd000, 0xdfff) AM_READ(SMH_RAM ) // RAM (MCU data copied here) AM_RANGE(0xe000, 0xe000) AM_READ(thedeep_protection_r ) // From MCU AM_RANGE(0xe004, 0xe004) AM_READ(thedeep_e004_r ) // ? - AM_RANGE(0xe008, 0xe008) AM_READ(input_port_0_r ) // P1 (Inputs) - AM_RANGE(0xe009, 0xe009) AM_READ(input_port_1_r ) // P2 - AM_RANGE(0xe00a, 0xe00a) AM_READ(input_port_2_r ) // DSW1 - AM_RANGE(0xe00b, 0xe00b) AM_READ(input_port_3_r ) // DSW2 + AM_RANGE(0xe008, 0xe008) AM_READ_PORT("e008") // P1 (Inputs) + AM_RANGE(0xe009, 0xe009) AM_READ_PORT("e009") // P2 + AM_RANGE(0xe00a, 0xe00a) AM_READ_PORT("e00a") // DSW1 + AM_RANGE(0xe00b, 0xe00b) AM_READ_PORT("e00b") // DSW2 AM_RANGE(0xe400, 0xe7ff) AM_READ(SMH_RAM ) // Sprites AM_RANGE(0xe800, 0xefff) AM_READ(SMH_RAM ) // Text Layer AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM ) // Background Layer @@ -209,7 +209,7 @@ ADDRESS_MAP_END ***************************************************************************/ static INPUT_PORTS_START( thedeep ) - PORT_START_TAG("IN0") // e008 + PORT_START_TAG("e008") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) // Up / down shown in service mode PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) @@ -219,7 +219,7 @@ static INPUT_PORTS_START( thedeep ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START_TAG("IN1") // e009 + PORT_START_TAG("e009") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) @@ -229,7 +229,7 @@ static INPUT_PORTS_START( thedeep ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("IN2") // e00a + PORT_START_TAG("e00a") PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) ) @@ -253,7 +253,7 @@ static INPUT_PORTS_START( thedeep ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START_TAG("IN3") // e00b + PORT_START_TAG("e00b") PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x03, DEF_STR( Normal ) ) @@ -274,7 +274,7 @@ static INPUT_PORTS_START( thedeep ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) - PORT_START_TAG("IN4") // Read by the mcu + PORT_START_TAG("MCU") // Read by the mcu PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(1) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_IMPULSE(1) @@ -344,7 +344,7 @@ static INTERRUPT_GEN( thedeep_interrupt ) { if (protection_command != 0x59) { - int coins = input_port_read_indexed(machine, 4); + int coins = input_port_read(machine, "MCU"); if (coins & 1) protection_data = 1; else if (coins & 2) protection_data = 2; else if (coins & 4) protection_data = 3; @@ -501,4 +501,3 @@ ROM_END GAME( 1987, thedeep, 0, thedeep, thedeep, 0, ROT270, "Woodplace Inc.", "The Deep (Japan)", 0 ) GAME( 1988, rundeep, thedeep,thedeep, thedeep, 0, ROT270, "Cream", "Run Deep", 0 ) - diff --git a/src/mame/drivers/thepit.c b/src/mame/drivers/thepit.c index 0f8c1dffd88..07c99ad2de4 100644 --- a/src/mame/drivers/thepit.c +++ b/src/mame/drivers/thepit.c @@ -544,22 +544,22 @@ static INPUT_PORTS_START( rtriv ) PORT_DIPSETTING( 0x20, "Number of Wrong Answer" ) PORT_DIPSETTING( 0x00, "Number of Good Answer for Bonus Question" ) PORT_DIPNAME( 0xc0, 0x40, "Gaming Option Number" ) - PORT_DIPSETTING( 0x00, "2" ) PORT_CONDITION("DSW",0x20,PORTCOND_EQUALS,0x20) - PORT_DIPSETTING( 0x40, "3" ) PORT_CONDITION("DSW",0x20,PORTCOND_EQUALS,0x20) - PORT_DIPSETTING( 0x80, "4" ) PORT_CONDITION("DSW",0x20,PORTCOND_EQUALS,0x20) - PORT_DIPSETTING( 0xc0, "5" ) PORT_CONDITION("DSW",0x20,PORTCOND_EQUALS,0x20) - PORT_DIPSETTING( 0x00, "4" ) PORT_CONDITION("DSW",0x20,PORTCOND_NOTEQUALS,0x20) - PORT_DIPSETTING( 0x40, "5" ) PORT_CONDITION("DSW",0x20,PORTCOND_NOTEQUALS,0x20) - PORT_DIPSETTING( 0x80, "6" ) PORT_CONDITION("DSW",0x20,PORTCOND_NOTEQUALS,0x20) - PORT_DIPSETTING( 0xc0, "7" ) PORT_CONDITION("DSW",0x20,PORTCOND_NOTEQUALS,0x20) + PORT_DIPSETTING( 0x00, "2" ) PORT_CONDITION("DSW", 0x20, PORTCOND_EQUALS, 0x20) + PORT_DIPSETTING( 0x40, "3" ) PORT_CONDITION("DSW", 0x20, PORTCOND_EQUALS, 0x20) + PORT_DIPSETTING( 0x80, "4" ) PORT_CONDITION("DSW", 0x20, PORTCOND_EQUALS, 0x20) + PORT_DIPSETTING( 0xc0, "5" ) PORT_CONDITION("DSW", 0x20, PORTCOND_EQUALS, 0x20) + PORT_DIPSETTING( 0x00, "4" ) PORT_CONDITION("DSW", 0x20, PORTCOND_NOTEQUALS, 0x20) + PORT_DIPSETTING( 0x40, "5" ) PORT_CONDITION("DSW", 0x20, PORTCOND_NOTEQUALS, 0x20) + PORT_DIPSETTING( 0x80, "6" ) PORT_CONDITION("DSW", 0x20, PORTCOND_NOTEQUALS, 0x20) + PORT_DIPSETTING( 0xc0, "7" ) PORT_CONDITION("DSW", 0x20, PORTCOND_NOTEQUALS, 0x20) /* Since the real inputs are multiplexed, we used this fake port to read the 2nd player controls when the screen is flipped */ PORT_START_TAG("IN2") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON4 ) + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) + PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_PLAYER(2) PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN ) diff --git a/src/mame/drivers/tickee.c b/src/mame/drivers/tickee.c index 61fbbbe3dfa..cc7d5c02905 100644 --- a/src/mame/drivers/tickee.c +++ b/src/mame/drivers/tickee.c @@ -43,8 +43,8 @@ INLINE void get_crosshair_xy(running_machine *machine, int player, int *x, int * { const rectangle *visarea = video_screen_get_visible_area(machine->primary_screen); - *x = (((input_port_read_indexed(machine, 4 + player * 2) & 0xff) * (visarea->max_x - visarea->min_x)) >> 8) + visarea->min_x; - *y = (((input_port_read_indexed(machine, 5 + player * 2) & 0xff) * (visarea->max_y - visarea->min_y)) >> 8) + visarea->min_y; + *x = (((input_port_read(machine, player ? "GUNX2" : "GUNX1") & 0xff) * (visarea->max_x - visarea->min_x)) >> 8) + visarea->min_x; + *y = (((input_port_read(machine, player ? "GUNY2" : "GUNY1") & 0xff) * (visarea->max_y - visarea->min_y)) >> 8) + visarea->min_y; } @@ -161,12 +161,12 @@ static MACHINE_RESET( tickee ) static READ8_HANDLER( port1_r ) { - return input_port_read_indexed(machine,1) | (ticket_dispenser_0_r(machine, 0) >> 5) | (ticket_dispenser_1_r(machine, 0) >> 6); + return input_port_read(machine, "IN0") | (ticket_dispenser_0_r(machine, 0) >> 5) | (ticket_dispenser_1_r(machine, 0) >> 6); } static READ8_HANDLER( port2_r ) { - return input_port_read_indexed(machine,3) | (ticket_dispenser_0_r(machine, 0) >> 5) | (ticket_dispenser_1_r(machine, 0) >> 6); + return input_port_read(machine, "IN2") | (ticket_dispenser_0_r(machine, 0) >> 5) | (ticket_dispenser_1_r(machine, 0) >> 6); } @@ -218,7 +218,7 @@ static ADDRESS_MAP_START( tickee_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x04200100, 0x0420010f) AM_READWRITE(AY8910_read_port_1_lsb_r, AY8910_control_port_1_lsb_w) AM_RANGE(0x04200110, 0x0420011f) AM_WRITE(AY8910_write_port_1_lsb_w) AM_RANGE(0x04400000, 0x0440007f) AM_WRITE(tickee_control_w) AM_BASE(&tickee_control) - AM_RANGE(0x04400040, 0x0440004f) AM_READ(input_port_3_word_r) + AM_RANGE(0x04400040, 0x0440004f) AM_READ_PORT("IN2") AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE(tms34010_io_register_r, tms34010_io_register_w) AM_RANGE(0xc0000240, 0xc000025f) AM_WRITENOP /* seems to be a bug in their code */ AM_RANGE(0xff000000, 0xffffffff) AM_ROM AM_REGION(REGION_USER1, 0) @@ -250,7 +250,7 @@ ADDRESS_MAP_END *************************************/ static INPUT_PORTS_START( tickee ) - PORT_START + PORT_START_TAG("DSW") PORT_DIPNAME( 0x03, 0x01, "Game Time/Diff" ) PORT_DIPSETTING( 0x03, "Very Fast/Very Easy" ) PORT_DIPSETTING( 0x02, "Fast/Easy" ) @@ -273,13 +273,13 @@ static INPUT_PORTS_START( tickee ) PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C )) PORT_DIPSETTING( 0xc0, DEF_STR( 1C_2C )) - PORT_START + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* right ticket status */ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* left ticket status */ PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) @@ -288,25 +288,25 @@ static INPUT_PORTS_START( tickee ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + PORT_START_TAG("IN2") PORT_SERVICE( 0x0001, IP_ACTIVE_LOW ) PORT_BIT( 0xfffe, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* fake analog X */ + PORT_START_TAG("GUNX1") /* fake analog X */ PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) - PORT_START /* fake analog Y */ + PORT_START_TAG("GUNY1") /* fake analog Y */ PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) - PORT_START /* fake analog X */ + PORT_START_TAG("GUNX2") /* fake analog X */ PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(2) - PORT_START /* fake analog Y */ + PORT_START_TAG("GUNY2") /* fake analog Y */ PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) PORT_PLAYER(2) INPUT_PORTS_END static INPUT_PORTS_START( ghoshunt ) - PORT_START + PORT_START_TAG("DSW") PORT_DIPNAME( 0x01, 0x01, "Messages in Play") PORT_DIPSETTING( 0x01, DEF_STR( Off )) PORT_DIPSETTING( 0x00, DEF_STR( On )) @@ -330,14 +330,14 @@ static INPUT_PORTS_START( ghoshunt ) PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C )) PORT_DIPSETTING( 0xc0, DEF_STR( 1C_2C )) - PORT_START + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* right ticket status */ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* left ticket status */ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0xd8, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) @@ -346,23 +346,23 @@ static INPUT_PORTS_START( ghoshunt ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) - PORT_START + PORT_START_TAG("IN2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* right ticket status */ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* left ticket status */ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0xd8, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* fake analog X */ + PORT_START_TAG("GUNX1") /* fake analog X */ PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) - PORT_START /* fake analog Y */ + PORT_START_TAG("GUNY1") /* fake analog Y */ PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) - PORT_START /* fake analog X */ + PORT_START_TAG("GUNX2") /* fake analog X */ PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_PLAYER(2) - PORT_START /* fake analog Y */ + PORT_START_TAG("GUNY2") /* fake analog Y */ PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(70) PORT_KEYDELTA(10) PORT_PLAYER(2) INPUT_PORTS_END diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c index 022280b4a70..3f512835d82 100644 --- a/src/mame/drivers/tmnt.c +++ b/src/mame/drivers/tmnt.c @@ -491,7 +491,7 @@ static READ16_HANDLER( blswhstl_coin_r ) /* bit 3 is service button */ /* bit 6 is ??? VBLANK? OBJMPX? */ - res = input_port_read_indexed(machine,2); + res = input_port_read(machine, "COINS"); if (init_eeprom_count) { init_eeprom_count--; @@ -507,7 +507,7 @@ static READ16_HANDLER( blswhstl_eeprom_r ) /* bit 0 is EEPROM data */ /* bit 1 is EEPROM ready */ - res = eeprom_read_bit() | input_port_read_indexed(machine,3); + res = eeprom_read_bit() | input_port_read(machine, "EEPROM"); return res; } @@ -520,7 +520,7 @@ static READ16_HANDLER( ssriders_eeprom_r ) /* bit 1 is EEPROM ready */ /* bit 2 is VBLANK (???) */ /* bit 7 is service button */ - res = eeprom_read_bit() | input_port_read_indexed(machine,3); + res = eeprom_read_bit() | input_port_read(machine, "EEPROM"); if (init_eeprom_count) { init_eeprom_count--; @@ -539,7 +539,7 @@ static READ16_HANDLER( sunsetbl_eeprom_r ) /* bit 1 is EEPROM ready */ /* bit 2 is VBLANK (???) */ /* bit 3 is service button */ - res = eeprom_read_bit() | input_port_read_indexed(machine,3); + res = eeprom_read_bit() | input_port_read(machine, "EEPROM"); if (init_eeprom_count) { init_eeprom_count--; @@ -598,7 +598,7 @@ static READ16_HANDLER( thndrx2_in0_r ) { int res; - res = input_port_read_indexed(machine,0); + res = input_port_read(machine, "P1/COINS"); if (init_eeprom_count) { init_eeprom_count--; @@ -616,7 +616,7 @@ static READ16_HANDLER( thndrx2_eeprom_r ) /* bit 1 is EEPROM ready */ /* bit 3 is VBLANK (???) */ /* bit 7 is service button */ - res = (eeprom_read_bit() << 8) | input_port_read_indexed(machine,1); + res = (eeprom_read_bit() << 8) | input_port_read(machine, "P2/EEPROM"); toggle ^= 0x0800; return (res ^ toggle); } @@ -650,7 +650,7 @@ static READ16_HANDLER( prmrsocr_IN0_r ) /* bit 9 is service button */ int res; - res = input_port_read_indexed(machine,0); + res = input_port_read(machine, "P1/COINS"); if (init_eeprom_count) { init_eeprom_count--; @@ -663,7 +663,7 @@ static READ16_HANDLER( prmrsocr_eeprom_r ) { /* bit 8 is EEPROM data */ /* bit 9 is EEPROM ready */ - return (eeprom_read_bit() << 8) | input_port_read_indexed(machine,1); + return (eeprom_read_bit() << 8) | input_port_read(machine, "P2/EEPROM"); } static WRITE16_HANDLER( prmrsocr_eeprom_w ) @@ -721,13 +721,13 @@ static ADDRESS_MAP_START( cuebrick_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x040000, 0x043fff) AM_RAM /* main RAM */ AM_RANGE(0x060000, 0x063fff) AM_RAM /* main RAM */ AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(tmnt_paletteram_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x0a0000, 0x0a0001) AM_READWRITE(input_port_0_word_r, tmnt_0a0000_w) - AM_RANGE(0x0a0002, 0x0a0003) AM_READ(input_port_1_word_r) - AM_RANGE(0x0a0004, 0x0a0005) AM_READ(input_port_2_word_r) + AM_RANGE(0x0a0000, 0x0a0001) AM_READ_PORT("COINS") AM_WRITE(tmnt_0a0000_w) + AM_RANGE(0x0a0002, 0x0a0003) AM_READ_PORT("P1") + AM_RANGE(0x0a0004, 0x0a0005) AM_READ_PORT("P2") AM_RANGE(0x0a0008, 0x0a0009) AM_WRITE(tmnt_sound_command_w) - AM_RANGE(0x0a0010, 0x0a0011) AM_READWRITE(input_port_3_word_r, watchdog_reset16_w) - AM_RANGE(0x0a0012, 0x0a0013) AM_READ(input_port_4_word_r) - AM_RANGE(0x0a0018, 0x0a0019) AM_READ(input_port_5_word_r) + AM_RANGE(0x0a0010, 0x0a0011) AM_READ_PORT("DSW1") AM_WRITE(watchdog_reset16_w) + AM_RANGE(0x0a0012, 0x0a0013) AM_READ_PORT("DSW2") + AM_RANGE(0x0a0018, 0x0a0019) AM_READ_PORT("DSW3") AM_RANGE(0x0b0000, 0x0b03ff) AM_READWRITE(cuebrick_nv_r, cuebrick_nv_w) AM_RANGE(0x0b0400, 0x0b0401) AM_WRITE(cuebrick_nvbank_w) AM_RANGE(0x0c0000, 0x0c0003) AM_READWRITE(cuebrick_snd_r, cuebrick_snd_w) @@ -742,13 +742,13 @@ static ADDRESS_MAP_START( mia_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x040000, 0x043fff) AM_RAM /* main RAM */ AM_RANGE(0x060000, 0x063fff) AM_RAM /* main RAM */ AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(tmnt_paletteram_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x0a0000, 0x0a0001) AM_READWRITE(input_port_0_word_r, tmnt_0a0000_w) - AM_RANGE(0x0a0002, 0x0a0003) AM_READ(input_port_1_word_r) - AM_RANGE(0x0a0004, 0x0a0005) AM_READ(input_port_2_word_r) + AM_RANGE(0x0a0000, 0x0a0001) AM_READ_PORT("COINS") AM_WRITE(tmnt_0a0000_w) + AM_RANGE(0x0a0002, 0x0a0003) AM_READ_PORT("P1") + AM_RANGE(0x0a0004, 0x0a0005) AM_READ_PORT("P2") AM_RANGE(0x0a0008, 0x0a0009) AM_WRITE(tmnt_sound_command_w) - AM_RANGE(0x0a0010, 0x0a0011) AM_READWRITE(input_port_3_word_r, watchdog_reset16_w) - AM_RANGE(0x0a0012, 0x0a0013) AM_READ(input_port_4_word_r) - AM_RANGE(0x0a0018, 0x0a0019) AM_READ(input_port_5_word_r) + AM_RANGE(0x0a0010, 0x0a0011) AM_READ_PORT("DSW1") AM_WRITE(watchdog_reset16_w) + AM_RANGE(0x0a0012, 0x0a0013) AM_READ_PORT("DSW2") + AM_RANGE(0x0a0018, 0x0a0019) AM_READ_PORT("DSW3") #if 0 AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE(tmnt_priority_w) #endif @@ -763,15 +763,15 @@ static ADDRESS_MAP_START( tmnt_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x05ffff) AM_ROM AM_RANGE(0x060000, 0x063fff) AM_RAM /* main RAM */ AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(tmnt_paletteram_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x0a0000, 0x0a0001) AM_READWRITE(input_port_0_word_r, tmnt_0a0000_w) - AM_RANGE(0x0a0002, 0x0a0003) AM_READ(input_port_1_word_r) - AM_RANGE(0x0a0004, 0x0a0005) AM_READ(input_port_2_word_r) - AM_RANGE(0x0a0006, 0x0a0007) AM_READ(input_port_3_word_r) + AM_RANGE(0x0a0000, 0x0a0001) AM_READ_PORT("COINS") AM_WRITE(tmnt_0a0000_w) + AM_RANGE(0x0a0002, 0x0a0003) AM_READ_PORT("P1") + AM_RANGE(0x0a0004, 0x0a0005) AM_READ_PORT("P2") + AM_RANGE(0x0a0006, 0x0a0007) AM_READ_PORT("P3") AM_RANGE(0x0a0008, 0x0a0009) AM_WRITE(tmnt_sound_command_w) - AM_RANGE(0x0a0010, 0x0a0011) AM_READWRITE(input_port_4_word_r, watchdog_reset16_w) - AM_RANGE(0x0a0012, 0x0a0013) AM_READ(input_port_5_word_r) - AM_RANGE(0x0a0014, 0x0a0015) AM_READ(input_port_6_word_r) - AM_RANGE(0x0a0018, 0x0a0019) AM_READ(input_port_7_word_r) + AM_RANGE(0x0a0010, 0x0a0011) AM_READ_PORT("DSW1") AM_WRITE(watchdog_reset16_w) + AM_RANGE(0x0a0012, 0x0a0013) AM_READ_PORT("DSW2") + AM_RANGE(0x0a0014, 0x0a0015) AM_READ_PORT("P4") + AM_RANGE(0x0a0018, 0x0a0019) AM_READ_PORT("DSW3") AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE(tmnt_priority_w) AM_RANGE(0x100000, 0x107fff) AM_READWRITE(K052109_word_noA12_r, K052109_word_noA12_w) // AM_RANGE(0x10e800, 0x10e801) AM_WRITE(SMH_NOP) ??? @@ -784,10 +784,10 @@ static ADDRESS_MAP_START( punkshot_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x080000, 0x083fff) AM_RAM /* main RAM */ AM_RANGE(0x090000, 0x090fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0x0a0000, 0x0a0001) AM_READ(input_port_0_word_r) - AM_RANGE(0x0a0002, 0x0a0003) AM_READ(input_port_1_word_r) - AM_RANGE(0x0a0004, 0x0a0005) AM_READ(input_port_3_word_r) - AM_RANGE(0x0a0006, 0x0a0007) AM_READ(input_port_2_word_r) + AM_RANGE(0x0a0000, 0x0a0001) AM_READ_PORT("DSW1/DSW2") + AM_RANGE(0x0a0002, 0x0a0003) AM_READ_PORT("COINS/DSW3") + AM_RANGE(0x0a0004, 0x0a0005) AM_READ_PORT("P3/P4") + AM_RANGE(0x0a0006, 0x0a0007) AM_READ_PORT("P1/P2") AM_RANGE(0x0a0020, 0x0a0021) AM_WRITE(punkshot_0a0020_w) AM_RANGE(0x0a0040, 0x0a0043) AM_READ(punkshot_sound_r) /* K053260 */ AM_RANGE(0x0a0040, 0x0a0041) AM_WRITE(K053260_0_lsb_w) @@ -804,12 +804,12 @@ static ADDRESS_MAP_START( lgtnfght_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x090000, 0x093fff) AM_RAM /*main RAM */ - AM_RANGE(0x0a0000, 0x0a0001) AM_READ(input_port_0_word_r) - AM_RANGE(0x0a0002, 0x0a0003) AM_READ(input_port_1_word_r) - AM_RANGE(0x0a0004, 0x0a0005) AM_READ(input_port_2_word_r) - AM_RANGE(0x0a0006, 0x0a0007) AM_READ(input_port_3_word_r) - AM_RANGE(0x0a0008, 0x0a0009) AM_READ(input_port_4_word_r) - AM_RANGE(0x0a0010, 0x0a0011) AM_READ(input_port_5_word_r) + AM_RANGE(0x0a0000, 0x0a0001) AM_READ_PORT("COINS") + AM_RANGE(0x0a0002, 0x0a0003) AM_READ_PORT("P1") + AM_RANGE(0x0a0004, 0x0a0005) AM_READ_PORT("P2") + AM_RANGE(0x0a0006, 0x0a0007) AM_READ_PORT("DSW1") + AM_RANGE(0x0a0008, 0x0a0009) AM_READ_PORT("DSW2") + AM_RANGE(0x0a0010, 0x0a0011) AM_READ_PORT("DSW3") AM_RANGE(0x0a0018, 0x0a0019) AM_WRITE(lgtnfght_0a0018_w) AM_RANGE(0x0a0020, 0x0a0023) AM_READ(punkshot_sound_r) /* K053260 */ AM_RANGE(0x0a0020, 0x0a0021) AM_WRITE(K053260_0_lsb_w) @@ -835,8 +835,8 @@ static ADDRESS_MAP_START( blswhstl_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x500000, 0x50003f) AM_READWRITE(K054000_lsb_r, K054000_lsb_w) AM_RANGE(0x680000, 0x68001f) AM_READWRITE(K053244_word_noA1_r, K053244_word_noA1_w) - AM_RANGE(0x700000, 0x700001) AM_READ(input_port_0_word_r) - AM_RANGE(0x700002, 0x700003) AM_READ(input_port_1_word_r) + AM_RANGE(0x700000, 0x700001) AM_READ_PORT("P1") + AM_RANGE(0x700002, 0x700003) AM_READ_PORT("P2") AM_RANGE(0x700004, 0x700005) AM_READ(blswhstl_coin_r) AM_RANGE(0x700006, 0x700007) AM_READ(blswhstl_eeprom_r) AM_RANGE(0x700200, 0x700201) AM_WRITE(blswhstl_eeprom_w) @@ -859,10 +859,10 @@ static ADDRESS_MAP_START( glfgreat_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x114000, 0x11401f) AM_READWRITE(K053244_lsb_r, K053244_lsb_w) /* duplicate! */ AM_RANGE(0x118000, 0x11801f) AM_WRITE(SMH_RAM) AM_BASE(&K053936_0_ctrl) AM_RANGE(0x11c000, 0x11c01f) AM_WRITE(K053251_msb_w) - AM_RANGE(0x120000, 0x120001) AM_READ(input_port_0_word_r) - AM_RANGE(0x120002, 0x120003) AM_READ(input_port_1_word_r) - AM_RANGE(0x120004, 0x120005) AM_READ(input_port_3_word_r) - AM_RANGE(0x120006, 0x120007) AM_READ(input_port_2_word_r) + AM_RANGE(0x120000, 0x120001) AM_READ_PORT("P1/P2") + AM_RANGE(0x120002, 0x120003) AM_READ_PORT("P3/P4") + AM_RANGE(0x120004, 0x120005) AM_READ_PORT("COINS/DSW3") + AM_RANGE(0x120006, 0x120007) AM_READ_PORT("DSW1/DSW2") AM_RANGE(0x121000, 0x121001) AM_READ(glfgreat_ball_r) /* returns the color of the center pixel of the roz layer */ AM_RANGE(0x122000, 0x122001) AM_WRITE(glfgreat_122000_w) AM_RANGE(0x124000, 0x124001) AM_WRITE(watchdog_reset16_w) @@ -1130,11 +1130,11 @@ static ADDRESS_MAP_START( tmnt2_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x104000, 0x107fff) AM_RAM AM_BASE(&sunset_104000) /* main RAM */ AM_RANGE(0x140000, 0x140fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x180000, 0x183fff) AM_RAM_WRITE(K053245_scattered_word_w) AM_BASE(&spriteram16) // K053245_scattered_word_r - AM_RANGE(0x1c0000, 0x1c0001) AM_READ(input_port_0_word_r) - AM_RANGE(0x1c0002, 0x1c0003) AM_READ(input_port_1_word_r) - AM_RANGE(0x1c0004, 0x1c0005) AM_READ(input_port_4_word_r) - AM_RANGE(0x1c0006, 0x1c0007) AM_READ(input_port_5_word_r) - AM_RANGE(0x1c0100, 0x1c0101) AM_READ(input_port_2_word_r) + AM_RANGE(0x1c0000, 0x1c0001) AM_READ_PORT("P1") + AM_RANGE(0x1c0002, 0x1c0003) AM_READ_PORT("P2") + AM_RANGE(0x1c0004, 0x1c0005) AM_READ_PORT("P3") + AM_RANGE(0x1c0006, 0x1c0007) AM_READ_PORT("P4") + AM_RANGE(0x1c0100, 0x1c0101) AM_READ_PORT("COINS") AM_RANGE(0x1c0102, 0x1c0103) AM_READ(ssriders_eeprom_r) AM_RANGE(0x1c0200, 0x1c0201) AM_WRITE(ssriders_eeprom_w) /* EEPROM and gfx control */ AM_RANGE(0x1c0300, 0x1c0301) AM_WRITE(ssriders_1c0300_w) @@ -1156,11 +1156,11 @@ static ADDRESS_MAP_START( ssriders_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x104000, 0x107fff) AM_RAM /* main RAM */ AM_RANGE(0x140000, 0x140fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x180000, 0x183fff) AM_READWRITE(K053245_scattered_word_r, K053245_scattered_word_w) AM_BASE(&spriteram16) - AM_RANGE(0x1c0000, 0x1c0001) AM_READ(input_port_0_word_r) - AM_RANGE(0x1c0002, 0x1c0003) AM_READ(input_port_1_word_r) - AM_RANGE(0x1c0004, 0x1c0005) AM_READ(input_port_4_word_r) - AM_RANGE(0x1c0006, 0x1c0007) AM_READ(input_port_5_word_r) - AM_RANGE(0x1c0100, 0x1c0101) AM_READ(input_port_2_word_r) + AM_RANGE(0x1c0000, 0x1c0001) AM_READ_PORT("P1") + AM_RANGE(0x1c0002, 0x1c0003) AM_READ_PORT("P2") + AM_RANGE(0x1c0004, 0x1c0005) AM_READ_PORT("P3") + AM_RANGE(0x1c0006, 0x1c0007) AM_READ_PORT("P4") + AM_RANGE(0x1c0100, 0x1c0101) AM_READ_PORT("COINS") AM_RANGE(0x1c0102, 0x1c0103) AM_READ(ssriders_eeprom_r) AM_RANGE(0x1c0200, 0x1c0201) AM_WRITE(ssriders_eeprom_w) /* EEPROM and gfx control */ AM_RANGE(0x1c0300, 0x1c0301) AM_WRITE(ssriders_1c0300_w) @@ -1191,12 +1191,12 @@ static ADDRESS_MAP_START( sunsetbl_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x604020, 0x60402f) AM_WRITE(SMH_NOP) /* written every frame */ AM_RANGE(0x604200, 0x604201) AM_WRITE(SMH_NOP) /* watchdog */ AM_RANGE(0x6119e2, 0x6119e3) AM_WRITE(SMH_NOP) /* written a lot in some test menus (PC=18204) */ - AM_RANGE(0xc00000, 0xc00001) AM_READ(input_port_0_word_r) - AM_RANGE(0xc00002, 0xc00003) AM_READ(input_port_1_word_r) - AM_RANGE(0xc00004, 0xc00005) AM_READ(input_port_4_word_r) - AM_RANGE(0xc00006, 0xc00007) AM_READ(input_port_5_word_r) + AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("P1") + AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("P2") + AM_RANGE(0xc00004, 0xc00005) AM_READ_PORT("P3") + AM_RANGE(0xc00006, 0xc00007) AM_READ_PORT("P4") AM_RANGE(0xc00200, 0xc00201) AM_WRITE(ssriders_eeprom_w) /* EEPROM and gfx control */ - AM_RANGE(0xc00404, 0xc00405) AM_READ(input_port_2_word_r) + AM_RANGE(0xc00404, 0xc00405) AM_READ_PORT("COINS") AM_RANGE(0xc00406, 0xc00407) AM_READ(sunsetbl_eeprom_r) AM_RANGE(0xc00600, 0xc00601) AM_READWRITE(OKIM6295_status_0_lsb_r, OKIM6295_data_0_lsb_w) AM_RANGE(0x75d288, 0x75d289) AM_READ(SMH_NOP) // read repeatedly in some test menus (PC=181f2) @@ -1337,7 +1337,7 @@ ADDRESS_MAP_END PORT_BIT( 0x8000, IP_ACTIVE_LOW, start ) static INPUT_PORTS_START( cuebrick ) - PORT_START /* COINS */ + PORT_START_TAG("COINS") /* COINS */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -1347,13 +1347,13 @@ static INPUT_PORTS_START( cuebrick ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* PLAYER 1 */ + PORT_START_TAG("P1") /* PLAYER 1 */ KONAMI_PLAYERS_INPUT_LSB( 1, IPT_BUTTON3, IPT_UNUSED ) - PORT_START /* PLAYER 2 */ + PORT_START_TAG("P2") /* PLAYER 2 */ KONAMI_PLAYERS_INPUT_LSB( 2, IPT_BUTTON3, IPT_UNUSED ) - PORT_START /* DSW1 */ + PORT_START_TAG("DSW1") /* DSW1 */ PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPSETTING( 0x03, "2" ) PORT_DIPSETTING( 0x02, "3" ) @@ -1374,7 +1374,7 @@ static INPUT_PORTS_START( cuebrick ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* DSW2 */ + PORT_START_TAG("DSW2") /* DSW2 */ PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) ) @@ -1410,7 +1410,7 @@ static INPUT_PORTS_START( cuebrick ) PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) ) // PORT_DIPSETTING( 0x00, "Invalid" ) - PORT_START /* DSW3 */ + PORT_START_TAG("DSW3") /* DSW3 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1422,7 +1422,7 @@ static INPUT_PORTS_START( cuebrick ) INPUT_PORTS_END static INPUT_PORTS_START( mia ) - PORT_START /* COINS */ + PORT_START_TAG("COINS") /* COINS */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -1432,13 +1432,13 @@ static INPUT_PORTS_START( mia ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* PLAYER 1 */ + PORT_START_TAG("P1") /* PLAYER 1 */ KONAMI_PLAYERS_INPUT_LSB( 1, IPT_BUTTON3, IPT_UNUSED ) - PORT_START /* PLAYER 2 */ + PORT_START_TAG("P2") /* PLAYER 2 */ KONAMI_PLAYERS_INPUT_LSB( 2, IPT_BUTTON3, IPT_UNUSED ) - PORT_START /* DSW1 */ + PORT_START_TAG("DSW1") /* DSW1 */ PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) ) @@ -1474,7 +1474,7 @@ static INPUT_PORTS_START( mia ) PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) ) // PORT_DIPSETTING( 0x00, "Invalid" ) - PORT_START /* DSW2 */ + PORT_START_TAG("DSW2") /* DSW2 */ PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPSETTING( 0x03, "2" ) PORT_DIPSETTING( 0x02, "3" ) @@ -1495,7 +1495,7 @@ static INPUT_PORTS_START( mia ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* DSW3 */ + PORT_START_TAG("DSW3") /* DSW3 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1507,7 +1507,7 @@ static INPUT_PORTS_START( mia ) INPUT_PORTS_END static INPUT_PORTS_START( tmnt ) - PORT_START /* COINS */ + PORT_START_TAG("COINS") /* COINS */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) @@ -1517,16 +1517,16 @@ static INPUT_PORTS_START( tmnt ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE4 ) - PORT_START /* PLAYER 1 */ + PORT_START_TAG("P1") /* PLAYER 1 */ KONAMI_PLAYERS_INPUT_LSB( 1, IPT_UNKNOWN, IPT_UNKNOWN ) - PORT_START /* PLAYER 2 */ + PORT_START_TAG("P2") /* PLAYER 2 */ KONAMI_PLAYERS_INPUT_LSB( 2, IPT_UNKNOWN, IPT_UNKNOWN ) - PORT_START /* PLAYER 3 */ + PORT_START_TAG("P3") /* PLAYER 3 */ KONAMI_PLAYERS_INPUT_LSB( 3, IPT_UNKNOWN, IPT_UNKNOWN ) - PORT_START /* DSW1 */ + PORT_START_TAG("DSW1") /* DSW1 */ PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) ) @@ -1545,7 +1545,7 @@ static INPUT_PORTS_START( tmnt ) PORT_DIPSETTING( 0x0a, DEF_STR( 1C_6C ) ) PORT_DIPSETTING( 0x09, DEF_STR( 1C_7C ) ) - PORT_START /* DSW2 */ + PORT_START_TAG("DSW2") /* DSW2 */ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPSETTING( 0x03, "1" ) PORT_DIPSETTING( 0x02, "2" ) @@ -1569,10 +1569,10 @@ static INPUT_PORTS_START( tmnt ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* PLAYER 4 */ + PORT_START_TAG("P4") /* PLAYER 4 */ KONAMI_PLAYERS_INPUT_LSB( 4, IPT_UNKNOWN, IPT_UNKNOWN ) - PORT_START /* DSW3 */ + PORT_START_TAG("DSW3") /* DSW3 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1587,7 +1587,7 @@ static INPUT_PORTS_START( tmnt ) INPUT_PORTS_END static INPUT_PORTS_START( tmnt2p ) - PORT_START /* COINS */ + PORT_START_TAG("COINS") /* COINS */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1597,16 +1597,16 @@ static INPUT_PORTS_START( tmnt2p ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* PLAYER 1 */ + PORT_START_TAG("P1") /* PLAYER 1 */ KONAMI_PLAYERS_INPUT_LSB( 1, IPT_UNKNOWN, IPT_START1 ) - PORT_START /* PLAYER 2 */ + PORT_START_TAG("P2") /* PLAYER 2 */ KONAMI_PLAYERS_INPUT_LSB( 2, IPT_UNKNOWN, IPT_START2 ) - PORT_START /* PLAYER 3 */ -// KONAMI_PLAYERS_INPUT_LSB( 3, IPT_UNKNOWN, IPT_START3 ) + PORT_START_TAG("P3") /* PLAYER 3 */ + PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* DSW1 */ + PORT_START_TAG("DSW1") /* DSW1 */ PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) ) @@ -1642,7 +1642,7 @@ static INPUT_PORTS_START( tmnt2p ) PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) ) // PORT_DIPSETTING( 0x00, "Invalid" ) - PORT_START /* DSW2 */ + PORT_START_TAG("DSW2") /* DSW2 */ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPSETTING( 0x03, "1" ) PORT_DIPSETTING( 0x02, "2" ) @@ -1666,10 +1666,10 @@ static INPUT_PORTS_START( tmnt2p ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* PLAYER 4 */ -// KONAMI_PLAYERS_INPUT_LSB( 4, IPT_UNKNOWN, IPT_START4 ) + PORT_START_TAG("P4") /* PLAYER 4 */ + PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* DSW3 */ + PORT_START_TAG("DSW3") /* DSW3 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1684,7 +1684,7 @@ static INPUT_PORTS_START( tmnt2p ) INPUT_PORTS_END static INPUT_PORTS_START( punkshot ) - PORT_START /* DSW1/DSW2 */ + PORT_START_TAG("DSW1/DSW2") /* DSW1/DSW2 */ PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) ) @@ -1736,7 +1736,7 @@ static INPUT_PORTS_START( punkshot ) PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_START /* COIN/DSW3 */ + PORT_START_TAG("COINS/DSW3") /* COIN/DSW3 */ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 ) @@ -1760,17 +1760,17 @@ static INPUT_PORTS_START( punkshot ) PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_START /* IN0/IN1 */ + PORT_START_TAG("P1/P2") /* IN0/IN1 */ KONAMI_PLAYERS_INPUT_LSB( 1, IPT_UNKNOWN, IPT_UNKNOWN ) KONAMI_PLAYERS_INPUT_MSB( 2, IPT_UNKNOWN, IPT_UNKNOWN ) - PORT_START /* IN2/IN3 */ + PORT_START_TAG("P3/P4") /* IN2/IN3 */ KONAMI_PLAYERS_INPUT_LSB( 3, IPT_UNKNOWN, IPT_UNKNOWN ) KONAMI_PLAYERS_INPUT_MSB( 4, IPT_UNKNOWN, IPT_UNKNOWN ) INPUT_PORTS_END static INPUT_PORTS_START( punksht2 ) - PORT_START /* DSW1/DSW2 */ + PORT_START_TAG("DSW1/DSW2") /* DSW1/DSW2 */ PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) ) @@ -1822,7 +1822,7 @@ static INPUT_PORTS_START( punksht2 ) PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_START /* COIN/DSW3 */ + PORT_START_TAG("COINS/DSW3") /* COIN/DSW3 */ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1846,13 +1846,16 @@ static INPUT_PORTS_START( punksht2 ) PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_START /* IN0/IN1 */ + PORT_START_TAG("P1/P2") /* IN0/IN1 */ KONAMI_PLAYERS_INPUT_LSB( 1, IPT_UNKNOWN, IPT_UNKNOWN ) KONAMI_PLAYERS_INPUT_MSB( 2, IPT_UNKNOWN, IPT_UNKNOWN ) + + PORT_START_TAG("P3/P4") /* IN2/IN3 */ + PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END static INPUT_PORTS_START( lgtnfght ) - PORT_START + PORT_START_TAG("COINS") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* vblank? checked during boot */ @@ -1862,13 +1865,13 @@ static INPUT_PORTS_START( lgtnfght ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("P1") KONAMI_PLAYERS_INPUT_LSB( 1, IPT_BUTTON3, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("P2") KONAMI_PLAYERS_INPUT_LSB( 2, IPT_BUTTON3, IPT_UNKNOWN ) - PORT_START /* DSW1 */ + PORT_START_TAG("DSW1") /* DSW1 */ PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPSETTING( 0x03, "2" ) PORT_DIPSETTING( 0x02, "3" ) @@ -1891,7 +1894,7 @@ static INPUT_PORTS_START( lgtnfght ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* DSW2 */ + PORT_START_TAG("DSW2") /* DSW2 */ PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) ) @@ -1927,7 +1930,7 @@ static INPUT_PORTS_START( lgtnfght ) PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ) ) // PORT_DIPSETTING( 0x00, "Invalid" ) - PORT_START /* DSW3 */ + PORT_START_TAG("DSW3") /* DSW3 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1942,13 +1945,13 @@ static INPUT_PORTS_START( lgtnfght ) INPUT_PORTS_END static INPUT_PORTS_START( blswhstl ) - PORT_START /* IN0 */ + PORT_START_TAG("P1") /* IN0 */ KONAMI_PLAYERS_INPUT_LSB( 1, IPT_UNKNOWN, IPT_UNKNOWN ) - PORT_START /* IN1 */ + PORT_START_TAG("P2") /* IN1 */ KONAMI_PLAYERS_INPUT_LSB( 2, IPT_UNKNOWN, IPT_UNKNOWN ) - PORT_START /* COIN */ + PORT_START_TAG("COINS") /* COIN */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -1958,22 +1961,22 @@ static INPUT_PORTS_START( blswhstl ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* VBLANK? OBJMPX? */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* EEPROM */ + PORT_START_TAG("EEPROM") /* EEPROM */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM status? - always 1 */ PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNKNOWN ) INPUT_PORTS_END static INPUT_PORTS_START( glfgreat ) - PORT_START /* IN0 */ + PORT_START_TAG("P1/P2") /* IN0 */ KONAMI_PLAYERS_INPUT_LSB( 1, IPT_BUTTON3, IPT_BUTTON4 ) PORT_PLAYER(1) KONAMI_PLAYERS_INPUT_MSB( 2, IPT_BUTTON3, IPT_BUTTON4 ) PORT_PLAYER(2) - PORT_START /* IN1 */ + PORT_START_TAG("P3/P4") /* IN1 */ KONAMI_PLAYERS_INPUT_LSB( 3, IPT_BUTTON3, IPT_BUTTON4 ) PORT_PLAYER(3) KONAMI_PLAYERS_INPUT_MSB( 4, IPT_BUTTON3, IPT_BUTTON4 ) PORT_PLAYER(4) - PORT_START + PORT_START_TAG("DSW1/DSW2") PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x0005, DEF_STR( 3C_1C ) ) @@ -2030,7 +2033,7 @@ static INPUT_PORTS_START( glfgreat ) PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("COINS/DSW3") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 ) @@ -2059,13 +2062,13 @@ static INPUT_PORTS_START( glfgreat ) INPUT_PORTS_END static INPUT_PORTS_START( ssriders ) - PORT_START /* IN0 */ + PORT_START_TAG("P1") /* IN0 */ KONAMI_PLAYERS_INPUT_LSB( 1, IPT_UNKNOWN, IPT_START1 ) - PORT_START /* IN1 */ + PORT_START_TAG("P2") /* IN1 */ KONAMI_PLAYERS_INPUT_LSB( 2, IPT_UNKNOWN, IPT_START2 ) - PORT_START /* COIN */ + PORT_START_TAG("COINS") /* COIN */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -2075,7 +2078,7 @@ static INPUT_PORTS_START( ssriders ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* EEPROM and service */ + PORT_START_TAG("EEPROM") /* EEPROM and service */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM status? - always 1 */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* ?? TMNT2: OBJMPX */ @@ -2083,16 +2086,22 @@ static INPUT_PORTS_START( ssriders ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* ?? TMNT2: IPL0 */ PORT_BIT( 0x60, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */ PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) + + PORT_START_TAG("P3") /* IN2 */ + PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("P4") /* IN3 */ + PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END static INPUT_PORTS_START( ssridr4p ) - PORT_START /* IN0 */ + PORT_START_TAG("P1") /* IN0 */ KONAMI_PLAYERS_INPUT_LSB( 1, IPT_UNKNOWN, IPT_UNKNOWN ) - PORT_START /* IN1 */ + PORT_START_TAG("P2") /* IN1 */ KONAMI_PLAYERS_INPUT_LSB( 2, IPT_UNKNOWN, IPT_UNKNOWN ) - PORT_START /* COIN */ + PORT_START_TAG("COINS") /* COIN */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) @@ -2102,7 +2111,7 @@ static INPUT_PORTS_START( ssridr4p ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE4 ) - PORT_START /* EEPROM and service */ + PORT_START_TAG("EEPROM") /* EEPROM and service */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM status? - always 1 */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* ?? TMNT2: OBJMPX */ @@ -2111,23 +2120,23 @@ static INPUT_PORTS_START( ssridr4p ) PORT_BIT( 0x60, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */ PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) - PORT_START /* IN2 */ + PORT_START_TAG("P3") /* IN2 */ KONAMI_PLAYERS_INPUT_LSB( 3, IPT_UNKNOWN, IPT_UNKNOWN ) - PORT_START /* IN3 */ + PORT_START_TAG("P4") /* IN3 */ KONAMI_PLAYERS_INPUT_LSB( 4, IPT_UNKNOWN, IPT_UNKNOWN ) INPUT_PORTS_END /* Same as 'ssridr4p', but additional Start button for each player. COIN3, COIN4, SERVICE3 and SERVICE4 only have an effect in the "test mode". */ static INPUT_PORTS_START( ssrid4ps ) - PORT_START /* IN0 */ + PORT_START_TAG("P1") /* IN0 */ KONAMI_PLAYERS_INPUT_LSB( 1, IPT_UNKNOWN, IPT_START1 ) - PORT_START /* IN1 */ + PORT_START_TAG("P2") /* IN1 */ KONAMI_PLAYERS_INPUT_LSB( 2, IPT_UNKNOWN, IPT_START2 ) - PORT_START /* COIN */ + PORT_START_TAG("COINS") /* COIN */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) @@ -2137,7 +2146,7 @@ static INPUT_PORTS_START( ssrid4ps ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE4 ) - PORT_START /* EEPROM and service */ + PORT_START_TAG("EEPROM") /* EEPROM and service */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM status? - always 1 */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* ?? TMNT2: OBJMPX */ @@ -2146,22 +2155,22 @@ static INPUT_PORTS_START( ssrid4ps ) PORT_BIT( 0x60, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */ PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) - PORT_START /* IN2 */ + PORT_START_TAG("P3") /* IN2 */ KONAMI_PLAYERS_INPUT_LSB( 3, IPT_UNKNOWN, IPT_START3 ) - PORT_START /* IN3 */ + PORT_START_TAG("P4") /* IN3 */ KONAMI_PLAYERS_INPUT_LSB( 4, IPT_UNKNOWN, IPT_START4 ) INPUT_PORTS_END /* Version for the bootleg, which has the service switch a little different */ static INPUT_PORTS_START( sunsetbl ) - PORT_START /* IN0 */ + PORT_START_TAG("P1") /* IN0 */ KONAMI_PLAYERS_INPUT_LSB( 1, IPT_UNKNOWN, IPT_START1 ) - PORT_START /* IN1 */ + PORT_START_TAG("P2") /* IN1 */ KONAMI_PLAYERS_INPUT_LSB( 2, IPT_UNKNOWN, IPT_START2 ) - PORT_START /* COIN */ + PORT_START_TAG("COINS") /* COIN */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) @@ -2171,7 +2180,7 @@ static INPUT_PORTS_START( sunsetbl ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE4 ) - PORT_START /* EEPROM and service */ + PORT_START_TAG("EEPROM") /* EEPROM and service */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM status? - always 1 */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -2180,15 +2189,15 @@ static INPUT_PORTS_START( sunsetbl ) PORT_BIT( 0x60, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */ PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) - PORT_START /* IN2 */ + PORT_START_TAG("P3") /* IN2 */ KONAMI_PLAYERS_INPUT_LSB( 3, IPT_UNKNOWN, IPT_START3 ) - PORT_START /* IN3 */ + PORT_START_TAG("P4") /* IN3 */ KONAMI_PLAYERS_INPUT_LSB( 4, IPT_UNKNOWN, IPT_START4 ) INPUT_PORTS_END static INPUT_PORTS_START( qgakumon ) - PORT_START /* IN0 */ + PORT_START_TAG("P1") /* IN0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) // Joystick control : Left PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) // Joystick control : Right PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) // Joystick control : Up @@ -2198,7 +2207,7 @@ static INPUT_PORTS_START( qgakumon ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START /* IN1 */ + PORT_START_TAG("P2") /* IN1 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) // Joystick control : Left PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) // Joystick control : Right PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) // Joystick control : Up @@ -2208,7 +2217,7 @@ static INPUT_PORTS_START( qgakumon ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START /* COIN */ + PORT_START_TAG("COINS") /* COIN */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -2218,7 +2227,7 @@ static INPUT_PORTS_START( qgakumon ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* EEPROM and service */ + PORT_START_TAG("EEPROM") /* EEPROM and service */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM status? - always 1 */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* ?? TMNT2: OBJMPX */ @@ -2226,10 +2235,16 @@ static INPUT_PORTS_START( qgakumon ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* ?? TMNT2: IPL0 */ PORT_BIT( 0x60, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused? */ PORT_SERVICE_NO_TOGGLE( 0x80, IP_ACTIVE_LOW ) + + PORT_START_TAG("P3") /* IN2 */ + PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START_TAG("P4") /* IN3 */ + PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END static INPUT_PORTS_START( thndrx2 ) - PORT_START + PORT_START_TAG("P1/COINS") KONAMI_PLAYERS_INPUT_LSB( 1, IPT_UNKNOWN, IPT_START1 ) PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN2 ) @@ -2240,7 +2255,7 @@ static INPUT_PORTS_START( thndrx2 ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* EEPROM and service */ + PORT_START_TAG("P2/EEPROM") /* EEPROM and service */ KONAMI_PLAYERS_INPUT_LSB( 2, IPT_UNKNOWN, IPT_START2 ) PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */ PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM status? - always 1 */ @@ -2253,7 +2268,7 @@ static INPUT_PORTS_START( thndrx2 ) INPUT_PORTS_END static INPUT_PORTS_START( prmrsocr ) - PORT_START + PORT_START_TAG("P1/COINS") KONAMI_PLAYERS_INPUT_LSB( 1, IPT_UNKNOWN, IPT_START1 ) PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_SERVICE_NO_TOGGLE( 0x0200, IP_ACTIVE_LOW ) @@ -2272,7 +2287,7 @@ static INPUT_PORTS_START( prmrsocr ) PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("P2/EEPROM") KONAMI_PLAYERS_INPUT_LSB( 2, IPT_UNKNOWN, IPT_START2 ) PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */ PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM status? - always 1 */ diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c index ad5a323b3df..fa716debb73 100644 --- a/src/mame/drivers/tnzs.c +++ b/src/mame/drivers/tnzs.c @@ -247,6 +247,7 @@ Driver by Takahiro Nogi (nogi@kt.rim.or.jp) 1999/11/06 #include "driver.h" #include "deprecat.h" +#include "taitoipt.h" #include "cpu/i8x41/i8x41.h" #include "sound/2203intf.h" #include "sound/dac.h" @@ -444,9 +445,9 @@ static ADDRESS_MAP_START( kageki_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_BANK2) AM_RANGE(0xb000, 0xb000) AM_READ(YM2203_status_port_0_r) AM_RANGE(0xb001, 0xb001) AM_READ(YM2203_read_port_0_r) - AM_RANGE(0xc000, 0xc000) AM_READ(input_port_2_r) - AM_RANGE(0xc001, 0xc001) AM_READ(input_port_3_r) - AM_RANGE(0xc002, 0xc002) AM_READ(input_port_4_r) + AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN0") + AM_RANGE(0xc001, 0xc001) AM_READ_PORT("IN1") + AM_RANGE(0xc002, 0xc002) AM_READ_PORT("IN2") AM_RANGE(0xd000, 0xdfff) AM_READ(SMH_RAM) AM_RANGE(0xe000, 0xefff) AM_READ(tnzs_sharedram_r) ADDRESS_MAP_END @@ -472,12 +473,12 @@ static ADDRESS_MAP_START( tnzsb_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(2) AM_RANGE(0xa000, 0xa000) AM_WRITE(tnzs_bankswitch1_w) - AM_RANGE(0xb002, 0xb002) AM_READ(input_port_0_r) - AM_RANGE(0xb003, 0xb003) AM_READ(input_port_1_r) + AM_RANGE(0xb002, 0xb002) AM_READ_PORT("DSWA") + AM_RANGE(0xb003, 0xb003) AM_READ_PORT("DSWB") AM_RANGE(0xb004, 0xb004) AM_WRITE(tnzsb_sound_command_w) - AM_RANGE(0xc000, 0xc000) AM_READ(input_port_2_r) - AM_RANGE(0xc001, 0xc001) AM_READ(input_port_3_r) - AM_RANGE(0xc002, 0xc002) AM_READ(input_port_4_r) + AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN0") + AM_RANGE(0xc001, 0xc001) AM_READ_PORT("IN1") + AM_RANGE(0xc002, 0xc002) AM_READ_PORT("IN2") AM_RANGE(0xd000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xefff) AM_READWRITE(tnzs_sharedram_r, tnzs_sharedram_w) AM_RANGE(0xf000, 0xf003) AM_READ(SMH_RAM) @@ -488,12 +489,12 @@ static ADDRESS_MAP_START( kabukiz_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(2) AM_RANGE(0xa000, 0xa000) AM_WRITE(tnzs_bankswitch1_w) - AM_RANGE(0xb002, 0xb002) AM_READ(input_port_0_r) - AM_RANGE(0xb003, 0xb003) AM_READ(input_port_1_r) + AM_RANGE(0xb002, 0xb002) AM_READ_PORT("DSWA") + AM_RANGE(0xb003, 0xb003) AM_READ_PORT("DSWB") AM_RANGE(0xb004, 0xb004) AM_WRITE(tnzsb_sound_command_w) - AM_RANGE(0xc000, 0xc000) AM_READ(input_port_2_r) - AM_RANGE(0xc001, 0xc001) AM_READ(input_port_3_r) - AM_RANGE(0xc002, 0xc002) AM_READ(input_port_4_r) + AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN0") + AM_RANGE(0xc001, 0xc001) AM_READ_PORT("IN1") + AM_RANGE(0xc002, 0xc002) AM_READ_PORT("IN2") AM_RANGE(0xd000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xefff) AM_READWRITE(tnzs_sharedram_r, tnzs_sharedram_w) AM_RANGE(0xf800, 0xfbff) AM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_BASE(&paletteram) @@ -536,8 +537,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( i8742_readport, ADDRESS_SPACE_IO, 8 ) AM_RANGE(I8X41_p1, I8X41_p1) AM_READ(tnzs_port1_r) AM_RANGE(I8X41_p2, I8X41_p2) AM_READ(tnzs_port2_r) - AM_RANGE(I8X41_t0, I8X41_t0) AM_READ(input_port_5_r) - AM_RANGE(I8X41_t1, I8X41_t1) AM_READ(input_port_6_r) + AM_RANGE(I8X41_t0, I8X41_t0) AM_READ_PORT("COIN1") + AM_RANGE(I8X41_t1, I8X41_t1) AM_READ_PORT("COIN2") ADDRESS_MAP_END static ADDRESS_MAP_START( i8742_writeport, ADDRESS_SPACE_IO, 8 ) @@ -602,12 +603,12 @@ static ADDRESS_MAP_START( jpopnics_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x9fff) AM_READWRITE(SMH_BANK2, SMH_ROM) AM_RANGE(0xa000, 0xa000) AM_WRITE(jpopnics_subbankswitch_w) - AM_RANGE(0xb000, 0xb000) AM_READ(input_port_0_r) AM_WRITE(YM2151_register_port_0_w) + AM_RANGE(0xb000, 0xb000) AM_READ_PORT("IN0") AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0xb001, 0xb001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w) - AM_RANGE(0xc000, 0xc000) AM_READ(input_port_1_r) - AM_RANGE(0xc001, 0xc001) AM_READ(input_port_2_r) - AM_RANGE(0xc600, 0xc600) AM_READ(input_port_3_r) - AM_RANGE(0xc601, 0xc601) AM_READ(input_port_4_r) + AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN1") + AM_RANGE(0xc001, 0xc001) AM_READ_PORT("IN2") + AM_RANGE(0xc600, 0xc600) AM_READ_PORT("DSWA") + AM_RANGE(0xc601, 0xc601) AM_READ_PORT("DSWB") AM_RANGE(0xd000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xefff) AM_RAM AM_SHARE(1) @@ -615,16 +616,6 @@ static ADDRESS_MAP_START( jpopnics_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf000, 0xf003) AM_READ(arknoid2_sh_f000_r) ADDRESS_MAP_END -#define TNZS_PLAYER_INPUT(_n_)\ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(_n_)\ - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(_n_)\ - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(_n_)\ - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(_n_)\ - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(_n_)\ - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(_n_)\ - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )\ - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START##_n_ ) - #define COMMON_IN2\ PORT_START_TAG("IN2")\ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )\ @@ -646,30 +637,6 @@ ADDRESS_MAP_END PORT_BIT( 0x01, coinstate, IPT_COIN2 )\ PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNUSED ) -#define TAITO_COINAGE_JAPAN_8\ - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) )\ - PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) )\ - PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) )\ - PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) )\ - PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) )\ - PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_B ) )\ - PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) )\ - PORT_DIPSETTING( 0xc0, DEF_STR( 1C_1C ) )\ - PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) )\ - PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) ) - -#define TAITO_COINAGE_WORLD_8\ - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Coin_A ) )\ - PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )\ - PORT_DIPSETTING( 0x10, DEF_STR( 3C_1C ) )\ - PORT_DIPSETTING( 0x20, DEF_STR( 2C_1C ) )\ - PORT_DIPSETTING( 0x30, DEF_STR( 1C_1C ) )\ - PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Coin_B ) )\ - PORT_DIPSETTING( 0xc0, DEF_STR( 1C_2C ) )\ - PORT_DIPSETTING( 0x80, DEF_STR( 1C_3C ) )\ - PORT_DIPSETTING( 0x40, DEF_STR( 1C_4C ) )\ - PORT_DIPSETTING( 0x00, DEF_STR( 1C_6C ) ) - static INPUT_PORTS_START( extrmatn ) PORT_START_TAG("DSWA") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) @@ -682,7 +649,7 @@ static INPUT_PORTS_START( extrmatn ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unused ) ) PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_8 + TAITO_COINAGE_JAPAN_OLD PORT_START_TAG("DSWB") PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) @@ -709,63 +676,16 @@ static INPUT_PORTS_START( extrmatn ) PORT_DIPSETTING( 0x00, "*3" ) PORT_START_TAG("IN0") - TNZS_PLAYER_INPUT(1) - + TAITO_JOY_LRUD_2_BUTTONS_START( 1 ) PORT_START_TAG("IN1") - TNZS_PLAYER_INPUT(2) + TAITO_JOY_LRUD_2_BUTTONS_START( 2 ) COMMON_IN2 COMMON_COIN1(IP_ACTIVE_HIGH) COMMON_COIN2(IP_ACTIVE_HIGH) INPUT_PORTS_END -#define ARKNOI2_COMMON\ - PORT_START_TAG("DSWB")\ - PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )\ - PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )\ - PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )\ - PORT_DIPSETTING( 0x01, DEF_STR( Hard ) )\ - PORT_DIPSETTING( 0x00, DEF_STR( Very_Hard ) )\ - PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) )\ - PORT_DIPSETTING( 0x00, "50k 150k" )\ - PORT_DIPSETTING( 0x0c, "100k 200k" )\ - PORT_DIPSETTING( 0x04, "50k Only" )\ - PORT_DIPSETTING( 0x08, "100k Only" )\ - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Lives ) )\ - PORT_DIPSETTING( 0x20, "2" )\ - PORT_DIPSETTING( 0x30, "3" )\ - PORT_DIPSETTING( 0x10, "4" )\ - PORT_DIPSETTING( 0x00, "5" )\ - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )\ - PORT_DIPSETTING( 0x40, DEF_STR( Off ) )\ - PORT_DIPSETTING( 0x00, DEF_STR( On ) )\ - PORT_DIPNAME( 0x80, 0x00, DEF_STR( Allow_Continue ) )\ - PORT_DIPSETTING( 0x80, DEF_STR( No ) )\ - PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )\ - PORT_START_TAG("IN1") /* read at c000 (sound cpu) */\ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)\ - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )\ - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )\ - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 )\ - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )\ - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )\ - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )\ - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )\ - PORT_START_TAG("EMPTY")\ - COMMON_IN2\ - COMMON_COIN1(IP_ACTIVE_HIGH)\ - COMMON_COIN2(IP_ACTIVE_HIGH)\ - PORT_START_TAG("AN1") /* spinner 1 - read at f000/1 */\ - PORT_BIT ( 0x0fff, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(70) PORT_KEYDELTA(15)\ - PORT_BIT ( 0x1000, IP_ACTIVE_LOW, IPT_COIN2 ) /* Mirrored for service mode */\ - PORT_BIT ( 0x2000, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* Mirrored for service mode */\ - PORT_BIT ( 0x4000, IP_ACTIVE_LOW, IPT_COIN1 ) /* Mirrored for service mode */\ - PORT_BIT ( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )\ - PORT_START_TAG("AN2") /* spinner 2 - read at f002/3 */\ - PORT_BIT ( 0x0fff, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(70) PORT_KEYDELTA(15) PORT_PLAYER(2)\ - PORT_BIT ( 0xf000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - static INPUT_PORTS_START( arknoid2 ) PORT_START_TAG("DSWA") PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) @@ -778,24 +698,65 @@ static INPUT_PORTS_START( arknoid2 ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_WORLD_8 - ARKNOI2_COMMON + TAITO_COINAGE_WORLD + + PORT_START_TAG("DSWB") + PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) + PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) + PORT_DIPSETTING( 0x03, DEF_STR( Normal ) ) + PORT_DIPSETTING( 0x01, DEF_STR( Hard ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Very_Hard ) ) + PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) + PORT_DIPSETTING( 0x00, "50k 150k" ) + PORT_DIPSETTING( 0x0c, "100k 200k" ) + PORT_DIPSETTING( 0x04, "50k Only" ) + PORT_DIPSETTING( 0x08, "100k Only" ) + PORT_DIPNAME( 0x30, 0x30, DEF_STR( Lives ) ) + PORT_DIPSETTING( 0x20, "2" ) + PORT_DIPSETTING( 0x30, "3" ) + PORT_DIPSETTING( 0x10, "4" ) + PORT_DIPSETTING( 0x00, "5" ) + PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x80, 0x00, DEF_STR( Allow_Continue ) ) + PORT_DIPSETTING( 0x80, DEF_STR( No ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) + + PORT_START_TAG("IN0") /* read at c000 (sound cpu) */ + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) + + PORT_START_TAG("IN1") + PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) + + COMMON_IN2 + COMMON_COIN1(IP_ACTIVE_HIGH) + COMMON_COIN2(IP_ACTIVE_HIGH) + + PORT_START_TAG("AN1") /* spinner 1 - read at f000/1 */\ + PORT_BIT ( 0x0fff, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(70) PORT_KEYDELTA(15)\ + PORT_BIT ( 0x1000, IP_ACTIVE_LOW, IPT_COIN2 ) /* Mirrored for service mode */\ + PORT_BIT ( 0x2000, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* Mirrored for service mode */\ + PORT_BIT ( 0x4000, IP_ACTIVE_LOW, IPT_COIN1 ) /* Mirrored for service mode */\ + PORT_BIT ( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN )\ + + PORT_START_TAG("AN2") /* spinner 2 - read at f002/3 */\ + PORT_BIT ( 0x0fff, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(70) PORT_KEYDELTA(15) PORT_PLAYER(2)\ + PORT_BIT ( 0xf000, IP_ACTIVE_LOW, IPT_UNKNOWN ) INPUT_PORTS_END static INPUT_PORTS_START( arknid2u ) - PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) ) - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_8 - ARKNOI2_COMMON + PORT_INCLUDE( arknoid2 ) + + PORT_MODIFY("DSWA") + TAITO_COINAGE_JAPAN_OLD INPUT_PORTS_END static INPUT_PORTS_START( plumppop ) @@ -810,7 +771,7 @@ static INPUT_PORTS_START( plumppop ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_8 + TAITO_COINAGE_JAPAN_OLD PORT_START_TAG("DSWB") PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) @@ -877,25 +838,24 @@ INPUT_PORTS_END static INPUT_PORTS_START( jpopnics ) - PORT_START + PORT_START_TAG("IN0") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START + PORT_START_TAG("IN1") PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Button 2 (Cheat)") PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - - PORT_START + PORT_START_TAG("IN2") PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P2 Button 2 (Cheat)") PORT_PLAYER(2) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START + PORT_START_TAG("DSWA") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -906,9 +866,9 @@ static INPUT_PORTS_START( jpopnics ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_8 + TAITO_COINAGE_JAPAN_OLD - PORT_START + PORT_START_TAG("DSWB") PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x03, DEF_STR( Medium ) ) @@ -931,9 +891,11 @@ static INPUT_PORTS_START( jpopnics ) PORT_DIPSETTING( 0x00, DEF_STR( No ) ) PORT_DIPSETTING( 0x80, DEF_STR( Yes ) ) - PORT_START - PORT_START + PORT_START_TAG("COIN1") + PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_START_TAG("COIN2") + PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START_TAG("AN1") /* spinner 1 - read at f000/1 */ PORT_BIT( 0xffff, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(70) PORT_KEYDELTA(15) @@ -942,38 +904,6 @@ static INPUT_PORTS_START( jpopnics ) PORT_BIT( 0xffff, 0x0000, IPT_DIAL ) PORT_SENSITIVITY(70) PORT_KEYDELTA(15) PORT_PLAYER(2) INPUT_PORTS_END - -#define DRTOPP_COMMON\ - PORT_START_TAG("DSWB")\ - PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )\ - PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )\ - PORT_DIPSETTING( 0x03, DEF_STR( Medium ) )\ - PORT_DIPSETTING( 0x01, DEF_STR( Hard ) )\ - PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )\ - PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) )\ - PORT_DIPSETTING( 0x0c, "30000" )\ - PORT_DIPSETTING( 0x00, DEF_STR( Unknown ) )\ - PORT_DIPSETTING( 0x04, DEF_STR( Unknown ) )\ - PORT_DIPSETTING( 0x08, DEF_STR( Unknown ) )\ - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Lives ) )\ - PORT_DIPSETTING( 0x20, "2" )\ - PORT_DIPSETTING( 0x30, "3" )\ - PORT_DIPSETTING( 0x10, "4" )\ - PORT_DIPSETTING( 0x00, "5" )\ - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )\ - PORT_DIPSETTING( 0x40, DEF_STR( Off ) )\ - PORT_DIPSETTING( 0x00, DEF_STR( On ) )\ - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )\ - PORT_DIPSETTING( 0x80, DEF_STR( Off ) )\ - PORT_DIPSETTING( 0x00, DEF_STR( On ) )\ - PORT_START_TAG("IN0")\ - TNZS_PLAYER_INPUT(1)\ - PORT_START_TAG("IN1")\ - TNZS_PLAYER_INPUT(2)\ - COMMON_IN2\ - COMMON_COIN1(IP_ACTIVE_HIGH)\ - COMMON_COIN2(IP_ACTIVE_HIGH) - static INPUT_PORTS_START( drtoppel ) PORT_START_TAG("DSWA") PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) @@ -986,56 +916,48 @@ static INPUT_PORTS_START( drtoppel ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_WORLD_8 - DRTOPP_COMMON -INPUT_PORTS_END + TAITO_COINAGE_WORLD -static INPUT_PORTS_START( drtopplu ) - PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) ) - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) + PORT_START_TAG("DSWB") + PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) + PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) + PORT_DIPSETTING( 0x03, DEF_STR( Medium ) ) + PORT_DIPSETTING( 0x01, DEF_STR( Hard ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) + PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) + PORT_DIPSETTING( 0x0c, "30000" ) + PORT_DIPSETTING( 0x00, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x04, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x08, DEF_STR( Unknown ) ) + PORT_DIPNAME( 0x30, 0x30, DEF_STR( Lives ) ) + PORT_DIPSETTING( 0x20, "2" ) + PORT_DIPSETTING( 0x30, "3" ) + PORT_DIPSETTING( 0x10, "4" ) + PORT_DIPSETTING( 0x00, "5" ) + PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_8 - DRTOPP_COMMON -INPUT_PORTS_END + PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + + PORT_START_TAG("IN0") + TAITO_JOY_LRUD_2_BUTTONS_START( 1 ) -#define CHUKA_COMMON\ - PORT_START_TAG("DSWB")\ - PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )\ - PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )\ - PORT_DIPSETTING( 0x03, DEF_STR( Medium ) )\ - PORT_DIPSETTING( 0x01, DEF_STR( Hard ) )\ - PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )\ - PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) )\ - PORT_DIPSETTING( 0x08, "100k 300k 440k" )\ - PORT_DIPSETTING( 0x00, "100k 300k 500k" )\ - PORT_DIPSETTING( 0x0c, "100k 400k" )\ - PORT_DIPSETTING( 0x04, "100k 500k" )\ - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Lives ) )\ - PORT_DIPSETTING( 0x00, "1" )\ - PORT_DIPSETTING( 0x10, "2" )\ - PORT_DIPSETTING( 0x30, "3" )\ - PORT_DIPSETTING( 0x20, "4" )\ - PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )\ - PORT_DIPSETTING( 0x40, DEF_STR( Off ) )\ - PORT_DIPSETTING( 0x00, DEF_STR( On ) )\ - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )\ - PORT_DIPSETTING( 0x80, DEF_STR( Off ) )\ - PORT_DIPSETTING( 0x00, DEF_STR( On ) )\ - PORT_START_TAG("IN0")\ - TNZS_PLAYER_INPUT(1)\ - PORT_START_TAG("IN1")\ - TNZS_PLAYER_INPUT(2)\ - COMMON_IN2\ - COMMON_COIN1(IP_ACTIVE_HIGH)\ + PORT_START_TAG("IN1") + TAITO_JOY_LRUD_2_BUTTONS_START( 2 ) + + COMMON_IN2 + COMMON_COIN1(IP_ACTIVE_HIGH) COMMON_COIN2(IP_ACTIVE_HIGH) +INPUT_PORTS_END + +static INPUT_PORTS_START( drtopplu ) + PORT_INCLUDE( drtoppel ) + + PORT_MODIFY("DSWA") + TAITO_COINAGE_JAPAN_OLD +INPUT_PORTS_END static INPUT_PORTS_START( chukatai ) PORT_START_TAG("DSWA") @@ -1049,53 +971,48 @@ static INPUT_PORTS_START( chukatai ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_WORLD_8 - - CHUKA_COMMON -INPUT_PORTS_END + TAITO_COINAGE_WORLD -static INPUT_PORTS_START( chukatau ) - PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) ) - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) + PORT_START_TAG("DSWB") + PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) + PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) + PORT_DIPSETTING( 0x03, DEF_STR( Medium ) ) + PORT_DIPSETTING( 0x01, DEF_STR( Hard ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) + PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) + PORT_DIPSETTING( 0x08, "100k 300k 440k" ) + PORT_DIPSETTING( 0x00, "100k 300k 500k" ) + PORT_DIPSETTING( 0x0c, "100k 400k" ) + PORT_DIPSETTING( 0x04, "100k 500k" ) + PORT_DIPNAME( 0x30, 0x30, DEF_STR( Lives ) ) + PORT_DIPSETTING( 0x00, "1" ) + PORT_DIPSETTING( 0x10, "2" ) + PORT_DIPSETTING( 0x30, "3" ) + PORT_DIPSETTING( 0x20, "4" ) + PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_8 - CHUKA_COMMON + PORT_START_TAG("IN0") + TAITO_JOY_LRUD_2_BUTTONS_START( 1 ) + + PORT_START_TAG("IN1") + TAITO_JOY_LRUD_2_BUTTONS_START( 2 ) + + COMMON_IN2 + COMMON_COIN1(IP_ACTIVE_HIGH) + COMMON_COIN2(IP_ACTIVE_HIGH) INPUT_PORTS_END -#define TNZS_COMMON\ - PORT_START_TAG("DSWB")\ - PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )\ - PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )\ - PORT_DIPSETTING( 0x03, DEF_STR( Medium ) )\ - PORT_DIPSETTING( 0x01, DEF_STR( Hard ) )\ - PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )\ - PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) )\ - PORT_DIPSETTING( 0x00, "50000 150000" )\ - PORT_DIPSETTING( 0x0c, "70000 200000" )\ - PORT_DIPSETTING( 0x04, "100000 250000" )\ - PORT_DIPSETTING( 0x08, "200000 300000" )\ - 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( Allow_Continue ) )\ - PORT_DIPSETTING( 0x00, DEF_STR( No ) )\ - PORT_DIPSETTING( 0x40, DEF_STR( Yes ) )\ - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )\ - PORT_DIPSETTING( 0x80, DEF_STR( Off ) )\ - PORT_DIPSETTING( 0x00, DEF_STR( On ) )\ - PORT_START_TAG("IN0")\ - TNZS_PLAYER_INPUT(1) +static INPUT_PORTS_START( chukatau ) + PORT_INCLUDE( chukatai ) + + PORT_MODIFY("DSWA") + TAITO_COINAGE_JAPAN_OLD +INPUT_PORTS_END static INPUT_PORTS_START( tnzs ) PORT_START_TAG("DSWA") @@ -1109,36 +1026,49 @@ static INPUT_PORTS_START( tnzs ) PORT_DIPNAME( 0x08, 0x08, "Invulnerability (Debug)" ) // see notes PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_8 + TAITO_COINAGE_JAPAN_OLD - TNZS_COMMON + PORT_START_TAG("DSWB") + PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) + PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) + PORT_DIPSETTING( 0x03, DEF_STR( Medium ) ) + PORT_DIPSETTING( 0x01, DEF_STR( Hard ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) + PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) + PORT_DIPSETTING( 0x00, "50000 150000" ) + PORT_DIPSETTING( 0x0c, "70000 200000" ) + PORT_DIPSETTING( 0x04, "100000 250000" ) + PORT_DIPSETTING( 0x08, "200000 300000" ) + 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( Allow_Continue ) ) + PORT_DIPSETTING( 0x00, DEF_STR( No ) ) + PORT_DIPSETTING( 0x40, DEF_STR( Yes ) ) + PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + + PORT_START_TAG("IN0") + TAITO_JOY_LRUD_2_BUTTONS_START( 1 ) PORT_START_TAG("IN1") - TNZS_PLAYER_INPUT(2) + TAITO_JOY_LRUD_2_BUTTONS_START( 2 ) COMMON_IN2 COMMON_COIN1(IP_ACTIVE_LOW) COMMON_COIN2(IP_ACTIVE_LOW) - INPUT_PORTS_END static INPUT_PORTS_START( tnzsb ) - PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) ) - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x08, 0x08, "Invulnerability (Debug)" ) // see notes - PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - TAITO_COINAGE_WORLD_8 + PORT_INCLUDE( tnzs ) - TNZS_COMMON + PORT_MODIFY("DSWA") + TAITO_COINAGE_WORLD - PORT_START_TAG("IN1") + PORT_MODIFY("IN1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_COCKTAIL @@ -1148,64 +1078,32 @@ static INPUT_PORTS_START( tnzsb ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2) - PORT_START_TAG("IN2") - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_TILT ) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_MODIFY("IN2") PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_MODIFY("COIN1") /* not present in the bootleg */ + PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_MODIFY("COIN2") /* not present in the bootleg */ + PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END static INPUT_PORTS_START( tnzs2 ) - PORT_START_TAG("DSWA") - PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) ) - PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_SERVICE( 0x04, IP_ACTIVE_LOW ) + PORT_INCLUDE( tnzs ) + + PORT_MODIFY("DSWA") PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - TAITO_COINAGE_WORLD_8 + TAITO_COINAGE_WORLD - PORT_START_TAG("DSWB") - PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Easy ) ) - PORT_DIPSETTING( 0x03, DEF_STR( Medium ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Hard ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) ) + PORT_MODIFY("DSWB") PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPSETTING( 0x00, "10000 100000" ) PORT_DIPSETTING( 0x0c, "10000 150000" ) PORT_DIPSETTING( 0x08, "10000 200000" ) PORT_DIPSETTING( 0x04, "10000 300000" ) - 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( Allow_Continue ) ) - PORT_DIPSETTING( 0x00, DEF_STR( No ) ) - PORT_DIPSETTING( 0x40, DEF_STR( Yes ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - - PORT_START_TAG("IN0") - TNZS_PLAYER_INPUT(1) - - PORT_START_TAG("IN1") - TNZS_PLAYER_INPUT(2) - - COMMON_IN2 - COMMON_COIN1(IP_ACTIVE_LOW) - COMMON_COIN2(IP_ACTIVE_LOW) INPUT_PORTS_END static INPUT_PORTS_START( kabukiz ) @@ -1245,10 +1143,10 @@ static INPUT_PORTS_START( kabukiz ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_8 + TAITO_COINAGE_JAPAN_OLD PORT_START_TAG("IN0") - TNZS_PLAYER_INPUT(1) + TAITO_JOY_LRUD_2_BUTTONS_START( 1 ) PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_COCKTAIL @@ -1284,7 +1182,7 @@ static INPUT_PORTS_START( insectx ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_WORLD_8 + TAITO_COINAGE_WORLD PORT_START_TAG("DSWB") PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) @@ -1310,9 +1208,10 @@ static INPUT_PORTS_START( insectx ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START_TAG("IN0") - TNZS_PLAYER_INPUT(1) + TAITO_JOY_LRUD_2_BUTTONS_START( 1 ) + PORT_START_TAG("IN1") - TNZS_PLAYER_INPUT(2) + TAITO_JOY_LRUD_2_BUTTONS_START( 2 ) PORT_START_TAG("IN2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -1337,7 +1236,7 @@ static INPUT_PORTS_START( kageki ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - TAITO_COINAGE_JAPAN_8 + TAITO_COINAGE_JAPAN_OLD PORT_START_TAG("DSWB") PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) @@ -1365,9 +1264,10 @@ static INPUT_PORTS_START( kageki ) PORT_DIPSETTING( 0x80, DEF_STR( Yes ) ) PORT_START_TAG("IN0") - TNZS_PLAYER_INPUT(1) + TAITO_JOY_LRUD_2_BUTTONS_START( 1 ) + PORT_START_TAG("IN1") - TNZS_PLAYER_INPUT(2) + TAITO_JOY_LRUD_2_BUTTONS_START( 2 ) PORT_START_TAG("IN2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c index dd43f45f948..4a78e483a2e 100644 --- a/src/mame/drivers/toaplan1.c +++ b/src/mame/drivers/toaplan1.c @@ -79,7 +79,7 @@ static ADDRESS_MAP_START( rallybik_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100002, 0x100003) AM_READWRITE(toaplan1_tileram_offs_r, toaplan1_tileram_offs_w) AM_RANGE(0x100004, 0x100007) AM_READWRITE(rallybik_tileram16_r, toaplan1_tileram16_w) AM_RANGE(0x100010, 0x10001f) AM_READWRITE(toaplan1_scroll_regs_r, toaplan1_scroll_regs_w) - AM_RANGE(0x140000, 0x140001) AM_READ(input_port_0_word_r) + AM_RANGE(0x140000, 0x140001) AM_READ_PORT("VBLANK") // AM_RANGE(0x140000, 0x140001) AM_WRITE(?? video frame related ??) AM_RANGE(0x140002, 0x140003) AM_WRITE(toaplan1_intenable_w) AM_RANGE(0x140008, 0x14000f) AM_WRITE(toaplan1_bcu_control_w) @@ -101,7 +101,7 @@ static ADDRESS_MAP_START( truxton_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100002, 0x100003) AM_READWRITE(toaplan1_tileram_offs_r, toaplan1_tileram_offs_w) AM_RANGE(0x100004, 0x100007) AM_READWRITE(toaplan1_tileram16_r, toaplan1_tileram16_w) AM_RANGE(0x100010, 0x10001f) AM_READWRITE(toaplan1_scroll_regs_r, toaplan1_scroll_regs_w) - AM_RANGE(0x140000, 0x140001) AM_READ(input_port_0_word_r) + AM_RANGE(0x140000, 0x140001) AM_READ_PORT("VBLANK") // AM_RANGE(0x140000, 0x140001) AM_WRITE(?? video frame related ??) AM_RANGE(0x140002, 0x140003) AM_WRITE(toaplan1_intenable_w) AM_RANGE(0x140008, 0x14000f) AM_WRITE(toaplan1_bcu_control_w) @@ -116,7 +116,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hellfire_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_RANGE(0x040000, 0x047fff) AM_RAM - AM_RANGE(0x080000, 0x080001) AM_READ(input_port_0_word_r) + AM_RANGE(0x080000, 0x080001) AM_READ_PORT("VBLANK") // AM_RANGE(0x080000, 0x080001) AM_WRITE(?? video frame related ??) AM_RANGE(0x080002, 0x080003) AM_WRITE(toaplan1_intenable_w) AM_RANGE(0x080008, 0x08000f) AM_WRITE(toaplan1_bcu_control_w) @@ -142,7 +142,7 @@ static ADDRESS_MAP_START( zerowing_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x080000, 0x087fff) AM_RAM AM_RANGE(0x0c0000, 0x0c0003) AM_WRITE(toaplan1_tile_offsets_w) AM_RANGE(0x0c0006, 0x0c0007) AM_WRITE(toaplan1_fcu_flipscreen_w) - AM_RANGE(0x400000, 0x400001) AM_READ(input_port_0_word_r) + AM_RANGE(0x400000, 0x400001) AM_READ_PORT("VBLANK") // AM_RANGE(0x400000, 0x400001) AM_WRITE(?? video frame related ??) AM_RANGE(0x400002, 0x400003) AM_WRITE(toaplan1_intenable_w) AM_RANGE(0x400008, 0x40000f) AM_WRITE(toaplan1_bcu_control_w) @@ -161,7 +161,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( demonwld_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x03ffff) AM_ROM - AM_RANGE(0x400000, 0x400001) AM_READ(input_port_0_word_r) + AM_RANGE(0x400000, 0x400001) AM_READ_PORT("VBLANK") // AM_RANGE(0x400000, 0x400001) AM_WRITE(?? video frame related ??) AM_RANGE(0x400002, 0x400003) AM_WRITE(toaplan1_intenable_w) AM_RANGE(0x400008, 0x40000f) AM_WRITE(toaplan1_bcu_control_w) @@ -189,17 +189,17 @@ static ADDRESS_MAP_START( samesame_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x080000, 0x080003) AM_WRITE(toaplan1_tile_offsets_w) AM_RANGE(0x080006, 0x080007) AM_WRITE(toaplan1_fcu_flipscreen_w) AM_RANGE(0x0c0000, 0x0c3fff) AM_RAM /* Frame done at $c1ada */ - AM_RANGE(0x100000, 0x100001) AM_READ(input_port_0_word_r) + AM_RANGE(0x100000, 0x100001) AM_READ_PORT("VBLANK") // AM_RANGE(0x100000, 0x100001) AM_WRITE(?? video frame related ??) AM_RANGE(0x100002, 0x100003) AM_WRITE(toaplan1_intenable_w) AM_RANGE(0x100008, 0x10000f) AM_WRITE(toaplan1_bcu_control_w) AM_RANGE(0x104000, 0x1047ff) AM_READWRITE(toaplan1_colorram1_r, toaplan1_colorram1_w) AM_BASE(&toaplan1_colorram1) AM_SIZE(&toaplan1_colorram1_size) AM_RANGE(0x106000, 0x1067ff) AM_READWRITE(toaplan1_colorram2_r, toaplan1_colorram2_w) AM_BASE(&toaplan1_colorram2) AM_SIZE(&toaplan1_colorram2_size) - AM_RANGE(0x140000, 0x140001) AM_READ(input_port_1_word_r) - AM_RANGE(0x140002, 0x140003) AM_READ(input_port_2_word_r) - AM_RANGE(0x140004, 0x140005) AM_READ(input_port_3_word_r) - AM_RANGE(0x140006, 0x140007) AM_READ(input_port_4_word_r) - AM_RANGE(0x140008, 0x140009) AM_READ(input_port_5_word_r) + AM_RANGE(0x140000, 0x140001) AM_READ_PORT("P1") + AM_RANGE(0x140002, 0x140003) AM_READ_PORT("P2") + AM_RANGE(0x140004, 0x140005) AM_READ_PORT("DSWA") + AM_RANGE(0x140006, 0x140007) AM_READ_PORT("DSWB") + AM_RANGE(0x140008, 0x140009) AM_READ_PORT("SYSTEM") AM_RANGE(0x14000a, 0x14000b) AM_READ(samesame_port_6_word_r) /* Territory, and MCU ready */ AM_RANGE(0x14000c, 0x14000d) AM_WRITE(samesame_coin_w) /* Coin counter/lockout */ // AM_RANGE(0x14000e, 0x14000f) AM_WRITE(samesame_mcu_w) /* Commands sent to HD647180 */ @@ -226,7 +226,7 @@ static ADDRESS_MAP_START( outzone_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200004, 0x200007) AM_READWRITE(toaplan1_tileram16_r, toaplan1_tileram16_w) AM_RANGE(0x200010, 0x20001f) AM_READWRITE(toaplan1_scroll_regs_r, toaplan1_scroll_regs_w) AM_RANGE(0x240000, 0x243fff) AM_RAM - AM_RANGE(0x300000, 0x300001) AM_READ(input_port_0_word_r) + AM_RANGE(0x300000, 0x300001) AM_READ_PORT("VBLANK") // AM_RANGE(0x300000, 0x300001) AM_WRITE(?? video frame related ??) AM_RANGE(0x300002, 0x300003) AM_WRITE(toaplan1_intenable_w) AM_RANGE(0x300008, 0x30000f) AM_WRITE(toaplan1_bcu_control_w) @@ -244,19 +244,19 @@ static ADDRESS_MAP_START( vimana_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0c0002, 0x0c0003) AM_READWRITE(toaplan1_spriteram_offs_r, toaplan1_spriteram_offs_w) AM_RANGE(0x0c0004, 0x0c0005) AM_READWRITE(toaplan1_spriteram16_r, toaplan1_spriteram16_w) AM_RANGE(0x0c0006, 0x0c0007) AM_READWRITE(toaplan1_spritesizeram16_r, toaplan1_spritesizeram16_w) - AM_RANGE(0x400000, 0x400001) AM_READ(input_port_0_word_r) + AM_RANGE(0x400000, 0x400001) AM_READ_PORT("VBLANK") // AM_RANGE(0x400000, 0x400001) AM_WRITE(?? video frame related ??) AM_RANGE(0x400002, 0x400003) AM_WRITE(toaplan1_intenable_w) AM_RANGE(0x400008, 0x40000f) AM_WRITE(toaplan1_bcu_control_w) AM_RANGE(0x404000, 0x4047ff) AM_READWRITE(toaplan1_colorram1_r, toaplan1_colorram1_w) AM_BASE(&toaplan1_colorram1) AM_SIZE(&toaplan1_colorram1_size) AM_RANGE(0x406000, 0x4067ff) AM_READWRITE(toaplan1_colorram2_r, toaplan1_colorram2_w) AM_BASE(&toaplan1_colorram2) AM_SIZE(&toaplan1_colorram2_size) AM_RANGE(0x440000, 0x440005) AM_READWRITE(vimana_mcu_r, vimana_mcu_w) - AM_RANGE(0x440006, 0x440007) AM_READ(input_port_3_word_r) + AM_RANGE(0x440006, 0x440007) AM_READ_PORT("DSWA") AM_RANGE(0x440008, 0x440009) AM_READ(vimana_input_port_5_word_r) - AM_RANGE(0x44000a, 0x44000b) AM_READ(input_port_1_word_r) - AM_RANGE(0x44000c, 0x44000d) AM_READ(input_port_2_word_r) - AM_RANGE(0x44000e, 0x44000f) AM_READ(input_port_4_word_r) - AM_RANGE(0x440010, 0x440011) AM_READ(input_port_6_word_r) + AM_RANGE(0x44000a, 0x44000b) AM_READ_PORT("P1") + AM_RANGE(0x44000c, 0x44000d) AM_READ_PORT("P2") + AM_RANGE(0x44000e, 0x44000f) AM_READ_PORT("DSWB") + AM_RANGE(0x440010, 0x440011) AM_READ_PORT("TJUMP") AM_RANGE(0x480000, 0x487fff) AM_RAM AM_RANGE(0x4c0000, 0x4c0001) AM_WRITE(toaplan1_bcu_flipscreen_w) AM_RANGE(0x4c0002, 0x4c0003) AM_READWRITE(toaplan1_tileram_offs_r, toaplan1_tileram_offs_w) @@ -274,51 +274,51 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( rallybik_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READ(input_port_1_r) /* Player 1 */ - AM_RANGE(0x10, 0x10) AM_READ(input_port_2_r) /* Player 2 */ - AM_RANGE(0x20, 0x20) AM_READ(input_port_5_r) /* Coin/Start inputs */ + AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") + AM_RANGE(0x10, 0x10) AM_READ_PORT("P2") + AM_RANGE(0x20, 0x20) AM_READ_PORT("SYSTEM") AM_RANGE(0x30, 0x30) AM_WRITE(rallybik_coin_w) /* Coin counter/lockout */ - AM_RANGE(0x40, 0x40) AM_READ(input_port_3_r) /* DSW1 */ - AM_RANGE(0x50, 0x50) AM_READ(input_port_4_r) /* DSW2 */ + AM_RANGE(0x40, 0x40) AM_READ_PORT("DSWA") + AM_RANGE(0x50, 0x50) AM_READ_PORT("DSWB") AM_RANGE(0x60, 0x60) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w) AM_RANGE(0x61, 0x61) AM_WRITE(YM3812_write_port_0_w) - AM_RANGE(0x70, 0x70) AM_READ(input_port_6_r) /* Territory Jumper Block for Truxton */ + AM_RANGE(0x70, 0x70) AM_READ_PORT("TJUMP") ADDRESS_MAP_END static ADDRESS_MAP_START( truxton_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READ(input_port_1_r) /* Player 1 */ - AM_RANGE(0x10, 0x10) AM_READ(input_port_2_r) /* Player 2 */ - AM_RANGE(0x20, 0x20) AM_READ(input_port_5_r) /* Coin/Start inputs */ + AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") + AM_RANGE(0x10, 0x10) AM_READ_PORT("P2") + AM_RANGE(0x20, 0x20) AM_READ_PORT("SYSTEM") AM_RANGE(0x30, 0x30) AM_WRITE(toaplan1_coin_w) /* Coin counter/lockout */ - AM_RANGE(0x40, 0x40) AM_READ(input_port_3_r) /* DSW1 */ - AM_RANGE(0x50, 0x50) AM_READ(input_port_4_r) /* DSW2 */ + AM_RANGE(0x40, 0x40) AM_READ_PORT("DSWA") + AM_RANGE(0x50, 0x50) AM_READ_PORT("DSWB") AM_RANGE(0x60, 0x60) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w) AM_RANGE(0x61, 0x61) AM_WRITE(YM3812_write_port_0_w) - AM_RANGE(0x70, 0x70) AM_READ(input_port_6_r) /* Territory Jumper Block for Truxton */ + AM_RANGE(0x70, 0x70) AM_READ_PORT("TJUMP") ADDRESS_MAP_END static ADDRESS_MAP_START( hellfire_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READ(input_port_3_r) /* DSW1 */ - AM_RANGE(0x10, 0x10) AM_READ(input_port_4_r) /* DSW2 */ - AM_RANGE(0x20, 0x20) AM_READ(input_port_6_r) /* Territory Jumper Block */ + AM_RANGE(0x00, 0x00) AM_READ_PORT("DSWA") + AM_RANGE(0x10, 0x10) AM_READ_PORT("DSWB") + AM_RANGE(0x20, 0x20) AM_READ_PORT("TJUMP") AM_RANGE(0x30, 0x30) AM_WRITE(toaplan1_coin_w) /* Coin counter/lockout */ - AM_RANGE(0x40, 0x40) AM_READ(input_port_1_r) /* Player 1 */ - AM_RANGE(0x50, 0x50) AM_READ(input_port_2_r) /* Player 2 */ - AM_RANGE(0x60, 0x60) AM_READ(input_port_5_r) /* Coin/Start inputs */ + AM_RANGE(0x40, 0x40) AM_READ_PORT("P1") + AM_RANGE(0x50, 0x50) AM_READ_PORT("P2") + AM_RANGE(0x60, 0x60) AM_READ_PORT("SYSTEM") AM_RANGE(0x70, 0x70) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w) AM_RANGE(0x71, 0x71) AM_WRITE(YM3812_write_port_0_w) ADDRESS_MAP_END static ADDRESS_MAP_START( zerowing_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READ(input_port_1_r) /* Player 1 */ - AM_RANGE(0x08, 0x08) AM_READ(input_port_2_r) /* Player 2 */ - AM_RANGE(0x20, 0x20) AM_READ(input_port_3_r) /* DSW1 */ - AM_RANGE(0x28, 0x28) AM_READ(input_port_4_r) /* DSW2 */ - AM_RANGE(0x80, 0x80) AM_READ(input_port_5_r) /* Coin/Start inputs */ - AM_RANGE(0x88, 0x88) AM_READ(input_port_6_r) /* Territory Jumper Block */ + AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") + AM_RANGE(0x08, 0x08) AM_READ_PORT("P2") + AM_RANGE(0x20, 0x20) AM_READ_PORT("DSWA") + AM_RANGE(0x28, 0x28) AM_READ_PORT("DSWB") + AM_RANGE(0x80, 0x80) AM_READ_PORT("SYSTEM") + AM_RANGE(0x88, 0x88) AM_READ_PORT("TJUMP") AM_RANGE(0xa0, 0xa0) AM_WRITE(toaplan1_coin_w) /* Coin counter/lockout */ AM_RANGE(0xa8, 0xa8) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w) AM_RANGE(0xa9, 0xa9) AM_WRITE(YM3812_write_port_0_w) @@ -328,13 +328,13 @@ static ADDRESS_MAP_START( demonwld_sound_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w) AM_RANGE(0x01, 0x01) AM_WRITE(YM3812_write_port_0_w) - AM_RANGE(0x20, 0x20) AM_READ(input_port_6_r) + AM_RANGE(0x20, 0x20) AM_READ_PORT("TJUMP") AM_RANGE(0x40, 0x40) AM_WRITE(toaplan1_coin_w) /* Coin counter/lockout */ - AM_RANGE(0x60, 0x60) AM_READ(input_port_5_r) - AM_RANGE(0x80, 0x80) AM_READ(input_port_1_r) - AM_RANGE(0xa0, 0xa0) AM_READ(input_port_4_r) - AM_RANGE(0xc0, 0xc0) AM_READ(input_port_2_r) - AM_RANGE(0xe0, 0xe0) AM_READ(input_port_3_r) + AM_RANGE(0x60, 0x60) AM_READ_PORT("SYSTEM") + AM_RANGE(0x80, 0x80) AM_READ_PORT("P1") + AM_RANGE(0xa0, 0xa0) AM_READ_PORT("DSWB") + AM_RANGE(0xc0, 0xc0) AM_READ_PORT("P2") + AM_RANGE(0xe0, 0xe0) AM_READ_PORT("DSWA") ADDRESS_MAP_END static ADDRESS_MAP_START( outzone_sound_io_map, ADDRESS_SPACE_IO, 8 ) @@ -342,12 +342,12 @@ static ADDRESS_MAP_START( outzone_sound_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x00) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w) AM_RANGE(0x01, 0x01) AM_WRITE(YM3812_write_port_0_w) AM_RANGE(0x04, 0x04) AM_WRITE(toaplan1_coin_w) /* Coin counter/lockout */ - AM_RANGE(0x08, 0x08) AM_READ(input_port_3_r) - AM_RANGE(0x0c, 0x0c) AM_READ(input_port_4_r) - AM_RANGE(0x10, 0x10) AM_READ(input_port_5_r) - AM_RANGE(0x14, 0x14) AM_READ(input_port_1_r) - AM_RANGE(0x18, 0x18) AM_READ(input_port_2_r) - AM_RANGE(0x1c, 0x1c) AM_READ(input_port_6_r) + AM_RANGE(0x08, 0x08) AM_READ_PORT("DSWA") + AM_RANGE(0x0c, 0x0c) AM_READ_PORT("DSWB") + AM_RANGE(0x10, 0x10) AM_READ_PORT("SYSTEM") + AM_RANGE(0x14, 0x14) AM_READ_PORT("P1") + AM_RANGE(0x18, 0x18) AM_READ_PORT("P2") + AM_RANGE(0x1c, 0x1c) AM_READ_PORT("TJUMP") ADDRESS_MAP_END @@ -373,18 +373,17 @@ ADDRESS_MAP_END *****************************************************************************/ #define TOAPLAN1_PLAYER_INPUT( player, button3, options ) \ - PORT_START \ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(player) options PORT_8WAY \ + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(player) options PORT_8WAY \ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(player) options PORT_8WAY \ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(player) options PORT_8WAY \ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(player) options PORT_8WAY \ - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(player) options \ - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(player) options \ - PORT_BIT( 0x40, IP_ACTIVE_HIGH, button3 ) PORT_PLAYER(player) options \ + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(player) options \ + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(player) options \ + PORT_BIT( 0x40, IP_ACTIVE_HIGH, button3 ) PORT_PLAYER(player) options \ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) #define TOAPLAN1_SYSTEM_INPUTS \ - PORT_START \ + PORT_START_TAG("SYSTEM") \ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) \ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_TILT ) \ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) \ @@ -395,7 +394,7 @@ ADDRESS_MAP_END PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK ) #define TOAPLAN1_VBLANK_INPUT \ - PORT_START \ + PORT_START_TAG("VBLANK") \ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_VBLANK ) \ PORT_BIT( 0xfffe, IP_ACTIVE_HIGH, IPT_UNKNOWN ) @@ -403,11 +402,13 @@ ADDRESS_MAP_END static INPUT_PORTS_START( rallybik ) TOAPLAN1_VBLANK_INPUT + PORT_START_TAG("P1") TOAPLAN1_PLAYER_INPUT( 1, IPT_UNKNOWN, ) + PORT_START_TAG("P2") TOAPLAN1_PLAYER_INPUT( 2, IPT_UNKNOWN, PORT_COCKTAIL ) - PORT_START /* DSW A */ + PORT_START_TAG("DSWA") /* DSW A */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) ) PORT_DIPSETTING( 0x01, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) ) @@ -429,7 +430,7 @@ static INPUT_PORTS_START( rallybik ) PORT_DIPSETTING( 0xc0, DEF_STR( 2C_3C ) ) PORT_DIPSETTING( 0x40, DEF_STR( 1C_2C ) ) - PORT_START /* DSW B */ + PORT_START_TAG("DSWB") /* DSW B */ PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x01, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x00, DEF_STR( Medium ) ) @@ -454,17 +455,18 @@ static INPUT_PORTS_START( rallybik ) PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) TOAPLAN1_SYSTEM_INPUTS - INPUT_PORTS_END static INPUT_PORTS_START( truxton ) TOAPLAN1_VBLANK_INPUT + PORT_START_TAG("P1") TOAPLAN1_PLAYER_INPUT( 1, IPT_UNKNOWN, ) + PORT_START_TAG("P2") TOAPLAN1_PLAYER_INPUT( 2, IPT_UNKNOWN, PORT_COCKTAIL ) - PORT_START /* DSW A */ + PORT_START_TAG("DSWA") /* DSW A */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) ) PORT_DIPSETTING( 0x01, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) ) @@ -499,7 +501,7 @@ static INPUT_PORTS_START( truxton ) PORT_DIPSETTING( 0xc0, DEF_STR( 1C_6C ) ) */ - PORT_START /* DSW B */ + PORT_START_TAG("DSWB") /* DSW B */ PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x01, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x00, DEF_STR( Medium ) ) @@ -524,7 +526,7 @@ static INPUT_PORTS_START( truxton ) TOAPLAN1_SYSTEM_INPUTS - PORT_START /* Territory Jumper Block */ + PORT_START_TAG("TJUMP") /* Territory Jumper Block */ PORT_DIPNAME( 0x07, 0x02, "Territory/Copyright" ) PORT_DIPSETTING( 0x02, "World/Taito Corp" ) PORT_DIPSETTING( 0x06, "World/Taito America" ) @@ -543,8 +545,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( hellfire ) TOAPLAN1_VBLANK_INPUT + PORT_START_TAG("P1") TOAPLAN1_PLAYER_INPUT( 1, IPT_UNKNOWN, ) + PORT_START_TAG("P2") TOAPLAN1_PLAYER_INPUT( 2, IPT_UNKNOWN, ) PORT_START_TAG("DSWA") /* DSW A */ @@ -621,8 +625,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( zerowing ) TOAPLAN1_VBLANK_INPUT + PORT_START_TAG("P1") TOAPLAN1_PLAYER_INPUT( 1, IPT_UNKNOWN, ) + PORT_START_TAG("P2") TOAPLAN1_PLAYER_INPUT( 2, IPT_UNKNOWN, PORT_COCKTAIL ) PORT_START_TAG("DSWA") /* DSW A */ @@ -703,8 +709,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( demonwld ) TOAPLAN1_VBLANK_INPUT + PORT_START_TAG("P1") TOAPLAN1_PLAYER_INPUT( 1, IPT_BUTTON3, ) + PORT_START_TAG("P2") TOAPLAN1_PLAYER_INPUT( 2, IPT_BUTTON3, ) PORT_START_TAG("DSWA") /* DSW A */ @@ -784,8 +792,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( samesame ) TOAPLAN1_VBLANK_INPUT + PORT_START_TAG("P1") TOAPLAN1_PLAYER_INPUT( 1, IPT_UNKNOWN, ) + PORT_START_TAG("P2") TOAPLAN1_PLAYER_INPUT( 2, IPT_UNKNOWN, PORT_COCKTAIL ) PORT_START_TAG("DSWA") /* DSW A */ @@ -910,8 +920,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( outzone ) TOAPLAN1_VBLANK_INPUT + PORT_START_TAG("P1") TOAPLAN1_PLAYER_INPUT( 1, IPT_BUTTON3, ) + PORT_START_TAG("P2") TOAPLAN1_PLAYER_INPUT( 2, IPT_BUTTON3, ) PORT_START_TAG("DSWA") /* DSW A */ @@ -1027,8 +1039,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( vimana ) TOAPLAN1_VBLANK_INPUT + PORT_START_TAG("P1") TOAPLAN1_PLAYER_INPUT( 1, IPT_BUTTON3, ) + PORT_START_TAG("P2") TOAPLAN1_PLAYER_INPUT( 2, IPT_BUTTON3, ) PORT_START_TAG("DSWA") /* DSW A */ diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c index df4c67b3289..10348109d05 100644 --- a/src/mame/drivers/toaplan2.c +++ b/src/mame/drivers/toaplan2.c @@ -754,7 +754,7 @@ static READ16_HANDLER( c2map_port_6_r ) } if (mcu_data == 0xff) mcu_data = 0x10; else mcu_data = 0x00; - return ( mcu_data | input_port_read_indexed(machine, 6) ); + return ( mcu_data | input_port_read(machine, "JMPR") ); } static READ16_HANDLER( pipibibi_z80_status_r ) @@ -774,7 +774,7 @@ static READ16_HANDLER( ghox_p1_h_analog_r ) { INT8 value, new_value; - new_value = input_port_read_indexed(machine, 7); + new_value = input_port_read(machine, "PAD1"); if (new_value == old_p1_paddle_h) return 0; value = new_value - old_p1_paddle_h; old_p1_paddle_h = new_value; @@ -785,7 +785,7 @@ static READ16_HANDLER( ghox_p2_h_analog_r ) { INT8 value, new_value; - new_value = input_port_read_indexed(machine, 8); + new_value = input_port_read(machine, "PAD2"); if (new_value == old_p2_paddle_h) return 0; value = new_value - old_p2_paddle_h; old_p2_paddle_h = new_value; diff --git a/src/mame/drivers/toratora.c b/src/mame/drivers/toratora.c index f50641197d7..38ce3ea85dc 100644 --- a/src/mame/drivers/toratora.c +++ b/src/mame/drivers/toratora.c @@ -38,7 +38,7 @@ static UINT8 clear_tv; static READ8_HANDLER( port_b_u3_r ) { logerror("%04x: read DIP\n",activecpu_get_pc()); - return input_port_read_indexed(machine, 1); + return input_port_read(machine, "DSW"); } @@ -139,16 +139,16 @@ static UINT8 last = 0; if (timer & 0x100) popmessage("watchdog!"); - if (last != (input_port_read_indexed(machine, 0) & 0x0f)) + if (last != (input_port_read(machine, "INPUT") & 0x0f)) { - last = input_port_read_indexed(machine, 0) & 0x0f; + last = input_port_read(machine, "INPUT") & 0x0f; cpunum_set_input_line(machine, 0, 0, PULSE_LINE); } - pia_set_input_a(0, input_port_read_indexed(machine, 0) & 0x0f, 0); + pia_set_input_a(0, input_port_read(machine, "INPUT") & 0x0f, 0); - pia_set_input_ca1(0, input_port_read_indexed(machine, 0) & 0x10); + pia_set_input_ca1(0, input_port_read(machine, "INPUT") & 0x10); - pia_set_input_ca2(0, input_port_read_indexed(machine, 0) & 0x20); + pia_set_input_ca2(0, input_port_read(machine, "INPUT") & 0x20); } static READ8_HANDLER( timer_r ) @@ -357,7 +357,7 @@ ADDRESS_MAP_END *************************************/ static INPUT_PORTS_START( toratora ) - PORT_START + PORT_START_TAG("INPUT") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) @@ -367,7 +367,7 @@ static INPUT_PORTS_START( toratora ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START + PORT_START_TAG("DSW") PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x03, "3" ) PORT_DIPSETTING( 0x02, "2" ) diff --git a/src/mame/drivers/tourtabl.c b/src/mame/drivers/tourtabl.c index 1eeb9027473..2ebf3be9867 100644 --- a/src/mame/drivers/tourtabl.c +++ b/src/mame/drivers/tourtabl.c @@ -54,7 +54,9 @@ static READ8_HANDLER( r6532_1_ram_r ) static READ16_HANDLER( tourtabl_read_input_port ) { - return input_port_read_indexed(machine, offset); + static const char *tianames[] = { "PADDLE4", "PADDLE3", "PADDLE2", "PADDLE1", "TIA_IN4", "TIA_IN5" }; + + return input_port_read(machine, tianames[offset]); } static READ8_HANDLER( tourtabl_get_databus_contents ) @@ -130,46 +132,46 @@ static MACHINE_START( tourtabl ) static INPUT_PORTS_START( tourtabl ) - PORT_START + PORT_START_TAG("PADDLE4") PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(40) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_REVERSE PORT_PLAYER(4) - PORT_START + PORT_START_TAG("PADDLE3") PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(40) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_REVERSE PORT_PLAYER(3) - PORT_START + PORT_START_TAG("PADDLE2") PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(40) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_REVERSE PORT_PLAYER(2) - PORT_START + PORT_START_TAG("PADDLE1") PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_SENSITIVITY(40) PORT_KEYDELTA(10) PORT_CENTERDELTA(0) PORT_REVERSE PORT_PLAYER(1) - PORT_START /* TIA INPT4 */ + PORT_START_TAG("TIA_IN4") /* TIA INPT4 */ PORT_DIPNAME( 0x80, 0x80, "Breakout Replay" ) PORT_DIPSETTING( 0x00, DEF_STR( Off )) PORT_DIPSETTING( 0x80, DEF_STR( On )) - PORT_START /* TIA INPT5 */ + PORT_START_TAG("TIA_IN5") /* TIA INPT5 */ PORT_DIPNAME( 0x80, 0x80, "Game Length" ) PORT_DIPSETTING( 0x00, "11 points (3 balls)" ) PORT_DIPSETTING( 0x80, "15 points (5 balls)" ) - PORT_START /* RIOT #0 SWCHA */ + PORT_START_TAG("RIOT0_SWA") /* RIOT #0 SWCHA */ PORT_DIPNAME( 0x0F, 0x0E, "Replay Level" ) PORT_DIPSETTING( 0x0B, "200 points" ) PORT_DIPSETTING( 0x0C, "250 points" ) PORT_DIPSETTING( 0x0D, "300 points" ) PORT_DIPSETTING( 0x0E, "400 points" ) PORT_DIPSETTING( 0x0F, "450 points" ) - PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4) - PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) - PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) - PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) - PORT_START /* RIOT #0 SWCHB */ + PORT_START_TAG("RIOT0_SWB") /* RIOT #0 SWCHB */ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Game Select") PORT_CODE(KEYCODE_SPACE) - PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_TILT ) - PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_START /* RIOT #1 SWCHA */ + PORT_START_TAG("RIOT1_SWA")/* RIOT #1 SWCHA */ PORT_DIPNAME( 0x0F, 0x07, DEF_STR( Coinage )) PORT_DIPSETTING( 0x00, "Mode A" ) PORT_DIPSETTING( 0x01, "Mode B" ) @@ -193,12 +195,12 @@ static INPUT_PORTS_START( tourtabl ) PORT_DIPSETTING( 0x20, DEF_STR( German ) ) PORT_DIPSETTING( 0x30, DEF_STR( Spanish ) ) PORT_SERVICE( 0x40, IP_ACTIVE_HIGH ) - PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_START /* RIOT #1 SWCHB */ - PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_START4 ) - PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_START2 ) - PORT_BIT ( 0x08, IP_ACTIVE_LOW, IPT_START1 ) + PORT_START_TAG("RIOT1_SWB") /* RIOT #1 SWCHB */ + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START4 ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) INPUT_PORTS_END diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c index b0cd9e688c8..1ce4194860d 100644 --- a/src/mame/drivers/toypop.c +++ b/src/mame/drivers/toypop.c @@ -55,17 +55,17 @@ PALETTE_INIT( toypop ); ***************************************************************************/ -static READ8_HANDLER( in0_l ) { return input_port_read_indexed(machine, 0); } // P1 joystick -static READ8_HANDLER( in0_h ) { return input_port_read_indexed(machine, 0) >> 4; } // P2 joystick -static READ8_HANDLER( in1_l ) { return input_port_read_indexed(machine, 1); } // fire and start buttons -static READ8_HANDLER( in1_h ) { return input_port_read_indexed(machine, 1) >> 4; } // coins -static READ8_HANDLER( dipA_l ) { return input_port_read_indexed(machine, 2); } // dips A -static READ8_HANDLER( dipA_h ) { return input_port_read_indexed(machine, 2) >> 4; } // dips A -static READ8_HANDLER( dipB_l ) { return input_port_read_indexed(machine, 3); } // dips B -static READ8_HANDLER( dipB_h ) { return input_port_read_indexed(machine, 3) >> 4; } // dips B -static READ8_HANDLER( in2_l ) { return input_port_read_indexed(machine, 4); } // P1 joystick left in liblrabl -static READ8_HANDLER( in2_h ) { return input_port_read_indexed(machine, 4) >> 4; } // P2 joystick left in liblrabl -static READ8_HANDLER( in3 ) { return input_port_read_indexed(machine, 5); } // test, cocktail, optional buttons +static READ8_HANDLER( in0_l ) { return input_port_read(machine, "INPUT_RIGHT"); } // P1 joystick +static READ8_HANDLER( in0_h ) { return input_port_read(machine, "INPUT_RIGHT") >> 4; } // P2 joystick +static READ8_HANDLER( in1_l ) { return input_port_read(machine, "SYSTEM"); } // fire and start buttons +static READ8_HANDLER( in1_h ) { return input_port_read(machine, "SYSTEM") >> 4; } // coins +static READ8_HANDLER( dipA_l ) { return input_port_read(machine, "DSW1"); } // dips A +static READ8_HANDLER( dipA_h ) { return input_port_read(machine, "DSW1") >> 4; } // dips A +static READ8_HANDLER( dipB_l ) { return input_port_read(machine, "DSW2"); } // dips B +static READ8_HANDLER( dipB_h ) { return input_port_read(machine, "DSW2") >> 4; } // dips B +static READ8_HANDLER( in2_l ) { return input_port_read(machine, "INPUT_LEFT"); } // P1 joystick left in liblrabl +static READ8_HANDLER( in2_h ) { return input_port_read(machine, "INPUT_LEFT") >> 4; } // P2 joystick left in liblrabl +static READ8_HANDLER( in3 ) { return input_port_read(machine, "SERVICE"); } // test, cocktail, optional buttons static WRITE8_HANDLER( out_coin0 ) { coin_lockout_global_w(data & 4); @@ -358,7 +358,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( liblrabl ) /* The inputs are not memory mapped, they are handled by three I/O chips. */ - PORT_START /* 58XX #0 pins 22-29 */ + PORT_START_TAG("INPUT_RIGHT") /* 58XX #0 pins 22-29 */ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_UP ) PORT_8WAY PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_8WAY PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_8WAY @@ -368,7 +368,7 @@ static INPUT_PORTS_START( liblrabl ) PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) PORT_8WAY PORT_COCKTAIL PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT ) PORT_8WAY PORT_COCKTAIL - PORT_START /* 58XX #0 pins 30-33 and 38-41 */ + PORT_START_TAG("SYSTEM") /* 58XX #0 pins 30-33 and 38-41 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 ) @@ -378,7 +378,7 @@ static INPUT_PORTS_START( liblrabl ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_START /* 56XX #1 pins 22-29 */ + PORT_START_TAG("DSW1") /* 56XX #1 pins 22-29 */ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPSETTING( 0x02, "1" ) PORT_DIPSETTING( 0x00, "2" ) @@ -404,7 +404,7 @@ static INPUT_PORTS_START( liblrabl ) PORT_DIPSETTING( 0xa0, DEF_STR( 1C_3C ) ) PORT_DIPSETTING( 0x20, DEF_STR( 1C_6C ) ) - PORT_START /* 56XX #1 pins 30-33 and 38-41 */ + PORT_START_TAG("DSW2") /* 56XX #1 pins 30-33 and 38-41 */ PORT_DIPNAME( 0x01, 0x01, "Freeze" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -428,7 +428,7 @@ static INPUT_PORTS_START( liblrabl ) PORT_DIPSETTING( 0x80, "C" ) PORT_DIPSETTING( 0x00, "D" ) - PORT_START /* 56XX #2 pins 22-29 */ + PORT_START_TAG("INPUT_LEFT") /* 56XX #2 pins 22-29 */ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_8WAY PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_RIGHT ) PORT_8WAY PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_8WAY @@ -438,7 +438,7 @@ static INPUT_PORTS_START( liblrabl ) PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_8WAY PORT_COCKTAIL PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_8WAY PORT_COCKTAIL - PORT_START /* 56XX #2 pins 30-33 */ + PORT_START_TAG("SERVICE") /* 56XX #2 pins 30-33 */ PORT_BIT( 0x03, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_DIPNAME( 0x04, 0x04, DEF_STR( Cabinet ) ) PORT_DIPSETTING( 0x04, DEF_STR( Upright ) ) @@ -448,7 +448,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( toypop ) /* The inputs are not memory mapped, they are handled by three I/O chips. */ - PORT_START /* 58XX #0 pins 22-29 */ + PORT_START_TAG("INPUT_RIGHT") /* 58XX #0 pins 22-29 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY @@ -458,7 +458,7 @@ static INPUT_PORTS_START( toypop ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_PLAYER(2) - PORT_START /* 58XX #0 pins 30-33 and 38-41 */ + PORT_START_TAG("SYSTEM") /* 58XX #0 pins 30-33 and 38-41 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 ) @@ -468,7 +468,7 @@ static INPUT_PORTS_START( toypop ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_START /* 56XX #1 pins 22-29 */ + PORT_START_TAG("DSW1") /* 56XX #1 pins 22-29 */ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPSETTING( 0x02, "1" ) PORT_DIPSETTING( 0x01, "2" ) @@ -489,7 +489,7 @@ static INPUT_PORTS_START( toypop ) PORT_DIPSETTING( 0x40, DEF_STR( On ) ) PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) - PORT_START /* 56XX #1 pins 30-33 and 38-41 */ + PORT_START_TAG("DSW2") /* 56XX #1 pins 30-33 and 38-41 */ PORT_DIPNAME( 0x01, 0x01, "Freeze" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -514,10 +514,10 @@ static INPUT_PORTS_START( toypop ) PORT_DIPSETTING( 0x80, "Every 15000 points" ) PORT_DIPSETTING( 0x00, "Every 20000 points" ) - PORT_START /* 56XX #2 pins 22-29 */ + PORT_START_TAG("INPUT_LEFT") /* 56XX #2 pins 22-29 */ PORT_BIT(0xff, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* 56XX #2 pins 30-33 */ + PORT_START_TAG("SERVICE") /* 56XX #2 pins 30-33 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) // would be Cabinet, but this game has no cocktail mode diff --git a/src/mame/drivers/travrusa.c b/src/mame/drivers/travrusa.c index 8572b4deee4..537ba1c21df 100644 --- a/src/mame/drivers/travrusa.c +++ b/src/mame/drivers/travrusa.c @@ -73,73 +73,73 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc800, 0xc9ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xd000, 0xd000) AM_WRITE(irem_sound_cmd_w) AM_RANGE(0xd001, 0xd001) AM_WRITE(travrusa_flipscreen_w) /* + coin counters - not written by shtrider */ - AM_RANGE(0xd000, 0xd000) AM_READ(input_port_0_r) /* IN0 */ - AM_RANGE(0xd001, 0xd001) AM_READ(input_port_1_r) /* IN1 */ - AM_RANGE(0xd002, 0xd002) AM_READ(input_port_2_r) /* IN2 */ - AM_RANGE(0xd003, 0xd003) AM_READ(input_port_3_r) /* DSW1 */ - AM_RANGE(0xd004, 0xd004) AM_READ(input_port_4_r) /* DSW2 */ + AM_RANGE(0xd000, 0xd000) AM_READ_PORT("SYSTEM") /* IN0 */ + AM_RANGE(0xd001, 0xd001) AM_READ_PORT("P1") /* IN1 */ + AM_RANGE(0xd002, 0xd002) AM_READ_PORT("P2") /* IN2 */ + AM_RANGE(0xd003, 0xd003) AM_READ_PORT("DSW1") /* DSW1 */ + AM_RANGE(0xd004, 0xd004) AM_READ_PORT("DSW2") /* DSW2 */ AM_RANGE(0xe000, 0xefff) AM_RAM ADDRESS_MAP_END -#define TRAV_COMMON\ - PORT_START_TAG("IN0")\ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )\ - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )\ - /* coin input must be active for 19 frames to be consistently recognized */\ - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(19)\ - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )\ - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )\ - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )\ - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )\ - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )\ - PORT_START_TAG("IN1")\ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY\ - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY\ - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )\ - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )\ - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )\ - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )\ - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )\ - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 )\ - PORT_START_TAG("IN2")\ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL\ - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL\ - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )\ - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )\ - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 )\ - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL\ - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )\ - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL\ - PORT_START_TAG("DSW1")\ - PORT_DIPNAME( 0x03, 0x03, "Fuel Reduced on Collision" )\ - PORT_DIPSETTING( 0x03, DEF_STR( Low ) )\ - PORT_DIPSETTING( 0x02, "Med" )\ - PORT_DIPSETTING( 0x01, "Hi" )\ - PORT_DIPSETTING( 0x00, "Max" )\ - PORT_DIPNAME( 0x04, 0x04, "Fuel Consumption" )\ - PORT_DIPSETTING( 0x04, DEF_STR( Low ) )\ - PORT_DIPSETTING( 0x00, "Hi" )\ - PORT_DIPNAME( 0x08, 0x00, DEF_STR( Allow_Continue ) )\ - PORT_DIPSETTING( 0x08, DEF_STR( No ) )\ - PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )\ - PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coinage ) )\ - PORT_DIPSETTING( 0xa0, DEF_STR( 6C_1C ) )\ - PORT_DIPSETTING( 0xb0, DEF_STR( 5C_1C ) )\ - PORT_DIPSETTING( 0xc0, DEF_STR( 4C_1C ) )\ - PORT_DIPSETTING( 0xd0, DEF_STR( 3C_1C ) )\ - PORT_DIPSETTING( 0xe0, DEF_STR( 2C_1C ) )\ - PORT_DIPSETTING( 0xf0, DEF_STR( 1C_1C ) )\ - PORT_DIPSETTING( 0x70, DEF_STR( 1C_2C ) )\ - PORT_DIPSETTING( 0x60, DEF_STR( 1C_3C ) )\ - PORT_DIPSETTING( 0x50, DEF_STR( 1C_4C ) )\ - PORT_DIPSETTING( 0x40, DEF_STR( 1C_5C ) )\ - PORT_DIPSETTING( 0x30, DEF_STR( 1C_6C ) )\ - PORT_DIPSETTING( 0x20, DEF_STR( 1C_7C ) )\ - /* PORT_DIPSETTING( 0x10, "INVALID" ) */\ - /* PORT_DIPSETTING( 0x00, "INVALID" ) */ - static INPUT_PORTS_START( travrusa ) -TRAV_COMMON + PORT_START_TAG("SYSTEM") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) + /* coin input must be active for 19 frames to be consistently recognized */ + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(19) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START_TAG("P1") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) + + PORT_START_TAG("P2") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 ) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL + + PORT_START_TAG("DSW1") + PORT_DIPNAME( 0x03, 0x03, "Fuel Reduced on Collision" ) + PORT_DIPSETTING( 0x03, DEF_STR( Low ) ) + PORT_DIPSETTING( 0x02, "Med" ) + PORT_DIPSETTING( 0x01, "Hi" ) + PORT_DIPSETTING( 0x00, "Max" ) + PORT_DIPNAME( 0x04, 0x04, "Fuel Consumption" ) + PORT_DIPSETTING( 0x04, DEF_STR( Low ) ) + PORT_DIPSETTING( 0x00, "Hi" ) + PORT_DIPNAME( 0x08, 0x00, DEF_STR( Allow_Continue ) ) + PORT_DIPSETTING( 0x08, DEF_STR( No ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) + PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coinage ) ) + PORT_DIPSETTING( 0xa0, DEF_STR( 6C_1C ) ) + PORT_DIPSETTING( 0xb0, DEF_STR( 5C_1C ) ) + PORT_DIPSETTING( 0xc0, DEF_STR( 4C_1C ) ) + PORT_DIPSETTING( 0xd0, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0xe0, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0xf0, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x70, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x60, DEF_STR( 1C_3C ) ) + PORT_DIPSETTING( 0x50, DEF_STR( 1C_4C ) ) + PORT_DIPSETTING( 0x40, DEF_STR( 1C_5C ) ) + PORT_DIPSETTING( 0x30, DEF_STR( 1C_6C ) ) + PORT_DIPSETTING( 0x20, DEF_STR( 1C_7C ) ) + /* PORT_DIPSETTING( 0x10, "INVALID" ) */ + /* PORT_DIPSETTING( 0x00, "INVALID" ) */ PORT_START_TAG("DSW2") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) @@ -169,34 +169,14 @@ INPUT_PORTS_END /* same as travrusa, no "Title" switch */ static INPUT_PORTS_START( motorace ) -TRAV_COMMON + PORT_INCLUDE( travrusa ) - PORT_START /* DSW2 */ - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) - PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x00, DEF_STR( Cabinet ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) - PORT_DIPSETTING( 0x02, DEF_STR( Cocktail ) ) - PORT_DIPNAME( 0x04, 0x04, "Coin Mode" ) - PORT_DIPSETTING( 0x04, "Mode 1" ) - PORT_DIPSETTING( 0x00, "Mode 2" ) - PORT_DIPNAME( 0x08, 0x08, "Speed Type" ) - PORT_DIPSETTING( 0x08, "M/H" ) //mph? - PORT_DIPSETTING( 0x00, "Km/H" ) - /* In stop mode, press 2 to stop and 1 to restart */ - PORT_DIPNAME( 0x10, 0x10, "Stop Mode (Cheat)") - PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_MODIFY("DSW2") PORT_DIPUNUSED( 0x20, IP_ACTIVE_LOW ) - PORT_DIPNAME( 0x40, 0x40, "Invulnerability (Cheat)") - PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) INPUT_PORTS_END static INPUT_PORTS_START( shtrider ) - PORT_START_TAG("IN0") + PORT_START_TAG("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -204,7 +184,7 @@ static INPUT_PORTS_START( shtrider ) PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_START_TAG("IN1") + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL @@ -214,13 +194,13 @@ static INPUT_PORTS_START( shtrider ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) - PORT_START_TAG("IN2") + PORT_START_TAG("P2") PORT_BIT( 0x03, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_COCKTAIL PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_COCKTAIL PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START_TAG("DSW0") + PORT_START_TAG("DSW1") PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) ) @@ -245,7 +225,7 @@ static INPUT_PORTS_START( shtrider ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START_TAG("DSW1") + PORT_START_TAG("DSW2") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) diff --git a/src/mame/drivers/triplhnt.c b/src/mame/drivers/triplhnt.c index 3e9e5c9f323..12b77a6797f 100644 --- a/src/mame/drivers/triplhnt.c +++ b/src/mame/drivers/triplhnt.c @@ -75,7 +75,7 @@ static void triplhnt_update_misc(running_machine *machine, int offset) discrete_sound_w(machine, TRIPLHNT_LAMP_EN, triplhnt_misc_flags & 0x02); // Lamp is used to reset noise discrete_sound_w(machine, TRIPLHNT_BEAR_EN, triplhnt_misc_flags & 0x80); // bear - is_witch_hunt = input_port_read_indexed(machine, 2) == 0x40; + is_witch_hunt = input_port_read(machine, "0C09") == 0x40; bit = ~triplhnt_misc_flags & 0x40; /* if we're not playing the sample yet, start it */ @@ -107,21 +107,21 @@ static READ8_HANDLER( triplhnt_cmos_r ) static READ8_HANDLER( triplhnt_input_port_4_r ) { watchdog_reset_w(machine, 0, 0); - return input_port_read_indexed(machine, 4); + return input_port_read(machine, "0C0B"); } static READ8_HANDLER( triplhnt_misc_r ) { triplhnt_update_misc(machine, offset); - return input_port_read_indexed(machine, 7) | triplhnt_hit_code; + return input_port_read(machine, "VBLANK") | triplhnt_hit_code; } static READ8_HANDLER( triplhnt_da_latch_r ) { - int cross_x = input_port_read_indexed(machine, 8); - int cross_y = input_port_read_indexed(machine, 9); + int cross_x = input_port_read(machine, "STICKX"); + int cross_y = input_port_read(machine, "STICKY"); triplhnt_da_latch = offset; @@ -133,16 +133,16 @@ static READ8_HANDLER( triplhnt_da_latch_r ) static ADDRESS_MAP_START( triplhnt_readmem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x00ff) AM_READ(SMH_RAM) AM_MIRROR(0x300) - AM_RANGE(0x0c00, 0x0c00) AM_READ(input_port_0_r) - AM_RANGE(0x0c08, 0x0c08) AM_READ(input_port_1_r) - AM_RANGE(0x0c09, 0x0c09) AM_READ(input_port_2_r) - AM_RANGE(0x0c0a, 0x0c0a) AM_READ(input_port_3_r) + AM_RANGE(0x0c00, 0x0c00) AM_READ_PORT("0C00") + AM_RANGE(0x0c08, 0x0c08) AM_READ_PORT("0C08") + AM_RANGE(0x0c09, 0x0c09) AM_READ_PORT("0C09") + AM_RANGE(0x0c0a, 0x0c0a) AM_READ_PORT("0C0A") AM_RANGE(0x0c0b, 0x0c0b) AM_READ(triplhnt_input_port_4_r) AM_RANGE(0x0c10, 0x0c1f) AM_READ(triplhnt_da_latch_r) AM_RANGE(0x0c20, 0x0c2f) AM_READ(triplhnt_cmos_r) AM_RANGE(0x0c30, 0x0c3f) AM_READ(triplhnt_misc_r) - AM_RANGE(0x0c40, 0x0c40) AM_READ(input_port_5_r) - AM_RANGE(0x0c48, 0x0c48) AM_READ(input_port_6_r) + AM_RANGE(0x0c40, 0x0c40) AM_READ_PORT("0C40") + AM_RANGE(0x0c48, 0x0c48) AM_READ_PORT("0C48") AM_RANGE(0x7000, 0x7fff) AM_READ(SMH_ROM) /* program */ AM_RANGE(0xf800, 0xffff) AM_READ(SMH_ROM) /* program mirror */ ADDRESS_MAP_END @@ -161,39 +161,39 @@ ADDRESS_MAP_END static INPUT_PORTS_START( triplhnt ) - PORT_START /* 0C00 */ + PORT_START_TAG("0C00") /* 0C00 */ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 ) - PORT_START /* 0C08 */ + PORT_START_TAG("0C08") /* 0C08 */ PORT_DIPNAME( 0xc0, 0x00, "Play Time" ) PORT_DIPSETTING( 0x00, "32 seconds / 16 raccoons" ) PORT_DIPSETTING( 0x40, "64 seconds / 32 raccoons" ) PORT_DIPSETTING( 0x80, "96 seconds / 48 raccoons" ) PORT_DIPSETTING( 0xc0, "128 seconds / 64 raccoons" ) - PORT_START /* 0C09 */ + PORT_START_TAG("0C09") /* 0C09 */ PORT_DIPNAME( 0xc0, 0x40, "Game Select" ) PORT_DIPSETTING( 0x00, "Hit the Bear" ) PORT_DIPSETTING( 0x40, "Witch Hunt" ) PORT_DIPSETTING( 0xc0, "Raccoon Hunt" ) - PORT_START /* 0C0A */ + PORT_START_TAG("0C0A") /* 0C0A */ PORT_DIPNAME( 0xc0, 0x00, DEF_STR( Coinage )) PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C )) PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C )) PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C )) - PORT_START /* 0C0B */ + PORT_START_TAG("0C0B") /* 0C0B */ PORT_DIPNAME( 0x80, 0x00, "Extended Play" ) PORT_DIPSETTING( 0x80, DEF_STR( Off )) PORT_DIPSETTING( 0x00, DEF_STR( On )) - PORT_START /* 0C40 */ + PORT_START_TAG("0C40") /* 0C40 */ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_TILT ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN2 ) - PORT_START /* 0C48 */ + PORT_START_TAG("0C48") /* 0C48 */ // default to service enabled to make users calibrate gun // PORT_SERVICE( 0x40, IP_ACTIVE_LOW ) PORT_DIPNAME( 0x40, 0x00, DEF_STR( Service_Mode )) PORT_TOGGLE PORT_CODE(KEYCODE_F2) @@ -201,13 +201,13 @@ static INPUT_PORTS_START( triplhnt ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_START + PORT_START_TAG("VBLANK") PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK ) - PORT_START + PORT_START_TAG("STICKX") PORT_BIT( 0xfc, 0x80, IPT_AD_STICK_X ) PORT_MINMAX(0x00,0xfc) PORT_CROSSHAIR(X, 62.0/64, 1.0/64, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) - PORT_START + PORT_START_TAG("STICKY") PORT_BIT( 0xfc, 0x78, IPT_AD_STICK_Y ) PORT_MINMAX(0x00,0xec) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(25) PORT_KEYDELTA(15) PORT_START_TAG("BEAR") /* 10 */ diff --git a/src/mame/drivers/truco.c b/src/mame/drivers/truco.c index 2db36b36a59..e4d85ab5ffa 100644 --- a/src/mame/drivers/truco.c +++ b/src/mame/drivers/truco.c @@ -30,18 +30,18 @@ PALETTE_INIT( truco ); static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x17ff) AM_RAM /* general purpose ram */ - AM_RANGE(0x1800, 0x7bff) AM_RAM AM_BASE(&videoram) /* video ram */ - AM_RANGE(0x7c00, 0x7fff) AM_RAM AM_BASE(&battery_ram) /* battery backed ram */ - AM_RANGE(0x8000, 0x8000) AM_READWRITE(input_port_0_r, SMH_NOP) /* controls (and irq ack?) */ - AM_RANGE(0x8001, 0x8001) AM_READWRITE(SMH_NOP, SMH_NOP) /* unknown */ - AM_RANGE(0x8002, 0x8002) AM_READWRITE(input_port_1_r, DAC_0_data_w) /* dipswitches */ - AM_RANGE(0x8003, 0x8007) AM_READWRITE(SMH_NOP, SMH_NOP) /* unknown */ + AM_RANGE(0x0000, 0x17ff) AM_RAM /* general purpose ram */ + AM_RANGE(0x1800, 0x7bff) AM_RAM AM_BASE(&videoram) /* video ram */ + AM_RANGE(0x7c00, 0x7fff) AM_RAM AM_BASE(&battery_ram) /* battery backed ram */ + AM_RANGE(0x8000, 0x8000) AM_READ_PORT("P1") AM_WRITENOP /* controls (and irq ack?) */ + AM_RANGE(0x8001, 0x8001) AM_READWRITE(SMH_NOP, SMH_NOP) /* unknown */ + AM_RANGE(0x8002, 0x8002) AM_READ_PORT("DSW") AM_WRITE(DAC_0_data_w) /* dipswitches */ + AM_RANGE(0x8003, 0x8007) AM_READWRITE(SMH_NOP, SMH_NOP) /* unknown */ AM_RANGE(0x8008, 0xffff) AM_ROM ADDRESS_MAP_END static INPUT_PORTS_START( truco ) - PORT_START /* IN0 */ + PORT_START_TAG("P1") /* IN0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -51,7 +51,7 @@ static INPUT_PORTS_START( truco ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) - PORT_START /* DSW1 */ + PORT_START_TAG("DSW") /* DSW1 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING ( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING ( 0x00, DEF_STR( On ) ) @@ -77,7 +77,7 @@ static INPUT_PORTS_START( truco ) PORT_DIPSETTING ( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING ( 0x00, DEF_STR( On ) ) - PORT_START /* IN1 - FAKE - Used for coinup */ + PORT_START_TAG("COIN") /* IN1 - FAKE - Used for coinup */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -123,7 +123,7 @@ static INTERRUPT_GEN( truco_interrupt ) /* coinup */ static int trigger = 0; - if ( input_port_read_indexed(machine, 2 ) & 1 ) + if ( input_port_read(machine, "COIN") & 1 ) { if ( trigger == 0 ) { diff --git a/src/mame/drivers/tryout.c b/src/mame/drivers/tryout.c index e1c4c13f963..932c8ba47dc 100644 --- a/src/mame/drivers/tryout.c +++ b/src/mame/drivers/tryout.c @@ -61,10 +61,10 @@ static ADDRESS_MAP_START( main_cpu, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc800, 0xc87f) AM_RAM AM_BASE(&spriteram) AM_RANGE(0xcc00, 0xcc7f) AM_RAM AM_BASE(&spriteram_2) AM_RANGE(0xd000, 0xd7ff) AM_READWRITE(tryout_vram_r, tryout_vram_w) - AM_RANGE(0xe000, 0xe000) AM_READ(input_port_0_r) - AM_RANGE(0xe001, 0xe001) AM_READ(input_port_1_r) - AM_RANGE(0xe002, 0xe002) AM_READ(input_port_2_r) - AM_RANGE(0xe003, 0xe003) AM_READ(input_port_3_r) + AM_RANGE(0xe000, 0xe000) AM_READ_PORT("DSW") + AM_RANGE(0xe001, 0xe001) AM_READ_PORT("P1") + AM_RANGE(0xe002, 0xe002) AM_READ_PORT("P2") + AM_RANGE(0xe003, 0xe003) AM_READ_PORT("SYSTEM") AM_RANGE(0xe301, 0xe301) AM_WRITE(tryout_flipscreen_w) AM_RANGE(0xe302, 0xe302) AM_WRITE(tryout_bankswitch_w) AM_RANGE(0xe401, 0xe401) AM_WRITE(tryout_vram_bankswitch_w) @@ -84,7 +84,7 @@ static ADDRESS_MAP_START( sound_cpu, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static INPUT_PORTS_START( tryout ) - PORT_START + PORT_START_TAG("DSW") PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) ) @@ -108,7 +108,7 @@ static INPUT_PORTS_START( tryout ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START + PORT_START_TAG("P1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY @@ -118,7 +118,7 @@ static INPUT_PORTS_START( tryout ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("P2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL @@ -128,7 +128,7 @@ static INPUT_PORTS_START( tryout ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_IMPULSE(2) @@ -183,7 +183,7 @@ GFXDECODE_END static INTERRUPT_GEN( tryout_interrupt ) { - if ((input_port_read_indexed(machine, 3) & 0x1c)!=0x1c) + if ((input_port_read(machine, "SYSTEM") & 0x1c) != 0x1c) cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, ASSERT_LINE); } diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c index 1946a83b0e6..6b688647bbc 100644 --- a/src/mame/drivers/tugboat.c +++ b/src/mame/drivers/tugboat.c @@ -130,15 +130,15 @@ static int ctrl; static READ8_HANDLER( tugboat_input_r ) { if (~ctrl & 0x80) - return input_port_read_indexed(machine, 0); + return input_port_read(machine, "IN0"); else if (~ctrl & 0x40) - return input_port_read_indexed(machine, 1); + return input_port_read(machine, "IN1"); else if (~ctrl & 0x20) - return input_port_read_indexed(machine, 2); + return input_port_read(machine, "IN2"); else if (~ctrl & 0x10) - return input_port_read_indexed(machine, 3); + return input_port_read(machine, "IN3"); else - return input_port_read_indexed(machine, 4); + return input_port_read(machine, "IN4"); } static READ8_HANDLER( tugboat_ctrl_r ) @@ -202,7 +202,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( tugboat ) - PORT_START + PORT_START_TAG("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -212,7 +212,7 @@ static INPUT_PORTS_START( tugboat ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_2WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) @@ -222,7 +222,7 @@ static INPUT_PORTS_START( tugboat ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("IN2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -232,7 +232,7 @@ static INPUT_PORTS_START( tugboat ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("IN3") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -242,7 +242,7 @@ static INPUT_PORTS_START( tugboat ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("IN4") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -254,7 +254,7 @@ static INPUT_PORTS_START( tugboat ) PORT_DIPSETTING( 0x40, DEF_STR( On ) ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START + PORT_START_TAG("DSW") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -273,74 +273,13 @@ static INPUT_PORTS_START( tugboat ) INPUT_PORTS_END static INPUT_PORTS_START( noahsark ) - PORT_START - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_INCLUDE( tugboat ) - PORT_START + PORT_MODIFY("IN1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START2 ) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x40, DEF_STR( On ) ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_DIPNAME( 0x30, 0x10, DEF_STR( Coinage ) ) - PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) ) - PORT_DIPSETTING( 0x10, DEF_STR( 1C_1C ) ) - PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) ) - PORT_DIPSETTING( 0x30, DEF_STR( 1C_4C ) ) - PORT_DIPNAME( 0x40, 0x00, DEF_STR( Lives ) ) - PORT_DIPSETTING( 0x00, "3" ) - PORT_DIPSETTING( 0x40, "5" ) - PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x80, DEF_STR( On ) ) INPUT_PORTS_END diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c index 87fb49c17b8..a5680255dc4 100644 --- a/src/mame/drivers/tumbleb.c +++ b/src/mame/drivers/tumbleb.c @@ -401,11 +401,11 @@ static READ16_HANDLER( tumblepopb_controls_r ) switch (offset<<1) { case 0: /* Player 1 & Player 2 joysticks & fire buttons */ - return (input_port_read(machine, "IN0") | (input_port_read(machine, "IN1") << 8)); + return (input_port_read(machine, "P1") | (input_port_read(machine, "P2") << 8)); case 2: /* Dips */ return (input_port_read(machine, "DSW1") | (input_port_read(machine, "DSW2") << 8)); case 8: /* Credits */ - return input_port_read(machine, "IN2"); + return input_port_read(machine, "SYSTEM"); case 10: /* ? */ case 12: return 0; @@ -800,8 +800,8 @@ static ADDRESS_MAP_START( jumppop_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x140000, 0x1407ff) AM_READ(SMH_RAM) AM_RANGE(0x160000, 0x160fff) AM_READ(SMH_RAM) - AM_RANGE(0x180002, 0x180003) AM_READ_PORT("IN0") - AM_RANGE(0x180004, 0x180005) AM_READ_PORT("COINS") + AM_RANGE(0x180002, 0x180003) AM_READ_PORT("PLAYERS") + AM_RANGE(0x180004, 0x180005) AM_READ_PORT("SYSTEM") AM_RANGE(0x180006, 0x180007) AM_READ_PORT("DSW") AM_RANGE(0x1a0000, 0x1a7fff) AM_READ(SMH_RAM) @@ -843,9 +843,9 @@ static ADDRESS_MAP_START( suprtrio_main_cpu, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xa22000, 0xa22fff) AM_RAM_WRITE(tumblepb_pf2_data_w) AM_BASE(&tumblepb_pf2_data) AM_RANGE(0xcf0000, 0xcf05ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) - AM_RANGE(0xe00000, 0xe00001) AM_READ_PORT("IN0") AM_WRITE(suprtrio_tilebank_w) + AM_RANGE(0xe00000, 0xe00001) AM_READ_PORT("PLAYERS") AM_WRITE(suprtrio_tilebank_w) - AM_RANGE(0xe40000, 0xe40001) AM_READ_PORT("COINS") + AM_RANGE(0xe40000, 0xe40001) AM_READ_PORT("SYSTEM") AM_RANGE(0xe80002, 0xe80003) AM_READ_PORT("DSW") AM_RANGE(0xec0000, 0xec0001) AM_WRITE(semicom_soundcmd_w) AM_RANGE(0xf00000, 0xf07fff) AM_RAM @@ -1004,7 +1004,7 @@ ADDRESS_MAP_END /******************************************************************************/ static INPUT_PORTS_START( tumblepb ) - PORT_START_TAG("IN0") /* Player 1 controls */ + PORT_START_TAG("P1") /* Player 1 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -1014,7 +1014,7 @@ static INPUT_PORTS_START( tumblepb ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START_TAG("IN1") /* Player 2 controls */ + PORT_START_TAG("P2") /* Player 2 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -1024,7 +1024,7 @@ static INPUT_PORTS_START( tumblepb ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("IN2") /* Credits */ + PORT_START_TAG("SYSTEM") /* Credits */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -1094,7 +1094,7 @@ static INPUT_PORTS_START( tumblepb ) INPUT_PORTS_END static INPUT_PORTS_START( metlsavr ) - PORT_START_TAG("IN0") /* Player 1 controls */ + PORT_START_TAG("P1") /* Player 1 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -1104,7 +1104,7 @@ static INPUT_PORTS_START( metlsavr ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START_TAG("IN1") /* Player 2 controls */ + PORT_START_TAG("P2") /* Player 2 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -1114,7 +1114,7 @@ static INPUT_PORTS_START( metlsavr ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("IN2") /* Credits */ + PORT_START_TAG("SYSTEM") /* Credits */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1169,7 +1169,7 @@ static INPUT_PORTS_START( metlsavr ) INPUT_PORTS_END static INPUT_PORTS_START( suprtrio ) - PORT_START_TAG("IN0") + PORT_START_TAG("PLAYERS") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -1187,7 +1187,7 @@ static INPUT_PORTS_START( suprtrio ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("COINS") + PORT_START_TAG("SYSTEM") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0xfffe, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1217,7 +1217,7 @@ static INPUT_PORTS_START( suprtrio ) INPUT_PORTS_END static INPUT_PORTS_START( fncywld ) - PORT_START_TAG("IN0") /* Player 1 controls */ + PORT_START_TAG("P1") /* Player 1 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -1227,7 +1227,7 @@ static INPUT_PORTS_START( fncywld ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START_TAG("IN1") /* Player 2 controls */ + PORT_START_TAG("P2") /* Player 2 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -1237,7 +1237,7 @@ static INPUT_PORTS_START( fncywld ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("IN2") /* Credits */ + PORT_START_TAG("SYSTEM") /* Credits */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -1308,7 +1308,7 @@ static INPUT_PORTS_START( fncywld ) INPUT_PORTS_END static INPUT_PORTS_START( htchctch ) - PORT_START_TAG("IN0") /* Player 1 controls */ + PORT_START_TAG("P1") /* Player 1 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -1318,7 +1318,7 @@ static INPUT_PORTS_START( htchctch ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START_TAG("IN1") /* Player 2 controls */ + PORT_START_TAG("P2") /* Player 2 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -1328,7 +1328,7 @@ static INPUT_PORTS_START( htchctch ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("IN2") /* Credits */ + PORT_START_TAG("SYSTEM") /* Credits */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1373,7 +1373,7 @@ static INPUT_PORTS_START( htchctch ) INPUT_PORTS_END static INPUT_PORTS_START( cookbib ) - PORT_START_TAG("IN0") /* Player 1 controls */ + PORT_START_TAG("P1") /* Player 1 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -1383,7 +1383,7 @@ static INPUT_PORTS_START( cookbib ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START_TAG("IN1") /* Player 2 controls */ + PORT_START_TAG("P2") /* Player 2 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -1393,7 +1393,7 @@ static INPUT_PORTS_START( cookbib ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("IN2") /* Credits */ + PORT_START_TAG("SYSTEM") /* Credits */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1438,7 +1438,7 @@ static INPUT_PORTS_START( cookbib ) INPUT_PORTS_END static INPUT_PORTS_START( chokchok ) - PORT_START_TAG("IN0") /* Player 1 controls */ + PORT_START_TAG("P1") /* Player 1 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -1448,7 +1448,7 @@ static INPUT_PORTS_START( chokchok ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START_TAG("IN1") /* Player 2 controls */ + PORT_START_TAG("P2") /* Player 2 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -1458,7 +1458,7 @@ static INPUT_PORTS_START( chokchok ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("IN2") /* Credits */ + PORT_START_TAG("SYSTEM") /* Credits */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1516,7 +1516,7 @@ static INPUT_PORTS_START( chokchok ) INPUT_PORTS_END static INPUT_PORTS_START( wlstar ) - PORT_START_TAG("IN0") /* Player 1 controls */ + PORT_START_TAG("P1") /* Player 1 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -1526,7 +1526,7 @@ static INPUT_PORTS_START( wlstar ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START_TAG("IN1") /* Player 2 controls */ + PORT_START_TAG("P2") /* Player 2 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -1536,7 +1536,7 @@ static INPUT_PORTS_START( wlstar ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("IN2") /* Credits */ + PORT_START_TAG("SYSTEM") /* Credits */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1589,7 +1589,7 @@ static INPUT_PORTS_START( wlstar ) INPUT_PORTS_END static INPUT_PORTS_START( wondl96 ) - PORT_START_TAG("IN0") /* Player 1 controls */ + PORT_START_TAG("P1") /* Player 1 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -1599,7 +1599,7 @@ static INPUT_PORTS_START( wondl96 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START_TAG("IN1") /* Player 2 controls */ + PORT_START_TAG("P2") /* Player 2 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -1609,7 +1609,7 @@ static INPUT_PORTS_START( wondl96 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("IN2") /* Credits */ + PORT_START_TAG("SYSTEM") /* Credits */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // must be high to avoid endless loops @@ -1669,7 +1669,7 @@ static INPUT_PORTS_START( wondl96 ) INPUT_PORTS_END static INPUT_PORTS_START( sdfight ) - PORT_START_TAG("IN0") /* Player 1 controls */ + PORT_START_TAG("P1") /* Player 1 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -1679,7 +1679,7 @@ static INPUT_PORTS_START( sdfight ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START_TAG("IN1") /* Player 2 controls */ + PORT_START_TAG("P2") /* Player 2 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -1689,7 +1689,7 @@ static INPUT_PORTS_START( sdfight ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("IN2") /* Credits */ + PORT_START_TAG("SYSTEM") /* Credits */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1750,7 +1750,7 @@ static INPUT_PORTS_START( sdfight ) INPUT_PORTS_END static INPUT_PORTS_START( bcstory ) - PORT_START_TAG("IN0") /* Player 1 controls */ + PORT_START_TAG("P1") /* Player 1 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -1760,7 +1760,7 @@ static INPUT_PORTS_START( bcstory ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START_TAG("IN1") /* Player 2 controls */ + PORT_START_TAG("P2") /* Player 2 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -1770,7 +1770,7 @@ static INPUT_PORTS_START( bcstory ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("IN2") /* Credits */ + PORT_START_TAG("SYSTEM") /* Credits */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1824,7 +1824,7 @@ static INPUT_PORTS_START( bcstory ) INPUT_PORTS_END static INPUT_PORTS_START( semibase ) - PORT_START_TAG("IN0") /* Player 1 controls */ + PORT_START_TAG("P1") /* Player 1 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -1834,7 +1834,7 @@ static INPUT_PORTS_START( semibase ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START_TAG("IN1") /* Player 2 controls */ + PORT_START_TAG("P2") /* Player 2 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -1844,7 +1844,7 @@ static INPUT_PORTS_START( semibase ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("IN2") /* Credits */ + PORT_START_TAG("SYSTEM") /* Credits */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) // See notes @@ -1898,7 +1898,7 @@ static INPUT_PORTS_START( semibase ) INPUT_PORTS_END static INPUT_PORTS_START( dquizgo ) - PORT_START_TAG("IN0") /* Player 1 controls */ + PORT_START_TAG("P1") /* Player 1 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -1908,7 +1908,7 @@ static INPUT_PORTS_START( dquizgo ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START_TAG("IN1") /* Player 2 controls */ + PORT_START_TAG("P2") /* Player 2 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -1918,7 +1918,7 @@ static INPUT_PORTS_START( dquizgo ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START_TAG("IN2") /* Credits */ + PORT_START_TAG("SYSTEM") /* Credits */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1969,7 +1969,7 @@ static INPUT_PORTS_START( dquizgo ) INPUT_PORTS_END static INPUT_PORTS_START( jumppop ) - PORT_START_TAG("IN0") /* Controls */ + PORT_START_TAG("PLAYERS") /* Controls */ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -1987,7 +1987,7 @@ static INPUT_PORTS_START( jumppop ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START_TAG("COINS") /* Coins / Start Buttons */ + PORT_START_TAG("SYSTEM") /* Coins / Start Buttons */ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 ) @@ -3478,7 +3478,7 @@ static READ16_HANDLER( bcstory_1a0_read ) //mame_printf_debug("bcstory_io %06x\n",activecpu_get_pc()); if (activecpu_get_pc()==0x0560) return 0x1a0; - else return input_port_read_indexed(machine, 2); + else return input_port_read(machine, "SYSTEM"); } static DRIVER_INIT ( bcstory ) diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c index 8ee76eccc6d..87e45debea3 100644 --- a/src/mame/drivers/tumblep.c +++ b/src/mame/drivers/tumblep.c @@ -90,11 +90,11 @@ static READ16_HANDLER( tumblepop_controls_r ) switch (offset<<1) { case 0: /* Player 1 & Player 2 joysticks & fire buttons */ - return (input_port_read_indexed(machine, 0) + (input_port_read_indexed(machine, 1) << 8)); + return (input_port_read(machine, "P1") + (input_port_read(machine, "P2") << 8)); case 2: /* Dips */ - return (input_port_read_indexed(machine, 3) + (input_port_read_indexed(machine, 4) << 8)); + return (input_port_read(machine, "DSW1") + (input_port_read(machine, "DSW2") << 8)); case 8: /* Credits */ - return input_port_read_indexed(machine, 2); + return input_port_read(machine, "SYSTEM"); case 10: /* ? */ case 12: return 0; @@ -155,7 +155,7 @@ ADDRESS_MAP_END /******************************************************************************/ static INPUT_PORTS_START( tumblep ) - PORT_START /* Player 1 controls */ + PORT_START_TAG("P1") /* Player 1 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -165,7 +165,7 @@ static INPUT_PORTS_START( tumblep ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) - PORT_START /* Player 2 controls */ + PORT_START_TAG("P2") /* Player 2 controls */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -175,7 +175,7 @@ static INPUT_PORTS_START( tumblep ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* button 3 - unused */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) - PORT_START /* Credits */ + PORT_START_TAG("SYSTEM") /* Credits */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) @@ -185,7 +185,7 @@ static INPUT_PORTS_START( tumblep ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START /* Dip switch bank 1 */ + PORT_START_TAG("DSW1") /* Dip switch bank 1 */ PORT_DIPNAME( 0xe0, 0xe0, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x00, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ) ) @@ -211,7 +211,7 @@ static INPUT_PORTS_START( tumblep ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* Dip switch bank 2 */ + PORT_START_TAG("DSW2") /* Dip switch bank 2 */ PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) ) PORT_DIPSETTING( 0x80, "1" ) PORT_DIPSETTING( 0x00, "2" ) diff --git a/src/mame/drivers/turbo.c b/src/mame/drivers/turbo.c index 9138f0b66a8..c9373546841 100644 --- a/src/mame/drivers/turbo.c +++ b/src/mame/drivers/turbo.c @@ -490,7 +490,7 @@ static READ8_HANDLER( turbo_8279_r ) { /* read sensor RAM */ case 0x40: - result = ~input_port_read_indexed(machine, 1); /* DSW 1 - inverted! */ + result = ~input_port_read(machine, "DSW1"); /* DSW 1 - inverted! */ break; /* read display RAM */ @@ -625,7 +625,7 @@ static READ8_HANDLER( turbo_collision_r ) { turbo_state *state = machine->driver_data; video_screen_update_partial(machine->primary_screen, video_screen_get_vpos(machine->primary_screen)); - return input_port_read_indexed(machine, 3) | (state->turbo_collision & 15); + return input_port_read(machine, "DSW3") | (state->turbo_collision & 15); } @@ -640,14 +640,14 @@ static WRITE8_HANDLER( turbo_collision_clear_w ) static READ8_HANDLER( turbo_analog_r ) { turbo_state *state = machine->driver_data; - return input_port_read_indexed(machine, 4) - state->turbo_last_analog; + return input_port_read(machine, "DIAL") - state->turbo_last_analog; } static WRITE8_HANDLER( turbo_analog_reset_w ) { turbo_state *state = machine->driver_data; - state->turbo_last_analog = input_port_read_indexed(machine, 4); + state->turbo_last_analog = input_port_read(machine, "DIAL"); } @@ -686,8 +686,8 @@ static READ8_HANDLER( buckrog_cpu2_command_r ) static READ8_HANDLER( buckrog_port_2_r ) { - int inp1 = input_port_read_indexed(machine, 2); - int inp2 = input_port_read_indexed(machine, 3); + int inp1 = input_port_read(machine, "DSW1"); + int inp2 = input_port_read(machine, "DSW2"); return (((inp2 >> 6) & 1) << 7) | (((inp2 >> 4) & 1) << 6) | @@ -702,8 +702,8 @@ static READ8_HANDLER( buckrog_port_2_r ) static READ8_HANDLER( buckrog_port_3_r ) { - int inp1 = input_port_read_indexed(machine, 2); - int inp2 = input_port_read_indexed(machine, 3); + int inp1 = input_port_read(machine, "DSW1"); + int inp2 = input_port_read(machine, "DSW2"); return (((inp2 >> 7) & 1) << 7) | (((inp2 >> 5) & 1) << 6) | @@ -751,7 +751,7 @@ static ADDRESS_MAP_START( turbo_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xfa00, 0xfa03) AM_MIRROR(0x00fc) AM_DEVREADWRITE(PPI8255, "ppi8255_2", ppi8255_r, ppi8255_w) AM_RANGE(0xfb00, 0xfb03) AM_MIRROR(0x00fc) AM_DEVREADWRITE(PPI8255, "ppi8255_3", ppi8255_r, ppi8255_w) AM_RANGE(0xfc00, 0xfc01) AM_MIRROR(0x00fe) AM_READWRITE(turbo_8279_r, turbo_8279_w) - AM_RANGE(0xfd00, 0xfdff) AM_READ(input_port_0_r) + AM_RANGE(0xfd00, 0xfdff) AM_READ_PORT("INPUT") AM_RANGE(0xfe00, 0xfeff) AM_READ(turbo_collision_r) ADDRESS_MAP_END @@ -767,10 +767,10 @@ static ADDRESS_MAP_START( subroc3d_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x9fff) AM_ROM AM_RANGE(0xa000, 0xa3ff) AM_RAM AM_BASE_MEMBER(turbo_state, sprite_position) // CONT RAM AM_RANGE(0xa400, 0xa7ff) AM_RAM AM_BASE_MEMBER(turbo_state, spriteram) // CONT RAM - AM_RANGE(0xa800, 0xa800) AM_MIRROR(0x07fc) AM_READ(input_port_0_r) // INPUT 253 - AM_RANGE(0xa801, 0xa801) AM_MIRROR(0x07fc) AM_READ(input_port_1_r) // INPUT 253 - AM_RANGE(0xa802, 0xa802) AM_MIRROR(0x07fc) AM_READ(input_port_2_r) // INPUT 253 - AM_RANGE(0xa803, 0xa803) AM_MIRROR(0x07fc) AM_READ(input_port_3_r) // INPUT 253 + AM_RANGE(0xa800, 0xa800) AM_MIRROR(0x07fc) AM_READ_PORT("IN0") // INPUT 253 + AM_RANGE(0xa801, 0xa801) AM_MIRROR(0x07fc) AM_READ_PORT("IN1") // INPUT 253 + AM_RANGE(0xa802, 0xa802) AM_MIRROR(0x07fc) AM_READ_PORT("DSW2") // INPUT 253 + AM_RANGE(0xa803, 0xa803) AM_MIRROR(0x07fc) AM_READ_PORT("DSW3") // INPUT 253 AM_RANGE(0xb000, 0xb7ff) AM_RAM // SCRATCH AM_RANGE(0xb800, 0xbfff) // HANDLE CL AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(turbo_videoram_w) AM_BASE_MEMBER(turbo_state, videoram) // FIX PAGE @@ -796,8 +796,8 @@ static ADDRESS_MAP_START( buckrog_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd800, 0xd801) AM_MIRROR(0x07fe) AM_READWRITE(turbo_8279_r, turbo_8279_w) // 8279 AM_RANGE(0xe000, 0xe3ff) AM_RAM AM_BASE_MEMBER(turbo_state, sprite_position) // CONT RAM AM_RANGE(0xe400, 0xe7ff) AM_RAM AM_BASE_MEMBER(turbo_state, spriteram) // CONT RAM - AM_RANGE(0xe800, 0xe800) AM_MIRROR(0x07fc) AM_READ(input_port_0_r) // INPUT - AM_RANGE(0xe801, 0xe801) AM_MIRROR(0x07fc) AM_READ(input_port_1_r) + AM_RANGE(0xe800, 0xe800) AM_MIRROR(0x07fc) AM_READ_PORT("IN0") // INPUT + AM_RANGE(0xe801, 0xe801) AM_MIRROR(0x07fc) AM_READ_PORT("IN1") AM_RANGE(0xe802, 0xe802) AM_MIRROR(0x07fc) AM_READ(buckrog_port_2_r) AM_RANGE(0xe803, 0xe803) AM_MIRROR(0x07fc) AM_READ(buckrog_port_3_r) AM_RANGE(0xf000, 0xf000) @@ -826,7 +826,7 @@ ADDRESS_MAP_END *************************************/ static INPUT_PORTS_START( turbo ) - PORT_START /* IN0 */ + PORT_START_TAG("INPUT") /* IN0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* ACCEL B */ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) /* ACCEL A */ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_TOGGLE /* SHIFT */ @@ -836,7 +836,7 @@ static INPUT_PORTS_START( turbo ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_START /* DSW 1 */ + PORT_START_TAG("DSW1") /* DSW 1 */ PORT_DIPNAME( 0x03, 0x03, "Car On Extended Play" ) PORT_DIPLOCATION("SW1:1,2") PORT_DIPSETTING( 0x00, "1" ) PORT_DIPSETTING( 0x01, "2" ) @@ -861,7 +861,7 @@ static INPUT_PORTS_START( turbo ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* DSW 2 */ + PORT_START_TAG("DSW2") /* DSW 2 */ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Game_Time ) ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x00, "60 seconds" ) PORT_DIPSETTING( 0x01, "70 seconds" ) @@ -886,7 +886,7 @@ static INPUT_PORTS_START( turbo ) PORT_DIPSETTING( 0x40, DEF_STR( 1C_3C )) PORT_DIPSETTING( 0x60, DEF_STR( 1C_6C )) - PORT_START /* Collision and DSW 3 */ + PORT_START_TAG("DSW3") /* Collision and DSW 3 */ PORT_BIT( 0x0f, 0x00, IPT_SPECIAL ) /* Merged with collision bits */ PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:1") PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) @@ -901,7 +901,7 @@ static INPUT_PORTS_START( turbo ) PORT_DIPSETTING( 0x80, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x00, "Cockpit") - PORT_START /* IN0 */ + PORT_START_TAG("DIAL") /* IN0 */ PORT_BIT( 0xff, 0, IPT_DIAL ) PORT_SENSITIVITY(10) PORT_KEYDELTA(30) /* this is actually a variable resistor */ @@ -915,11 +915,11 @@ INPUT_PORTS_END static INPUT_PORTS_START( subroc3d ) - PORT_START + PORT_START_TAG("IN0") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) - PORT_START + PORT_START_TAG("IN1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) @@ -929,7 +929,7 @@ static INPUT_PORTS_START( subroc3d ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_START /* DSW 2 */ + PORT_START_TAG("DSW2") /* DSW 2 */ PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coin_A )) PORT_DIPLOCATION("SW2:1,2,3") PORT_DIPSETTING( 0x07, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x06, DEF_STR( 4C_1C ) ) @@ -954,7 +954,7 @@ static INPUT_PORTS_START( subroc3d ) PORT_DIPSETTING( 0x80, "4" ) PORT_DIPSETTING( 0xc0, "5" ) - PORT_START /* DSW 3 */ + PORT_START_TAG("DSW3") /* DSW 3 */ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW3:1,2") PORT_DIPSETTING( 0x00, "20000" ) PORT_DIPSETTING( 0x01, "40000" ) @@ -979,19 +979,19 @@ static INPUT_PORTS_START( subroc3d ) PORT_DIPSETTING( 0x00, "Endless" ) PORT_DIPSETTING( 0x80, DEF_STR( Normal ) ) - PORT_START /* DSW 1 */ /* Unused */ + PORT_START_TAG("DSW1") /* DSW 1 */ /* Unused */ INPUT_PORTS_END static INPUT_PORTS_START( buckrog ) - PORT_START + PORT_START_TAG("IN0") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON3 ) // Accel Hi PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) // Accel Lo PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) - PORT_START /* Inputs */ + PORT_START_TAG("IN1") /* Inputs */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) @@ -1001,7 +1001,7 @@ static INPUT_PORTS_START( buckrog ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_START /* DSW 1 */ + PORT_START_TAG("DSW1") /* DSW 1 */ PORT_DIPNAME( 0x07, 0x00, DEF_STR( Coin_A )) PORT_DIPLOCATION("SW1:1,2,3") PORT_DIPSETTING( 0x07, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x06, DEF_STR( 4C_1C ) ) @@ -1027,8 +1027,7 @@ static INPUT_PORTS_START( buckrog ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - - PORT_START /* DSW 2 */ + PORT_START_TAG("DSW2") /* DSW 2 */ PORT_DIPNAME( 0x01, 0x00, "Collisions" ) PORT_DIPLOCATION("SW2:1") PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c index fe96d5517bb..6fb6ae7f18d 100644 --- a/src/mame/drivers/twin16.c +++ b/src/mame/drivers/twin16.c @@ -218,13 +218,13 @@ static READ16_HANDLER( twin16_input_r ) { switch( offset ) { - case 0x00: return input_port_read_indexed(machine, 0); // coin - case 0x01: return input_port_read_indexed(machine, 1); // p1 - case 0x02: return input_port_read_indexed(machine, 2); // p2 - case 0x03: return input_port_read_indexed(machine, 3); // p3 (Dark Adventure) - case 0x08: return input_port_read_indexed(machine, 5); // DSW1 - case 0x09: return input_port_read_indexed(machine, 4); // DSW2 - case 0x0c: return input_port_read_indexed(machine, 6); // DSW3 + case 0x00: return input_port_read(machine, "SYSTEM"); + case 0x01: return input_port_read(machine, "P1"); + case 0x02: return input_port_read(machine, "P2"); + case 0x03: return input_port_read(machine, "P3"); + case 0x08: return input_port_read(machine, "DSW2"); + case 0x09: return input_port_read(machine, "DSW1"); + case 0x0c: return input_port_read(machine, "DSW3"); } return 0; } @@ -327,7 +327,7 @@ ADDRESS_MAP_END /* Input Ports */ -#define KONAMI_TWIN_COINAGE PORT_START \ +#define KONAMI_TWIN_COINAGE PORT_START_TAG("DSW1") \ PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) \ PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) ) \ PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) ) \ @@ -364,7 +364,7 @@ ADDRESS_MAP_END PORT_DIPSETTING( 0x00, "Disabled" ) static INPUT_PORTS_START( devilw ) - PORT_START /* 0xa0001 */ + PORT_START_TAG("SYSTEM") /* 0xa0001 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -374,7 +374,7 @@ static INPUT_PORTS_START( devilw ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* 0xa0003 */ + PORT_START_TAG("P1") /* 0xa0003 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) @@ -384,7 +384,7 @@ static INPUT_PORTS_START( devilw ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) // jump PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* 0xa0005 */ + PORT_START_TAG("P2") /* 0xa0005 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) @@ -394,12 +394,12 @@ static INPUT_PORTS_START( devilw ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* 0xa0007 */ + PORT_START_TAG("P3") /* 0xa0007 */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) KONAMI_TWIN_COINAGE - PORT_START /* DSW2 */ + PORT_START_TAG("DSW2") /* DSW2 */ PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPSETTING( 0x03, "2" ) PORT_DIPSETTING( 0x02, "3" ) @@ -415,7 +415,7 @@ static INPUT_PORTS_START( devilw ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* DSW3 0xa0019 */ + PORT_START_TAG("DSW3") /* DSW3 0xa0019 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -426,7 +426,7 @@ static INPUT_PORTS_START( devilw ) INPUT_PORTS_END static INPUT_PORTS_START( darkadv ) - PORT_START /* 0xa0001 */ + PORT_START_TAG("SYSTEM") /* 0xa0001 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) @@ -436,7 +436,7 @@ static INPUT_PORTS_START( darkadv ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE2 ) - PORT_START /* 0xa0003 */ + PORT_START_TAG("P1") /* 0xa0003 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) @@ -446,7 +446,7 @@ static INPUT_PORTS_START( darkadv ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) // dynamite PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE3 ) - PORT_START /* 0xa0005 */ + PORT_START_TAG("P2") /* 0xa0005 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) @@ -456,7 +456,7 @@ static INPUT_PORTS_START( darkadv ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* 0xa0007 */ + PORT_START_TAG("P3") /* 0xa0007 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3) @@ -466,7 +466,7 @@ static INPUT_PORTS_START( darkadv ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* Coinage */ + PORT_START_TAG("DSW1") /* Coinage */ PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x02, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x05, DEF_STR( 3C_1C ) ) @@ -486,7 +486,7 @@ static INPUT_PORTS_START( darkadv ) PORT_DIPSETTING( 0x00, "Invalid" ) PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_START /* DSW2 */ + PORT_START_TAG("DSW2") /* DSW2 */ PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPSETTING( 0x03, "2" ) PORT_DIPSETTING( 0x02, "3" ) @@ -502,7 +502,7 @@ static INPUT_PORTS_START( darkadv ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* DSW3 0xa0019 */ + PORT_START_TAG("DSW3") /* DSW3 0xa0019 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -513,7 +513,7 @@ static INPUT_PORTS_START( darkadv ) INPUT_PORTS_END static INPUT_PORTS_START( vulcan ) - PORT_START /* 0xa0001 */ + PORT_START_TAG("SYSTEM") /* 0xa0001 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -523,7 +523,7 @@ static INPUT_PORTS_START( vulcan ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* 0xa0003 */ + PORT_START_TAG("P1") /* 0xa0003 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) @@ -533,7 +533,7 @@ static INPUT_PORTS_START( vulcan ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) // missile PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* 0xa0005 */ + PORT_START_TAG("P2") /* 0xa0005 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) @@ -543,12 +543,12 @@ static INPUT_PORTS_START( vulcan ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* 0xa0007 */ + PORT_START_TAG("P3") /* 0xa0007 */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) KONAMI_TWIN_COINAGE - PORT_START /* DSW2 */ + PORT_START_TAG("DSW2") /* DSW2 */ PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPSETTING( 0x03, "2" ) PORT_DIPSETTING( 0x02, "3" ) @@ -571,7 +571,7 @@ static INPUT_PORTS_START( vulcan ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* DSW3 0xa0018 */ + PORT_START_TAG("DSW3") /* DSW3 0xa0018 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -585,7 +585,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( gradius2 ) // same as vulcan, different bonus - PORT_START /* 0xa0001 */ + PORT_START_TAG("SYSTEM") /* 0xa0001 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -595,7 +595,7 @@ static INPUT_PORTS_START( gradius2 ) // same as vulcan, different bonus PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* 0xa0003 */ + PORT_START_TAG("P1") /* 0xa0003 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) @@ -605,7 +605,7 @@ static INPUT_PORTS_START( gradius2 ) // same as vulcan, different bonus PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) // missile PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* 0xa0005 */ + PORT_START_TAG("P2") /* 0xa0005 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) @@ -615,12 +615,12 @@ static INPUT_PORTS_START( gradius2 ) // same as vulcan, different bonus PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* 0xa0007 */ + PORT_START_TAG("P3") /* 0xa0007 */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) KONAMI_TWIN_COINAGE - PORT_START /* DSW2 */ + PORT_START_TAG("DSW2") /* DSW2 */ PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPSETTING( 0x03, "2" ) PORT_DIPSETTING( 0x02, "3" ) @@ -643,7 +643,7 @@ static INPUT_PORTS_START( gradius2 ) // same as vulcan, different bonus PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* DSW3 0xa0018 */ + PORT_START_TAG("DSW3") /* DSW3 0xa0018 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -656,7 +656,7 @@ static INPUT_PORTS_START( gradius2 ) // same as vulcan, different bonus INPUT_PORTS_END static INPUT_PORTS_START( fround ) - PORT_START /* 0xa0001 */ + PORT_START_TAG("SYSTEM") /* 0xa0001 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -666,7 +666,7 @@ static INPUT_PORTS_START( fround ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* 0xa0003 */ + PORT_START_TAG("P1") /* 0xa0003 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) @@ -676,7 +676,7 @@ static INPUT_PORTS_START( fround ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) // defend PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* 0xa0005 */ + PORT_START_TAG("P2") /* 0xa0005 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) @@ -686,12 +686,12 @@ static INPUT_PORTS_START( fround ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_START /* 0xa0007 */ + PORT_START_TAG("P3") /* 0xa0007 */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) KONAMI_TWIN_COINAGE - PORT_START /* DSW2 */ + PORT_START_TAG("DSW2") /* DSW2 */ PORT_DIPNAME( 0x03, 0x02, "Energy" ) PORT_DIPSETTING( 0x03, "18" ) PORT_DIPSETTING( 0x02, "20" ) @@ -707,7 +707,7 @@ static INPUT_PORTS_START( fround ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* DSW3 0xa0018 */ + PORT_START_TAG("DSW3") /* DSW3 0xa0018 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -718,7 +718,7 @@ static INPUT_PORTS_START( fround ) INPUT_PORTS_END static INPUT_PORTS_START( miaj ) - PORT_START /* 0xa0001 */ + PORT_START_TAG("SYSTEM") /* 0xa0001 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -728,7 +728,7 @@ static INPUT_PORTS_START( miaj ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* 0xa0003 */ + PORT_START_TAG("P1") /* 0xa0003 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) @@ -738,7 +738,7 @@ static INPUT_PORTS_START( miaj ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) // choice PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* 0xa0005 */ + PORT_START_TAG("P2") /* 0xa0005 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) @@ -748,12 +748,12 @@ static INPUT_PORTS_START( miaj ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* 0xa0007 */ + PORT_START_TAG("P3") /* 0xa0007 */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) KONAMI_TWIN_COINAGE - PORT_START /* DSW2 */ + PORT_START_TAG("DSW2") /* DSW2 */ PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPSETTING( 0x03, "2" ) PORT_DIPSETTING( 0x02, "3" ) @@ -774,7 +774,7 @@ static INPUT_PORTS_START( miaj ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* DSW3 0xa0018 */ + PORT_START_TAG("DSW3") /* DSW3 0xa0018 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -787,7 +787,7 @@ static INPUT_PORTS_START( miaj ) INPUT_PORTS_END static INPUT_PORTS_START( cuebrckj ) - PORT_START /* 0xa0001 */ + PORT_START_TAG("SYSTEM") /* 0xa0001 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -797,7 +797,7 @@ static INPUT_PORTS_START( cuebrckj ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* 0xa0003 */ + PORT_START_TAG("P1") /* 0xa0003 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) @@ -807,7 +807,7 @@ static INPUT_PORTS_START( cuebrckj ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) // stop PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* 0xa0005 */ + PORT_START_TAG("P2") /* 0xa0005 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) @@ -817,12 +817,12 @@ static INPUT_PORTS_START( cuebrckj ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START /* 0xa0007 */ + PORT_START_TAG("P3") /* 0xa0007 */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) KONAMI_TWIN_COINAGE - PORT_START /* DSW2 */ + PORT_START_TAG("DSW2") /* DSW2 */ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPSETTING( 0x03, "1" ) PORT_DIPSETTING( 0x02, "2" ) @@ -845,7 +845,7 @@ static INPUT_PORTS_START( cuebrckj ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START /* DSW3 0xa0018 */ + PORT_START_TAG("DSW3") /* DSW3 0xa0018 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) diff --git a/src/mame/drivers/tx1.c b/src/mame/drivers/tx1.c index e3db7899db0..f037a7a5bd5 100644 --- a/src/mame/drivers/tx1.c +++ b/src/mame/drivers/tx1.c @@ -113,7 +113,7 @@ static WRITE16_HANDLER( z80_shared_w ) *************************************/ static INPUT_PORTS_START( tx1 ) -PORT_START_TAG("DSW") + PORT_START_TAG("DSW") PORT_DIPNAME( 0x001c, 0x0000, DEF_STR( Coin_A ) ) PORT_DIPSETTING( 0x0008, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x0004, DEF_STR( 2C_1C ) ) @@ -160,22 +160,22 @@ PORT_START_TAG("DSW") PORT_DIPSETTING( 0xc000, "6" ) PORT_DIPSETTING( 0xe000, "7" ) -PORT_START_TAG("AN_STEERING") + PORT_START_TAG("AN_STEERING") PORT_BIT( 0x0f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) -PORT_START_TAG("AN_ACCELERATOR") + PORT_START_TAG("AN_ACCELERATOR") PORT_BIT( 0x1f, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0x1f) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) -PORT_START_TAG("AN_BRAKE") + PORT_START_TAG("AN_BRAKE") PORT_BIT( 0x1f, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0x00,0x1f) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) -PORT_START_TAG("PPI_PORTC") + PORT_START_TAG("PPI_PORTC") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_SERVICE( 0x04, IP_ACTIVE_HIGH ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Gear Change") PORT_CODE(KEYCODE_SPACE) PORT_TOGGLE -PORT_START_TAG("PPI_PORTD") + PORT_START_TAG("PPI_PORTD") /* Wire jumper setting on sound PCB */ PORT_DIPNAME( 0xf0, 0x80, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x10, "1" ) @@ -218,7 +218,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( buggyboy ) -PORT_START_TAG("DSW") + PORT_START_TAG("DSW") /* Dipswitch 0 is unconnected */ PORT_DIPNAME( 0x0003, 0x0003, "Do not change 2" ) PORT_DIPSETTING( 0x0000, "0" ) @@ -272,14 +272,14 @@ PORT_START_TAG("DSW") PORT_DIPSETTING( 0x0600, "6" ) PORT_DIPSETTING( 0x0700, "7" ) -PORT_START_TAG("PPI_PORTA") + PORT_START_TAG("PPI_PORTA") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Gear Change") PORT_CODE(KEYCODE_SPACE) PORT_TOGGLE PORT_SERVICE( 0x80, IP_ACTIVE_HIGH ) -PORT_START_TAG("PPI_PORTC") + PORT_START_TAG("PPI_PORTC") PORT_DIPNAME( 0xff, 0x80, "Sound PCB Jumper:" ) PORT_DIPSETTING( 0x00, "0" ) PORT_DIPSETTING( 0x01, "1" ) @@ -291,18 +291,18 @@ PORT_START_TAG("PPI_PORTC") PORT_DIPSETTING( 0x40, "Buggy Boy/Taito" ) PORT_DIPSETTING( 0x80, "Buggy Boy/Tatsumi" ) -PORT_START_TAG("AN_STEERING") + PORT_START_TAG("AN_STEERING") PORT_BIT( 0x0f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(25) -PORT_START_TAG("AN_ACCELERATOR") + PORT_START_TAG("AN_ACCELERATOR") PORT_BIT( 0x1f, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0x1f) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) -PORT_START_TAG("AN_BRAKE") + PORT_START_TAG("AN_BRAKE") PORT_BIT( 0x1f, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0x00,0x1f) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) INPUT_PORTS_END static INPUT_PORTS_START( buggybjr ) -PORT_START_TAG("DSW") + PORT_START_TAG("DSW") /* Dipswitch 0 is unconnected */ PORT_DIPNAME( 0x0003, 0x0003, "Do not change 2" ) PORT_DIPSETTING( 0x0000, "0" ) @@ -356,15 +356,15 @@ PORT_START_TAG("DSW") PORT_DIPSETTING( 0x0600, "6" ) PORT_DIPSETTING( 0x0700, "7" ) -PORT_START_TAG("YM2149_IC19_A") + PORT_START_TAG("YM2149_IC19_A") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Gear Change") PORT_CODE(KEYCODE_SPACE) PORT_TOGGLE PORT_SERVICE( 0x80, IP_ACTIVE_HIGH ) -/* Wire jumper setting on sound PCB */ -PORT_START_TAG("YM2149_IC19_B") + /* Wire jumper setting on sound PCB */ + PORT_START_TAG("YM2149_IC19_B") PORT_DIPNAME( 0xff, 0x80, "Sound PCB Jumper:" ) PORT_DIPSETTING( 0x00, "0" ) PORT_DIPSETTING( 0x01, "1" ) @@ -376,19 +376,19 @@ PORT_START_TAG("YM2149_IC19_B") PORT_DIPSETTING( 0x40, "Buggy Boy/Taito" ) PORT_DIPSETTING( 0x80, "Buggy Boy/Tatsumi" ) -PORT_START_TAG("AN_STEERING") + PORT_START_TAG("AN_STEERING") PORT_BIT( 0x0f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(25) -PORT_START_TAG("AN_ACCELERATOR") + PORT_START_TAG("AN_ACCELERATOR") PORT_BIT( 0x1f, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00, 0x1f) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) -PORT_START_TAG("AN_BRAKE") + PORT_START_TAG("AN_BRAKE") PORT_BIT( 0x1f, 0x00, IPT_PEDAL2 ) PORT_MINMAX(0x00, 0x1f) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) INPUT_PORTS_END static READ16_HANDLER( dipswitches_r ) { - return (input_port_read_indexed(machine, 0) & 0xfffe) | ts; + return (input_port_read(machine, "DSW") & 0xfffe) | ts; } /* diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h index 07ee1355c22..a9c1289c765 100644 --- a/src/mame/includes/system16.h +++ b/src/mame/includes/system16.h @@ -139,74 +139,6 @@ extern MACHINE_RESET( sys16_onetime ); GFXDECODE_EXTERN( sys16 ); - -#define SYS16_JOY1 PORT_START_TAG("IN0")\ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) \ - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) \ - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) \ - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY \ - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY \ - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY \ - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY - -#define SYS16_JOY2 PORT_START_TAG("IN1") \ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL \ - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL \ - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL \ - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL \ - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL \ - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL \ - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL - -#define SYS16_SERVICE PORT_START_TAG("IN2") \ - PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) \ - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) \ - PORT_SERVICE_NO_TOGGLE(0x04, IP_ACTIVE_LOW) \ - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE1 ) \ - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START1 ) \ - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) \ - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - -#define SYS16_COINAGE PORT_START_TAG("DSW1") \ - PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4") \ - PORT_DIPSETTING( 0x07, DEF_STR( 4C_1C ) ) \ - PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) ) \ - PORT_DIPSETTING( 0x09, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0x05, "2 Coins/1 Credit 5/3 6/4" ) \ - PORT_DIPSETTING( 0x04, "2 Coins/1 Credit 4/3" ) \ - PORT_DIPSETTING( 0x0f, DEF_STR( 1C_1C ) ) \ - PORT_DIPSETTING( 0x01, "1 Coin/1 Credit 2/3" ) \ - PORT_DIPSETTING( 0x02, "1 Coin/1 Credit 4/5" ) \ - PORT_DIPSETTING( 0x03, "1 Coin/1 Credit 5/6" ) \ - PORT_DIPSETTING( 0x06, DEF_STR( 2C_3C ) ) \ - PORT_DIPSETTING( 0x0e, DEF_STR( 1C_2C ) ) \ - PORT_DIPSETTING( 0x0d, DEF_STR( 1C_3C ) ) \ - PORT_DIPSETTING( 0x0c, DEF_STR( 1C_4C ) ) \ - PORT_DIPSETTING( 0x0b, DEF_STR( 1C_5C ) ) \ - PORT_DIPSETTING( 0x0a, DEF_STR( 1C_6C ) ) \ - PORT_DIPSETTING( 0x00, "Free Play (if Coin B too) or 1/1" ) \ - PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:5,6,7,8") \ - PORT_DIPSETTING( 0x70, DEF_STR( 4C_1C ) ) \ - PORT_DIPSETTING( 0x80, DEF_STR( 3C_1C ) ) \ - PORT_DIPSETTING( 0x90, DEF_STR( 2C_1C ) ) \ - PORT_DIPSETTING( 0x50, "2 Coins/1 Credit 5/3 6/4" ) \ - PORT_DIPSETTING( 0x40, "2 Coins/1 Credit 4/3" ) \ - PORT_DIPSETTING( 0xf0, DEF_STR( 1C_1C ) ) \ - PORT_DIPSETTING( 0x10, "1 Coin/1 Credit 2/3" ) \ - PORT_DIPSETTING( 0x20, "1 Coin/1 Credit 4/5" ) \ - PORT_DIPSETTING( 0x30, "1 Coin/1 Credit 5/6" ) \ - PORT_DIPSETTING( 0x60, DEF_STR( 2C_3C ) ) \ - PORT_DIPSETTING( 0xe0, DEF_STR( 1C_2C ) ) \ - PORT_DIPSETTING( 0xd0, DEF_STR( 1C_3C ) ) \ - PORT_DIPSETTING( 0xc0, DEF_STR( 1C_4C ) ) \ - PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ) ) \ - PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) ) \ - PORT_DIPSETTING( 0x00, "Free Play (if Coin A too) or 1/1" ) - - /*----------- defined in video/system16.c -----------*/ /* video hardware */ diff --git a/src/mame/machine/scramble.c b/src/mame/machine/scramble.c index 98a2acde460..904e90ca1f4 100644 --- a/src/mame/machine/scramble.c +++ b/src/mame/machine/scramble.c @@ -65,24 +65,24 @@ MACHINE_RESET( explorer ) static READ8_HANDLER( ckongs_input_port_1_r ) { - return (input_port_read_indexed(machine, 1) & 0xfc) | ((input_port_read_indexed(machine, 2) & 0x06) >> 1); + return (input_port_read(machine, "IN1") & 0xfc) | ((input_port_read(machine, "IN2") & 0x06) >> 1); } static READ8_HANDLER( ckongs_input_port_2_r ) { - return (input_port_read_indexed(machine, 2) & 0xf9) | ((input_port_read_indexed(machine, 1) & 0x03) << 1); + return (input_port_read(machine, "IN2") & 0xf9) | ((input_port_read(machine, "IN1") & 0x03) << 1); } /* the coinage DIPs are spread accross two input ports */ static READ8_HANDLER( stratgyx_input_port_2_r ) { - return (input_port_read_indexed(machine, 2) & ~0x06) | ((input_port_read_indexed(machine, 4) << 1) & 0x06); + return (input_port_read(machine, "IN2") & ~0x06) | ((input_port_read(machine, "IN4") << 1) & 0x06); } static READ8_HANDLER( stratgyx_input_port_3_r ) { - return (input_port_read_indexed(machine, 3) & ~0x03) | ((input_port_read_indexed(machine, 4) >> 2) & 0x03); + return (input_port_read(machine, "IN3") & ~0x03) | ((input_port_read(machine, "IN4") >> 2) & 0x03); } @@ -98,7 +98,7 @@ static READ8_HANDLER( darkplnt_input_port_1_r ) 0x27, 0x26, 0x24, 0x25, 0x05, 0x04, 0x06, 0x07 }; UINT8 val; - val = input_port_read_indexed(machine, 1); + val = input_port_read(machine, "IN1"); return ((val & 0x03) | (remap[val >> 2] << 2)); } diff --git a/src/mame/machine/seicop.c b/src/mame/machine/seicop.c index 2a42dfd3c24..de5279dbeb9 100644 --- a/src/mame/machine/seicop.c +++ b/src/mame/machine/seicop.c @@ -765,11 +765,11 @@ READ16_HANDLER( copdxbl_0_r ) //case (0x5b4/2): // return cop_mcu_ram[offset]; - case (0x700/2): return input_port_read_indexed(machine,1); - case (0x704/2): return input_port_read_indexed(machine,2); - case (0x708/2): return input_port_read_indexed(machine,4); - case (0x70c/2): return input_port_read_indexed(machine,3); - case (0x71c/2): return input_port_read_indexed(machine,5); + case (0x700/2): return input_port_read(machine, "DSW1"); + case (0x704/2): return input_port_read(machine, "PLAYERS12"); + case (0x708/2): return input_port_read(machine, "PLAYERS34"); + case (0x70c/2): return input_port_read(machine, "SYSTEM"); + case (0x71c/2): return input_port_read(machine, "DSW2"); } } @@ -1315,10 +1315,10 @@ READ16_HANDLER( heatbrl_mcu_r ) case (0x3d4/2): return seibu_main_word_r(machine,5,0xffff); /* Inputs */ - case (0x340/2): return input_port_read_indexed(machine,1); - case (0x344/2): return input_port_read_indexed(machine,2); - case (0x348/2): return input_port_read_indexed(machine,4); - case (0x34c/2): return input_port_read_indexed(machine,3); + case (0x340/2): return input_port_read(machine, "DSW1"); + case (0x344/2): return input_port_read(machine, "PLAYERS12"); + case (0x348/2): return input_port_read(machine, "PLAYERS34"); + case (0x34c/2): return input_port_read(machine, "SYSTEM"); } } @@ -1421,12 +1421,12 @@ READ16_HANDLER( cupsoc_mcu_r ) /* returning 0xffff for some inputs for now, breaks coinage but allows cupsoc to boot */ - case (0x300/2): return input_port_read_indexed(machine,1); - case (0x304/2): return input_port_read_indexed(machine,2); - case (0x308/2): return input_port_read_indexed(machine,4); - case (0x30c/2): return input_port_read_indexed(machine,3); + case (0x300/2): return input_port_read(machine, "DSW1"); + case (0x304/2): return input_port_read(machine, "PLAYERS12"); + case (0x308/2): return input_port_read(machine, "PLAYERS34"); + case (0x30c/2): return input_port_read(machine, "SYSTEM"); case (0x314/2): return 0xffff; - case (0x31c/2): return input_port_read_indexed(machine,5); + case (0x31c/2): return input_port_read(machine, "DSW2"); case (0x340/2): return 0xffff; case (0x344/2): return 0xffff; @@ -1573,10 +1573,10 @@ READ16_HANDLER( godzilla_mcu_r ) case (0x314/2): return seibu_main_word_r(machine,5,0xffff); /* Inputs */ - case (0x340/2): return input_port_read_indexed(machine,1); - case (0x344/2): return input_port_read_indexed(machine,2); - case (0x348/2): return input_port_read_indexed(machine,4); - case (0x34c/2): return input_port_read_indexed(machine,3); + case (0x340/2): return input_port_read(machine, "DSW1"); + case (0x344/2): return input_port_read(machine, "PLAYERS12"); + case (0x348/2): return input_port_read(machine, "PLAYERS34"); + case (0x34c/2): return input_port_read(machine, "SYSTEM"); } } @@ -1624,11 +1624,11 @@ READ16_HANDLER( denjinmk_mcu_r ) case (0x314/2): return seibu_main_word_r(machine,5,0xffff); /* Inputs */ - case (0x340/2): return input_port_read_indexed(machine,1); - case (0x344/2): return input_port_read_indexed(machine,2); - case (0x348/2): return input_port_read_indexed(machine,4); - case (0x34c/2): return input_port_read_indexed(machine,3); - case (0x35c/2): return input_port_read_indexed(machine,5); + case (0x340/2): return input_port_read(machine, "DSW1"); + case (0x344/2): return input_port_read(machine, "PLAYERS12"); + case (0x348/2): return input_port_read(machine, "PLAYERS34"); + case (0x34c/2): return input_port_read(machine, "SYSTEM"); + case (0x35c/2): return input_port_read(machine, "DSW2"); } } @@ -1696,11 +1696,11 @@ READ16_HANDLER( sdgndmrb_mcu_r ) case (0x314/2): return seibu_main_word_r(machine,5,0xffff); /* Inputs */ - case (0x340/2): return input_port_read_indexed(machine,1); - case (0x344/2): return input_port_read_indexed(machine,2); - case (0x348/2): return input_port_read_indexed(machine,4); - case (0x34c/2): return input_port_read_indexed(machine,3); - case (0x35c/2): return input_port_read_indexed(machine,5); + case (0x340/2): return input_port_read(machine, "DSW1"); + case (0x344/2): return input_port_read(machine, "PLAYERS12"); + case (0x348/2): return input_port_read(machine, "PLAYERS34"); + case (0x34c/2): return input_port_read(machine, "SYSTEM"); + case (0x35c/2): return input_port_read(machine, "DSW2"); } } @@ -1907,10 +1907,10 @@ READ16_HANDLER( legionna_mcu_r ) case (0x314/2): return seibu_main_word_r(machine,5,0xffff); /* Inputs */ - case (0x340/2): return input_port_read_indexed(machine,1); - case (0x344/2): return input_port_read_indexed(machine,2); - case (0x348/2): return input_port_read_indexed(machine,0); - case (0x34c/2): return input_port_read_indexed(machine,3); + case (0x340/2): return input_port_read(machine, "DSW1"); + case (0x344/2): return input_port_read(machine, "PLAYERS12"); + case (0x348/2): return input_port_read(machine, "COIN"); + case (0x34c/2): return input_port_read(machine, "SYSTEM"); } } @@ -1986,9 +1986,9 @@ READ16_HANDLER( raiden2_mcu_r ) return generic_cop_r(machine, offset, mem_mask); break; - case (0x340/2): return input_port_read_indexed(machine, 3) | (input_port_read_indexed(machine, 4) << 8); - case (0x344/2): return input_port_read_indexed(machine, 1) | (input_port_read_indexed(machine, 2) << 8); - case (0x34c/2): return input_port_read_indexed(machine, 5) | 0xff00; + case (0x340/2): return input_port_read(machine, "DSWA") | (input_port_read(machine, "DSWB") << 8); + case (0x344/2): return input_port_read(machine, "P1") | (input_port_read(machine, "P2") << 8); + case (0x34c/2): return input_port_read(machine, "SYSTEM") | 0xff00; /* Inputs */ case (0x308/2): return seibu_main_word_r(machine,2,0xffff); diff --git a/src/mame/machine/simpsons.c b/src/mame/machine/simpsons.c index 6c200666b7d..2c5beee7f79 100644 --- a/src/mame/machine/simpsons.c +++ b/src/mame/machine/simpsons.c @@ -53,7 +53,7 @@ READ8_HANDLER( simpsons_eeprom_r ) res |= 0x20;//konami_eeprom_ack() << 5; /* add the ack */ - res |= input_port_read_indexed(machine, 5 ) & 1; /* test switch */ + res |= input_port_read(machine, "TEST") & 1; /* test switch */ if (init_eeprom_count) { diff --git a/src/mame/machine/starwars.c b/src/mame/machine/starwars.c index 9c5c1b81333..1d845d7422e 100644 --- a/src/mame/machine/starwars.c +++ b/src/mame/machine/starwars.c @@ -128,7 +128,7 @@ WRITE8_HANDLER( starwars_out_w ) READ8_HANDLER( starwars_input_1_r ) { - int x = input_port_read_indexed(machine, 1); + int x = input_port_read(machine, "IN1"); /* set the matrix processor flag */ if (math_run) @@ -157,11 +157,11 @@ READ8_HANDLER( starwars_adc_r ) { /* pitch */ if (control_num == kPitch) - return input_port_read_indexed(machine, 4); + return input_port_read(machine, "STICKY"); /* yaw */ else if (control_num == kYaw) - return input_port_read_indexed(machine, 5); + return input_port_read(machine, "STICKX"); /* default to unused thrust */ else diff --git a/src/mame/machine/stfight.c b/src/mame/machine/stfight.c index e33f2733502..a22eea19acd 100644 --- a/src/mame/machine/stfight.c +++ b/src/mame/machine/stfight.c @@ -119,7 +119,7 @@ INTERRUPT_GEN( stfight_vb_interrupt ) // Perhaps define dipswitches as active low? READ8_HANDLER( stfight_dsw_r ) { - return( ~input_port_read_indexed(machine, 3+offset ) ); + return( ~input_port_read(machine, offset ? "DSW1" : "DSW0") ); } static int stfight_coin_mech_query_active = 0; @@ -146,7 +146,7 @@ READ8_HANDLER( stfight_coin_r ) * since it's read by the 30Hz interrupt ISR */ - coin_mech_data = input_port_read_indexed(machine, 5 ); + coin_mech_data = input_port_read(machine, "COIN"); for( i=0; i<2; i++ ) { diff --git a/src/mame/machine/subs.c b/src/mame/machine/subs.c index ae64cf174b2..0c1846053c1 100644 --- a/src/mame/machine/subs.c +++ b/src/mame/machine/subs.c @@ -29,7 +29,7 @@ subs_interrupt INTERRUPT_GEN( subs_interrupt ) { /* only do NMI interrupt if not in TEST mode */ - if ((input_port_read_indexed(machine, 2) & 0x40)==0x40) + if ((input_port_read(machine, "IN1") & 0x40)==0x40) cpunum_set_input_line(machine, 0,INPUT_LINE_NMI,PULSE_LINE); } @@ -46,7 +46,7 @@ static int subs_steering_1(running_machine *machine) int this_val; int delta; - this_val=input_port_read_indexed(machine, 3); + this_val=input_port_read(machine, "DIAL2"); delta=this_val-last_val; last_val=this_val; @@ -75,7 +75,7 @@ static int subs_steering_2(running_machine *machine) int this_val; int delta; - this_val=input_port_read_indexed(machine, 4); + this_val=input_port_read(machine, "DIAL1"); delta=this_val-last_val; last_val=this_val; @@ -112,7 +112,7 @@ subs_control_r ***************************************************************************/ READ8_HANDLER( subs_control_r ) { - int inport = input_port_read_indexed(machine, 1); + int inport = input_port_read(machine, "IN0"); switch (offset & 0x07) { @@ -134,7 +134,7 @@ subs_coin_r ***************************************************************************/ READ8_HANDLER( subs_coin_r ) { - int inport = input_port_read_indexed(machine, 2); + int inport = input_port_read(machine, "IN1"); switch (offset & 0x07) { @@ -156,7 +156,7 @@ subs_options_r ***************************************************************************/ READ8_HANDLER( subs_options_r ) { - int opts = input_port_read_indexed(machine, 0); + int opts = input_port_read(machine, "DSW"); switch (offset & 0x03) { diff --git a/src/mame/machine/tait8741.c b/src/mame/machine/tait8741.c index 694f854adbf..5189c159cd9 100644 --- a/src/mame/machine/tait8741.c +++ b/src/mame/machine/tait8741.c @@ -469,7 +469,7 @@ static void josvolly_8741_w(running_machine *machine,int num,int offset,int data break; case 2: #if 1 - mcu->rxd = input_port_read_indexed(machine, 4); /* DSW2 */ + mcu->rxd = input_port_read(machine, "DSW2"); mcu->sts |= 0x01; /* RD ready */ #endif break; diff --git a/src/mame/machine/taitosj.c b/src/mame/machine/taitosj.c index 758fe9116f3..f742d7af2d6 100644 --- a/src/mame/machine/taitosj.c +++ b/src/mame/machine/taitosj.c @@ -316,5 +316,5 @@ WRITE8_HANDLER( alpinea_bankswitch_w ) READ8_HANDLER( alpine_port_2_r ) { - return input_port_read_indexed(machine,2) | protection_value; + return input_port_read(machine, "IN2") | protection_value; } diff --git a/src/mame/machine/tatsumi.c b/src/mame/machine/tatsumi.c index 50a95b0c740..45bf566aa26 100644 --- a/src/mame/machine/tatsumi.c +++ b/src/mame/machine/tatsumi.c @@ -131,8 +131,8 @@ WRITE16_HANDLER(apache3_z80_w) READ8_HANDLER( apache3_adc_r ) { if (apache3_adc==0) - return input_port_read_indexed(machine, 1); - return input_port_read_indexed(machine, 2); + return input_port_read(machine, "STICKX"); + return input_port_read(machine, "STICKY"); } WRITE8_HANDLER( apache3_adc_w ) diff --git a/src/mame/machine/tnzs.c b/src/mame/machine/tnzs.c index 1ab5955ce48..2fbfcdb60c9 100644 --- a/src/mame/machine/tnzs.c +++ b/src/mame/machine/tnzs.c @@ -77,9 +77,9 @@ READ8_HANDLER( tnzs_port1_r ) switch (tnzs_input_select & 0x0f) { - case 0x0a: data = input_port_read_indexed(machine, 4); break; - case 0x0c: data = input_port_read_indexed(machine, 2); break; - case 0x0d: data = input_port_read_indexed(machine, 3); break; + case 0x0a: data = input_port_read(machine, "IN2"); break; + case 0x0c: data = input_port_read(machine, "IN0"); break; + case 0x0d: data = input_port_read(machine, "IN1"); break; default: data = 0xff; break; } @@ -90,7 +90,7 @@ READ8_HANDLER( tnzs_port1_r ) READ8_HANDLER( tnzs_port2_r ) { - int data = input_port_read_indexed(machine, 4); + int data = input_port_read(machine, "IN2"); // logerror("I8742:%04x Read %02x from port 2\n", activecpu_get_previouspc(), data); @@ -117,7 +117,7 @@ READ8_HANDLER( arknoid2_sh_f000_r ) // logerror("PC %04x: read input %04x\n", activecpu_get_pc(), 0xf000 + offset); - val = input_port_read_indexed(machine, 7 + offset/2); + val = input_port_read_safe(machine, (offset/2) ? "AN2" : "AN1", 0); if (offset & 1) { return ((val >> 8) & 0xff); @@ -247,7 +247,7 @@ static READ8_HANDLER( mcu_arknoid2_r ) } else return mcu_credits; } - else return input_port_read_indexed(machine, 2); /* buttons */ + else return input_port_read(machine, "IN0"); /* buttons */ default: logerror("error, unknown mcu command\n"); @@ -338,16 +338,16 @@ static READ8_HANDLER( mcu_extrmatn_r ) switch (mcu_command) { case 0x01: - return input_port_read_indexed(machine, 2) ^ 0xff; /* player 1 joystick + buttons */ + return input_port_read(machine, "IN0") ^ 0xff; /* player 1 joystick + buttons */ case 0x02: - return input_port_read_indexed(machine, 3) ^ 0xff; /* player 2 joystick + buttons */ + return input_port_read(machine, "IN1") ^ 0xff; /* player 2 joystick + buttons */ case 0x1a: - return (input_port_read_indexed(machine, 5) | (input_port_read_indexed(machine, 6) << 1)); + return (input_port_read(machine, "COIN1") | (input_port_read(machine, "COIN2") << 1)); case 0x21: - return input_port_read_indexed(machine, 4) & 0x0f; + return input_port_read(machine, "IN2") & 0x0f; case 0x41: return mcu_credits; @@ -375,7 +375,7 @@ static READ8_HANDLER( mcu_extrmatn_r ) else return mcu_credits; } /* buttons */ - else return ((input_port_read_indexed(machine, 2) & 0xf0) | (input_port_read_indexed(machine, 3) >> 4)) ^ 0xff; + else return ((input_port_read(machine, "IN0") & 0xf0) | (input_port_read(machine, "IN1") >> 4)) ^ 0xff; default: logerror("error, unknown mcu command\n"); @@ -660,9 +660,9 @@ INTERRUPT_GEN( arknoid2_interrupt ) case MCU_DRTOPPEL: case MCU_PLUMPOP: coin = 0; - coin |= ((input_port_read_indexed(machine, 5) & 1) << 0); - coin |= ((input_port_read_indexed(machine, 6) & 1) << 1); - coin |= ((input_port_read_indexed(machine, 4) & 3) << 2); + coin |= ((input_port_read(machine, "COIN1") & 1) << 0); + coin |= ((input_port_read(machine, "COIN2") & 1) << 1); + coin |= ((input_port_read(machine, "IN2") & 3) << 2); coin ^= 0x0c; mcu_handle_coins(coin); break; diff --git a/src/mame/machine/toaplan1.c b/src/mame/machine/toaplan1.c index 5c9d16d5a9d..c385c5e509c 100644 --- a/src/mame/machine/toaplan1.c +++ b/src/mame/machine/toaplan1.c @@ -159,14 +159,14 @@ READ16_HANDLER( samesame_port_6_word_r ) { /* Bit 0x80 is secondary CPU (HD647180) ready signal */ logerror("PC:%04x Warning !!! IO reading from $14000a\n",activecpu_get_previouspc()); - return (0x80 | input_port_read_indexed(machine,6)) & 0xff; + return (0x80 | input_port_read(machine, "TJUMP")) & 0xff; } READ16_HANDLER( vimana_input_port_5_word_r ) { int data, p; - p = input_port_read_indexed(machine,5); + p = input_port_read(machine, "SYSTEM"); vimana_latch ^= p; data = (vimana_latch & p ); diff --git a/src/mame/video/namcofl.c b/src/mame/video/namcofl.c index 1a0192dd1e0..fb507c6cab7 100644 --- a/src/mame/video/namcofl.c +++ b/src/mame/video/namcofl.c @@ -181,7 +181,7 @@ VIDEO_START( namcofl ) { credits1 = credits2 = 0; old_coin_state = 0x00; - //input_port_read_indexed(machine, 3)&0x30; + //input_port_read(machine, "IN3") & 0x30; namco_tilemap_init( NAMCONB1_TILEGFX, memory_region(machine, NAMCONB1_TILEMASKREGION), TilemapCB ); namco_obj_init(NAMCONB1_SPRITEGFX,0x0,FLobjcode2tile); diff --git a/src/mame/video/rastan.c b/src/mame/video/rastan.c index 039b8ebb83c..892a2b01a93 100644 --- a/src/mame/video/rastan.c +++ b/src/mame/video/rastan.c @@ -129,9 +129,8 @@ VIDEO_UPDATE( opwolf ) PC090OJ_draw_sprites(screen->machine,bitmap,cliprect,1); -// if (input_port_read_indexed(machine,5)) - -// popmessage("%d %d",input_port_read_indexed(machine,5),input_port_read_indexed(machine,6)); +// if (input_port_read(machine, "P1X")) +// popmessage("%d %d", input_port_read(machine, "P1X"), input_port_read(machine, "P1Y")); return 0; } diff --git a/src/mame/video/superqix.c b/src/mame/video/superqix.c index 9613da3442c..a1e9606769c 100644 --- a/src/mame/video/superqix.c +++ b/src/mame/video/superqix.c @@ -235,14 +235,14 @@ VIDEO_UPDATE( pbillian ) { int curr_power; - curr_power = ((input_port_read_indexed(screen->machine, 4)&0x3f)*100)/0x3f; + curr_power = ((input_port_read(screen->machine, "PADDLE1") & 0x3f) * 100) / 0x3f; if (last_power[0] != curr_power) { popmessage ("Power %d%%", curr_power); last_power[0] = curr_power; } - curr_power = ((input_port_read_indexed(screen->machine, 6)&0x3f)*100)/0x3f; + curr_power = ((input_port_read(screen->machine, "PADDLE2") & 0x3f) * 100) / 0x3f; if (last_power[1] != curr_power) { popmessage ("Power %d%%", curr_power); diff --git a/src/mame/video/thepit.c b/src/mame/video/thepit.c index 75f7e4bb5dd..5f536142edc 100644 --- a/src/mame/video/thepit.c +++ b/src/mame/video/thepit.c @@ -233,11 +233,11 @@ READ8_HANDLER( thepit_input_port_0_r ) horizontal flip switch. (This is how the real PCB does it) */ if (thepit_flip_screen_x) { - return input_port_read_indexed(machine, 3); + return input_port_read(machine, "IN2"); } else { - return input_port_read_indexed(machine, 0); + return input_port_read(machine, "IN0"); } } diff --git a/src/mame/video/travrusa.c b/src/mame/video/travrusa.c index fa1dad7fff7..6d4babcebd8 100644 --- a/src/mame/video/travrusa.c +++ b/src/mame/video/travrusa.c @@ -274,7 +274,7 @@ WRITE8_HANDLER( travrusa_scroll_x_high_w ) WRITE8_HANDLER( travrusa_flipscreen_w ) { /* screen flip is handled both by software and hardware */ - data ^= ~input_port_read_indexed(machine, 4) & 1; + data ^= ~input_port_read(machine, "DSW2") & 1; flip_screen_set(data & 1); |
