From 453e6ed1b3ab537f7246c81784e8d1cebfb02ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Banaan=20Ananas?= Date: Sat, 7 Jul 2012 14:54:27 +0000 Subject: [PATCH] noticed that raiden2 hw has coin inputs active low instead of default high + added zeroteam coin 3/4 (note: does not have 4 coincounters, so seibu.c doesn't need an update) --- src/mame/audio/seibu.h | 7 ++++++- src/mame/drivers/r2dx_v33.c | 5 ++--- src/mame/drivers/raiden2.c | 13 ++++++++----- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/mame/audio/seibu.h b/src/mame/audio/seibu.h index 17bd864c1ae..2a5326f16a7 100644 --- a/src/mame/audio/seibu.h +++ b/src/mame/audio/seibu.h @@ -81,10 +81,15 @@ extern const seibu_adpcm_interface seibu_adpcm2_intf; /**************************************************************************/ #define SEIBU_COIN_INPUTS \ - PORT_START("COIN") \ + PORT_START("COIN") \ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(4) \ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(4) +#define SEIBU_COIN_INPUTS_INVERT \ + PORT_START("COIN") \ + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(4) \ + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(4) + #define SEIBU_SOUND_SYSTEM_CPU(freq) \ MCFG_CPU_ADD("audiocpu", Z80, freq) \ diff --git a/src/mame/drivers/r2dx_v33.c b/src/mame/drivers/r2dx_v33.c index a265397d123..032da6dd2e3 100644 --- a/src/mame/drivers/r2dx_v33.c +++ b/src/mame/drivers/r2dx_v33.c @@ -544,7 +544,7 @@ static GFXDECODE_START( rdx_v33 ) GFXDECODE_END static INPUT_PORTS_START( rdx_v33 ) - PORT_START("SYSTEM") + PORT_START("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 ) @@ -580,8 +580,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( nzerotea ) - - SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */ + SEIBU_COIN_INPUTS_INVERT /* coin inputs read through sound cpu */ PORT_START("SYSTEM") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 ) diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c index 432a19151b5..7b202660a15 100644 --- a/src/mame/drivers/raiden2.c +++ b/src/mame/drivers/raiden2.c @@ -1,6 +1,5 @@ /* Seibu Protected 1993-94 era hardware, V30 based (sequel to the 68k based hardware) TODO: figure out the rest of the protection - TODO: Zero Team needs COIN3 and COIN4 found and hooked up, they may be on the sound cpu TODO: Zero Team presumably needs additive blending on the character screen */ @@ -1349,7 +1348,7 @@ ADDRESS_MAP_END /* INPUT PORTS */ static INPUT_PORTS_START( raiden2 ) - SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */ + SEIBU_COIN_INPUTS_INVERT /* coin inputs read through sound cpu */ PORT_START("P1_P2") /* IN0/1 */ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) @@ -1438,6 +1437,10 @@ INPUT_PORTS_END static INPUT_PORTS_START( zeroteam ) PORT_INCLUDE( raiden2 ) + PORT_MODIFY("COIN") + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(4) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_IMPULSE(4) + PORT_MODIFY("P1_P2") PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) @@ -1513,10 +1516,10 @@ static INPUT_PORTS_START( zeroteam ) PORT_BIT( 0x00c0, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_DIPNAME( 0x0700, 0x0700, "Cabinet Setting" ) PORT_DIPLOCATION("SW3:!1,!2,!3") PORT_DIPSETTING( 0x0700, "2P" ) - PORT_DIPSETTING( 0x0600, "3P 3Slot" ) // TODO: coin3 is not hooked up here - PORT_DIPSETTING( 0x0500, "4P 4Slot" ) // TODO: coin3 and 4 are not hooked up here + PORT_DIPSETTING( 0x0600, "3P 3Slot" ) + PORT_DIPSETTING( 0x0500, "4P 4Slot" ) PORT_DIPSETTING( 0x0400, "3P 2Slot" ) - PORT_DIPSETTING( 0x0300, "2P x2" ) // TODO: coin3 and 4 are not hooked up here + PORT_DIPSETTING( 0x0300, "2P x2" ) PORT_DIPSETTING( 0x0200, "4P 2Slot" ) PORT_DIPSETTING( 0x0100, "2P Freeplay" ) PORT_DIPSETTING( 0x0000, "4P Freeplay" )