summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Couriersud <couriersud@users.noreply.github.com>2009-03-04 21:31:59 +0000
committer Couriersud <couriersud@users.noreply.github.com>2009-03-04 21:31:59 +0000
commit6a0e1fcfe0f298a5ed87c044ece43aadd1429a85 (patch)
treefe5a2ab0a0a4ea35eb995ac3dc21151d92d31142 /src
parent8d92bff0b76904cc108c89dd0e8a9885dffb0592 (diff)
02694: demoderb, demoderm: Duplicated input definitions for P1 and P2 buttons.
Diffstat (limited to 'src')
-rw-r--r--src/mame/drivers/mcr.c29
-rw-r--r--src/mame/drivers/mcr3.c29
2 files changed, 32 insertions, 26 deletions
diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c
index 3b94243ec48..d6c6fab6f8b 100644
--- a/src/mame/drivers/mcr.c
+++ b/src/mame/drivers/mcr.c
@@ -586,13 +586,15 @@ static WRITE8_HANDLER( nflfoot_op4_w )
static READ8_HANDLER( demoderb_ip1_r )
{
- return input_port_read(space->machine, input_mux ? "SSIO.IP1.ALT" : "SSIO.IP1");
+ return input_port_read(space->machine, "SSIO.IP1") |
+ (input_port_read(space->machine, input_mux ? "SSIO.IP1.ALT2" : "SSIO.IP1.ALT1") << 2);
}
static READ8_HANDLER( demoderb_ip2_r )
{
- return input_port_read(space->machine, input_mux ? "SSIO.IP2.ALT" : "SSIO.IP2");
+ return input_port_read(space->machine, "SSIO.IP2") |
+ (input_port_read(space->machine, input_mux ? "SSIO.IP2.ALT2" : "SSIO.IP2.ALT1") << 2);
}
@@ -1416,12 +1418,22 @@ static INPUT_PORTS_START( demoderb )
PORT_START("SSIO.IP1") /* J4 10-13,15-18 */ /* The high 6 bits contain the steering wheel value */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_BIT( 0xfc, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
+
+ PORT_START("SSIO.IP1.ALT1") /* J4 10-13,15-18 */ /* The high 6 bits contain the steering wheel value */
+ PORT_BIT( 0x3f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
+
+ PORT_START("SSIO.IP1.ALT2") /* IN1 (muxed) -- the high 6 bits contain the steering wheel value */
+ PORT_BIT( 0x3f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(3)
PORT_START("SSIO.IP2") /* J5 1-8 */ /* The high 6 bits contain the steering wheel value */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_BIT( 0xfc, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2)
+
+ PORT_START("SSIO.IP2.ALT1") /* J5 1-8 */ /* The high 6 bits contain the steering wheel value */
+ PORT_BIT( 0x3f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2)
+
+ PORT_START("SSIO.IP2.ALT2") /* IN2 (muxed) -- the high 6 bits contain the steering wheel value */
+ PORT_BIT( 0x3f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(4)
PORT_START("SSIO.IP3") /* DIPSW @ B3 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
@@ -1456,15 +1468,6 @@ static INPUT_PORTS_START( demoderb )
PORT_START("SSIO.DIP")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START("SSIO.IP1.ALT") /* IN1 (muxed) -- the high 6 bits contain the steering wheel value */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_BIT( 0xfc, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(3)
-
- PORT_START("SSIO.IP2.ALT") /* IN2 (muxed) -- the high 6 bits contain the steering wheel value */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_BIT( 0xfc, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(4)
INPUT_PORTS_END
diff --git a/src/mame/drivers/mcr3.c b/src/mame/drivers/mcr3.c
index 7de85bcaba6..f3d34e1fa95 100644
--- a/src/mame/drivers/mcr3.c
+++ b/src/mame/drivers/mcr3.c
@@ -123,13 +123,15 @@ static INT8 maxrpm_p2_shift;
static READ8_HANDLER( demoderm_ip1_r )
{
- return input_port_read(space->machine, input_mux ? "MONO.IP1.ALT" : "MONO.IP1");
+ return input_port_read(space->machine, "MONO.IP1") |
+ (input_port_read(space->machine, input_mux ? "MONO.IP1.ALT2" : "MONO.IP1.ALT1") << 2);
}
static READ8_HANDLER( demoderm_ip2_r )
{
- return input_port_read(space->machine, input_mux ? "MONO.IP2.ALT" : "MONO.IP2");
+ return input_port_read(space->machine, "MONO.IP2") |
+ (input_port_read(space->machine, input_mux ? "MONO.IP2.ALT2" : "MONO.IP2.ALT1") << 2);
}
@@ -531,12 +533,22 @@ static INPUT_PORTS_START( demoderm )
PORT_START("MONO.IP1") /* J2 10-13,15-18 */ /* The high 6 bits contain the steering wheel value */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_BIT( 0xfc, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
+
+ PORT_START("MONO.IP1.ALT1") /* J2 10-13,15-18 */ /* The high 6 bits contain the steering wheel value */
+ PORT_BIT( 0x3f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
+
+ PORT_START("MONO.IP1.ALT2") /* IN1 (muxed) -- the high 6 bits contain the steering wheel value */
+ PORT_BIT( 0x3f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(3)
PORT_START("MONO.IP2") /* J3 1-8 */ /* The high 6 bits contain the steering wheel value */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_BIT( 0xfc, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2)
+
+ PORT_START("MONO.IP2.ALT1") /* J3 1-8 */ /* The high 6 bits contain the steering wheel value */
+ PORT_BIT( 0x3f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2)
+
+ PORT_START("MONO.IP2.ALT2") /* IN2 (muxed) -- the high 6 bits contain the steering wheel value */
+ PORT_BIT( 0x3f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(4)
PORT_START("MONO.IP3") /* DIPSW @ B3 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
@@ -568,15 +580,6 @@ static INPUT_PORTS_START( demoderm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
- PORT_START("MONO.IP1.ALT") /* IN1 (muxed) -- the high 6 bits contain the steering wheel value */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_BIT( 0xfc, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(3)
-
- PORT_START("MONO.IP2.ALT") /* IN2 (muxed) -- the high 6 bits contain the steering wheel value */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
- PORT_BIT( 0xfc, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(4)
INPUT_PORTS_END