summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2019-12-11 09:02:52 -0500
committer AJR <ajrhacker@users.noreply.github.com>2019-12-11 09:02:52 -0500
commit935431ab00b95034895e9cde3fb9f84ee16b61d2 (patch)
tree36ad0460bf9f77566b9a4f172442b5ee939263ea
parent68686de8b4c7c1b520b67807a3a0a75793ce77b0 (diff)
model2.cpp: Use actual silkscreen label for DIP switches and restrict this set to CRX boards (nw)
-rw-r--r--src/mame/drivers/model2.cpp59
1 files changed, 32 insertions, 27 deletions
diff --git a/src/mame/drivers/model2.cpp b/src/mame/drivers/model2.cpp
index 95e6bf20ebb..f5fc8a6abe6 100644
--- a/src/mame/drivers/model2.cpp
+++ b/src/mame/drivers/model2.cpp
@@ -1684,16 +1684,21 @@ static INPUT_PORTS_START( model2 )
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP) PORT_PLAYER(2)
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_PLAYER(2)
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT) PORT_PLAYER(2)
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( model2crx )
+ PORT_INCLUDE(model2)
PORT_START("SW")
- PORT_DIPUNKNOWN_DIPLOC(0x01, 0x01, "SW:1")
- PORT_DIPUNKNOWN_DIPLOC(0x02, 0x02, "SW:2")
- PORT_DIPUNKNOWN_DIPLOC(0x04, 0x04, "SW:3")
- PORT_DIPUNKNOWN_DIPLOC(0x08, 0x08, "SW:4")
- PORT_DIPUNKNOWN_DIPLOC(0x10, 0x10, "SW:5")
- PORT_DIPUNKNOWN_DIPLOC(0x20, 0x20, "SW:6")
- PORT_DIPUNKNOWN_DIPLOC(0x40, 0x40, "SW:7")
- PORT_DIPUNKNOWN_DIPLOC(0x80, 0x80, "SW:8")
+ // SW1 and SW2 are push buttons
+ PORT_DIPUNKNOWN_DIPLOC(0x01, 0x01, "SW3:1")
+ PORT_DIPUNKNOWN_DIPLOC(0x02, 0x02, "SW3:2")
+ PORT_DIPUNKNOWN_DIPLOC(0x04, 0x04, "SW3:3")
+ PORT_DIPUNKNOWN_DIPLOC(0x08, 0x08, "SW3:4")
+ PORT_DIPUNKNOWN_DIPLOC(0x10, 0x10, "SW3:5")
+ PORT_DIPUNKNOWN_DIPLOC(0x20, 0x20, "SW3:6")
+ PORT_DIPUNKNOWN_DIPLOC(0x40, 0x40, "SW3:7")
+ PORT_DIPUNKNOWN_DIPLOC(0x80, 0x80, "SW3:8")
INPUT_PORTS_END
static INPUT_PORTS_START( ioboard_dipswitches )
@@ -1836,7 +1841,7 @@ static INPUT_PORTS_START( vcop )
INPUT_PORTS_END
INPUT_PORTS_START( vf2 )
- PORT_INCLUDE(model2)
+ PORT_INCLUDE(model2crx)
PORT_MODIFY("IN1")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1) PORT_PLAYER(1) PORT_NAME("P1 Punch")
@@ -1852,7 +1857,7 @@ INPUT_PORTS_START( vf2 )
INPUT_PORTS_END
static INPUT_PORTS_START( manxtt )
- PORT_INCLUDE(model2)
+ PORT_INCLUDE(model2crx)
PORT_MODIFY("IN0")
PORT_BIT(0x30, IP_ACTIVE_LOW, IPT_UNUSED)
@@ -1878,7 +1883,7 @@ static INPUT_PORTS_START( manxtt )
INPUT_PORTS_END
static INPUT_PORTS_START( srallyc )
- PORT_INCLUDE(model2)
+ PORT_INCLUDE(model2crx)
PORT_INCLUDE(gears)
PORT_MODIFY("IN0")
@@ -1924,7 +1929,7 @@ static INPUT_PORTS_START( vcop2 )
INPUT_PORTS_END
static INPUT_PORTS_START( skytargt )
- PORT_INCLUDE(model2)
+ PORT_INCLUDE(model2crx)
PORT_MODIFY("IN0")
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNKNOWN)
@@ -1948,7 +1953,7 @@ static INPUT_PORTS_START( skytargt )
INPUT_PORTS_END
INPUT_PORTS_START( doa )
- PORT_INCLUDE(model2)
+ PORT_INCLUDE(model2crx)
PORT_MODIFY("IN1")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1) PORT_PLAYER(1) PORT_NAME("P1 Hold")
@@ -1964,7 +1969,7 @@ INPUT_PORTS_START( doa )
INPUT_PORTS_END
static INPUT_PORTS_START( zerogun )
- PORT_INCLUDE(model2)
+ PORT_INCLUDE(model2crx)
PORT_MODIFY("IN1")
PORT_BIT(0x0c, IP_ACTIVE_LOW, IPT_UNUSED)
@@ -1995,7 +2000,7 @@ static INPUT_PORTS_START( motoraid )
INPUT_PORTS_END
static INPUT_PORTS_START( dynamcop )
- PORT_INCLUDE(model2)
+ PORT_INCLUDE(model2crx)
PORT_MODIFY("IN1")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1) PORT_PLAYER(1) PORT_NAME("P1 Punch")
@@ -2011,7 +2016,7 @@ static INPUT_PORTS_START( dynamcop )
INPUT_PORTS_END
static INPUT_PORTS_START( pltkids )
- PORT_INCLUDE(model2)
+ PORT_INCLUDE(model2crx)
PORT_MODIFY("IN1")
PORT_BIT(0x0c, IP_ACTIVE_LOW, IPT_UNUSED)
@@ -2021,7 +2026,7 @@ static INPUT_PORTS_START( pltkids )
INPUT_PORTS_END
static INPUT_PORTS_START( rchase2 )
- PORT_INCLUDE(model2)
+ PORT_INCLUDE(model2crx)
PORT_MODIFY("IN1")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1) PORT_PLAYER(1)
@@ -2045,7 +2050,7 @@ static INPUT_PORTS_START( rchase2 )
INPUT_PORTS_END
static INPUT_PORTS_START( vstriker )
- PORT_INCLUDE(model2)
+ PORT_INCLUDE(model2crx)
// oddly enough service mode returns standard 1-2-3 layout but actual ingame is 2-3-1
// also bit 3 repeats bit 2 functionality.
@@ -2073,7 +2078,7 @@ static INPUT_PORTS_START( gunblade )
INPUT_PORTS_END
static INPUT_PORTS_START( indy500 )
- PORT_INCLUDE(model2)
+ PORT_INCLUDE(model2crx)
PORT_MODIFY("IN0")
PORT_BIT(0x30, IP_ACTIVE_LOW, IPT_UNUSED)
@@ -2103,7 +2108,7 @@ static INPUT_PORTS_START( indy500 )
INPUT_PORTS_END
static INPUT_PORTS_START( von )
- PORT_INCLUDE(model2)
+ PORT_INCLUDE(model2crx)
PORT_MODIFY("IN1")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1) PORT_NAME("P1 Left Shot")
@@ -2125,7 +2130,7 @@ static INPUT_PORTS_START( von )
INPUT_PORTS_END
INPUT_PORTS_START( schamp )
- PORT_INCLUDE(model2)
+ PORT_INCLUDE(model2crx)
PORT_MODIFY("IN1")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1) PORT_PLAYER(1) PORT_NAME("P1 Punch")
@@ -2149,7 +2154,7 @@ static INPUT_PORTS_START( sgt24h )
INPUT_PORTS_END
static INPUT_PORTS_START( dynabb )
- PORT_INCLUDE(model2)
+ PORT_INCLUDE(model2crx)
PORT_MODIFY("IN1")
PORT_BIT(0x0c, IP_ACTIVE_LOW, IPT_UNUSED)
@@ -2174,7 +2179,7 @@ static INPUT_PORTS_START( overrev )
INPUT_PORTS_END
static INPUT_PORTS_START( skisuprg )
- PORT_INCLUDE(model2)
+ PORT_INCLUDE(model2crx)
PORT_MODIFY("IN0")
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_BUTTON3) PORT_NAME("Select 3")
@@ -2199,7 +2204,7 @@ static INPUT_PORTS_START( skisuprg )
INPUT_PORTS_END
static INPUT_PORTS_START( waverunr )
- PORT_INCLUDE(model2)
+ PORT_INCLUDE(model2crx)
PORT_MODIFY("IN0")
PORT_BIT(0x32, IP_ACTIVE_LOW, IPT_UNUSED)
@@ -2259,7 +2264,7 @@ static INPUT_PORTS_START( hotd )
INPUT_PORTS_END
static INPUT_PORTS_START( segawski )
- PORT_INCLUDE(model2)
+ PORT_INCLUDE(model2crx)
PORT_MODIFY("IN0")
PORT_BIT(0x32, IP_ACTIVE_LOW, IPT_UNUSED)
@@ -2281,7 +2286,7 @@ INPUT_PORTS_END
// TODO: has testable service / test on board buttons
static INPUT_PORTS_START( topskatr )
- PORT_INCLUDE(model2)
+ PORT_INCLUDE(model2crx)
PORT_MODIFY("IN0")
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_BUTTON4) PORT_NAME("Select Right")
@@ -2305,7 +2310,7 @@ static INPUT_PORTS_START( topskatr )
INPUT_PORTS_END
static INPUT_PORTS_START( powsled )
- PORT_INCLUDE(model2)
+ PORT_INCLUDE(model2crx)
PORT_MODIFY("IN0")
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_SERVICE2)