summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-06-26 15:24:06 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-06-26 15:24:06 +0000
commit07023d6787dc5e3081b3247d50d1e14d243a57d5 (patch)
treef3cdc242c92c194338ea8a0b84efe51a9659072a
parent79292cf7b0ebb5d7449666f1cc0cea4fd9cf10b3 (diff)
From: Fabio Priuli [mailto:doge.fabio@gmail.com]
Subject: two more (last ones for a couple of weeks) Hi, attached please find * r_patch.diff which removes indexed read from drivers starting with r (and slightly simplify inputs in royalmah.c) * nbmj.diff which unifies nichibustu mahjong input ports (using common ports in nbmj9195.c as well as in the other drivers), removes indexed read and exploit tags to reduce complexity in a couple of handlers Tomorrow I'll leave for a work trip, so no more patches from me for some time. Regards, Fabio Priuli
-rw-r--r--src/mame/drivers/hyhoo.c24
-rw-r--r--src/mame/drivers/nbmj8688.c602
-rw-r--r--src/mame/drivers/nbmj8891.c598
-rw-r--r--src/mame/drivers/nbmj8991.c306
-rw-r--r--src/mame/drivers/nbmj9195.c805
-rw-r--r--src/mame/drivers/niyanpai.c100
-rw-r--r--src/mame/drivers/pastelg.c22
-rw-r--r--src/mame/drivers/rabbit.c12
-rw-r--r--src/mame/drivers/raiden2.c28
-rw-r--r--src/mame/drivers/rbmk.c20
-rw-r--r--src/mame/drivers/rcasino.c6
-rw-r--r--src/mame/drivers/realbrk.c288
-rw-r--r--src/mame/drivers/redalert.c2
-rw-r--r--src/mame/drivers/redclash.c44
-rw-r--r--src/mame/drivers/relief.c16
-rw-r--r--src/mame/drivers/renegade.c18
-rw-r--r--src/mame/drivers/rmhaihai.c240
-rw-r--r--src/mame/drivers/route16.c110
-rw-r--r--src/mame/drivers/royalmah.c1471
-rw-r--r--src/mame/drivers/rpunch.c4
-rw-r--r--src/mame/drivers/runaway.c28
-rw-r--r--src/mame/drivers/rungun.c28
-rw-r--r--src/mame/includes/nb1413m3.h112
-rw-r--r--src/mame/machine/nb1413m3.c250
24 files changed, 1311 insertions, 3823 deletions
diff --git a/src/mame/drivers/hyhoo.c b/src/mame/drivers/hyhoo.c
index e4e4274ed06..6caae1cb691 100644
--- a/src/mame/drivers/hyhoo.c
+++ b/src/mame/drivers/hyhoo.c
@@ -94,7 +94,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( hyhoo )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x00, "4 (Easy)" )
PORT_DIPSETTING( 0x01, "3" )
@@ -115,7 +115,7 @@ static INPUT_PORTS_START( hyhoo )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "Bonus Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -138,7 +138,7 @@ static INPUT_PORTS_START( hyhoo )
PORT_DIPSETTING( 0x40, "90%" )
PORT_DIPSETTING( 0x00, "95%" )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // NOT USED
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
@@ -148,7 +148,7 @@ static INPUT_PORTS_START( hyhoo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) // NOT USED
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
- PORT_START /* (3) PORT 1-0 */
+ PORT_START_TAG("IN0") /* (3) PORT 1-0 */
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)
@@ -158,7 +158,7 @@ static INPUT_PORTS_START( hyhoo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* (4) PORT 1-1 */
+ PORT_START_TAG("IN1") /* (4) PORT 1-1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START3 )
@@ -168,7 +168,7 @@ static INPUT_PORTS_START( hyhoo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* (5) PORT 2-0 */
+ PORT_START_TAG("IN2") /* (5) PORT 2-0 */
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)
@@ -180,7 +180,7 @@ static INPUT_PORTS_START( hyhoo )
INPUT_PORTS_END
static INPUT_PORTS_START( hyhoo2 )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x00, "4 (Easy)" )
PORT_DIPSETTING( 0x01, "3" )
@@ -203,7 +203,7 @@ static INPUT_PORTS_START( hyhoo2 )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -213,7 +213,7 @@ static INPUT_PORTS_START( hyhoo2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // NOT USED
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
@@ -223,7 +223,7 @@ static INPUT_PORTS_START( hyhoo2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) // NOT USED
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
- PORT_START /* (3) PORT 1-0 */
+ PORT_START_TAG("IN0") /* (3) PORT 1-0 */
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)
@@ -233,7 +233,7 @@ static INPUT_PORTS_START( hyhoo2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* (4) PORT 1-1 */
+ PORT_START_TAG("IN1") /* (4) PORT 1-1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START3 )
@@ -243,7 +243,7 @@ static INPUT_PORTS_START( hyhoo2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* (5) PORT 2-0 */
+ PORT_START_TAG("IN2") /* (5) PORT 2-0 */
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)
diff --git a/src/mame/drivers/nbmj8688.c b/src/mame/drivers/nbmj8688.c
index a0b8288f0ba..42e6c03c2da 100644
--- a/src/mame/drivers/nbmj8688.c
+++ b/src/mame/drivers/nbmj8688.c
@@ -551,7 +551,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mjsikaku )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -577,7 +577,7 @@ static INPUT_PORTS_START( mjsikaku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -603,7 +603,7 @@ static INPUT_PORTS_START( mjsikaku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -613,22 +613,12 @@ static INPUT_PORTS_START( mjsikaku )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( mmsikaku )
#if 1
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -654,7 +644,7 @@ static INPUT_PORTS_START( mmsikaku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -681,7 +671,7 @@ static INPUT_PORTS_START( mmsikaku )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
#else
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x00, "Game Out" )
PORT_DIPSETTING( 0x07, "60% (Hard)" )
PORT_DIPSETTING( 0x06, "65%" )
@@ -705,7 +695,7 @@ static INPUT_PORTS_START( mmsikaku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x00, "Rate Up" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -718,7 +708,7 @@ static INPUT_PORTS_START( mmsikaku )
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED )
#endif
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -728,21 +718,11 @@ static INPUT_PORTS_START( mmsikaku )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( otonano )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -768,7 +748,7 @@ static INPUT_PORTS_START( otonano )
PORT_DIPSETTING( 0x80, "100 Yen" )
PORT_DIPSETTING( 0x00, "50 Yen" )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "Character Display Test" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -794,7 +774,7 @@ static INPUT_PORTS_START( otonano )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -804,21 +784,11 @@ static INPUT_PORTS_START( otonano )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( mjcamera )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -844,7 +814,7 @@ static INPUT_PORTS_START( mjcamera )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -870,7 +840,7 @@ static INPUT_PORTS_START( mjcamera )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -880,21 +850,11 @@ static INPUT_PORTS_START( mjcamera )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( kaguya )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
@@ -919,7 +879,7 @@ static INPUT_PORTS_START( kaguya )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x00, "Nudity graphic on bet" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -943,7 +903,7 @@ static INPUT_PORTS_START( kaguya )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
// PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) //
@@ -954,21 +914,11 @@ static INPUT_PORTS_START( kaguya )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( kaguya2 )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -994,7 +944,7 @@ static INPUT_PORTS_START( kaguya2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1020,7 +970,7 @@ static INPUT_PORTS_START( kaguya2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
// PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1031,21 +981,11 @@ static INPUT_PORTS_START( kaguya2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( kanatuen )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1071,7 +1011,7 @@ static INPUT_PORTS_START( kanatuen )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1097,7 +1037,7 @@ static INPUT_PORTS_START( kanatuen )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
// PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) //
@@ -1108,21 +1048,11 @@ static INPUT_PORTS_START( kanatuen )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( kyuhito )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1148,7 +1078,7 @@ static INPUT_PORTS_START( kyuhito )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1174,7 +1104,7 @@ static INPUT_PORTS_START( kyuhito )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
// PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) //
@@ -1185,21 +1115,11 @@ static INPUT_PORTS_START( kyuhito )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( idhimitu )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1225,7 +1145,7 @@ static INPUT_PORTS_START( idhimitu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1251,7 +1171,7 @@ static INPUT_PORTS_START( idhimitu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
// PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 ) //
@@ -1262,21 +1182,11 @@ static INPUT_PORTS_START( idhimitu )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( secolove )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1302,7 +1212,7 @@ static INPUT_PORTS_START( secolove )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x00, "Number of last chance" )
PORT_DIPSETTING( 0x03, "0" )
PORT_DIPSETTING( 0x02, "3" )
@@ -1327,7 +1237,7 @@ static INPUT_PORTS_START( secolove )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1337,21 +1247,11 @@ static INPUT_PORTS_START( secolove )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( citylove )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0f, "1 (Easy)" )
PORT_DIPSETTING( 0x0e, "2" )
@@ -1381,7 +1281,7 @@ static INPUT_PORTS_START( citylove )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x00, "Number of last chance" )
PORT_DIPSETTING( 0x03, "0" )
PORT_DIPSETTING( 0x02, "3" )
@@ -1405,7 +1305,7 @@ static INPUT_PORTS_START( citylove )
PORT_DIPSETTING( 0x40, "TSUMO 7" )
PORT_DIPSETTING( 0x00, "HAIPAI" )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1415,22 +1315,12 @@ static INPUT_PORTS_START( citylove )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( mcitylov )
#if 1
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1456,7 +1346,7 @@ static INPUT_PORTS_START( mcitylov )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1483,7 +1373,7 @@ static INPUT_PORTS_START( mcitylov )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
#else
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x00, "Game Out" )
PORT_DIPSETTING( 0x07, "60% (Hard)" )
PORT_DIPSETTING( 0x06, "65%" )
@@ -1507,7 +1397,7 @@ static INPUT_PORTS_START( mcitylov )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x00, "Rate Up" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1520,7 +1410,7 @@ static INPUT_PORTS_START( mcitylov )
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED )
#endif
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1530,21 +1420,11 @@ static INPUT_PORTS_START( mcitylov )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( seiha )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Hard)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1570,7 +1450,7 @@ static INPUT_PORTS_START( seiha )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1596,7 +1476,7 @@ static INPUT_PORTS_START( seiha )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1606,21 +1486,11 @@ static INPUT_PORTS_START( seiha )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( seiham )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x00, "Game Out" )
PORT_DIPSETTING( 0x07, "60% (Hard)" )
PORT_DIPSETTING( 0x06, "65%" )
@@ -1644,7 +1514,7 @@ static INPUT_PORTS_START( seiham )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x00, "Rate Up" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1670,7 +1540,7 @@ static INPUT_PORTS_START( seiham )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1680,21 +1550,11 @@ static INPUT_PORTS_START( seiham )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( iemoto )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x00, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Hard)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1720,7 +1580,7 @@ static INPUT_PORTS_START( iemoto )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1746,7 +1606,7 @@ static INPUT_PORTS_START( iemoto )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1756,21 +1616,11 @@ static INPUT_PORTS_START( iemoto )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( iemotom )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1796,7 +1646,7 @@ static INPUT_PORTS_START( iemotom )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1822,7 +1672,7 @@ static INPUT_PORTS_START( iemotom )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1832,21 +1682,11 @@ static INPUT_PORTS_START( iemotom )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( ryuuha )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1872,7 +1712,7 @@ static INPUT_PORTS_START( ryuuha )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "Character Display Test" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1898,7 +1738,7 @@ static INPUT_PORTS_START( ryuuha )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1908,21 +1748,11 @@ static INPUT_PORTS_START( ryuuha )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( bijokkoy )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1948,7 +1778,7 @@ static INPUT_PORTS_START( bijokkoy )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x00, "Number of last chance" )
PORT_DIPSETTING( 0x03, "0" )
PORT_DIPSETTING( 0x02, "2" )
@@ -1973,7 +1803,7 @@ static INPUT_PORTS_START( bijokkoy )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1983,21 +1813,11 @@ static INPUT_PORTS_START( bijokkoy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( bijokkog )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -2023,7 +1843,7 @@ static INPUT_PORTS_START( bijokkog )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x00, "Number of last chance" )
PORT_DIPSETTING( 0x03, "0" )
PORT_DIPSETTING( 0x02, "2" )
@@ -2047,7 +1867,7 @@ static INPUT_PORTS_START( bijokkog )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2057,21 +1877,11 @@ static INPUT_PORTS_START( bijokkog )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( housemnq )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -2097,7 +1907,7 @@ static INPUT_PORTS_START( housemnq )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x03, "Time" )
PORT_DIPSETTING( 0x03, "120" )
PORT_DIPSETTING( 0x02, "100" )
@@ -2121,7 +1931,7 @@ static INPUT_PORTS_START( housemnq )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2131,21 +1941,11 @@ static INPUT_PORTS_START( housemnq )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( housemn2 )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -2171,7 +1971,7 @@ static INPUT_PORTS_START( housemn2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x03, "Time" )
PORT_DIPSETTING( 0x03, "120" )
PORT_DIPSETTING( 0x02, "100" )
@@ -2194,7 +1994,7 @@ static INPUT_PORTS_START( housemn2 )
// PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2204,21 +2004,11 @@ static INPUT_PORTS_START( housemn2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( orangec )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2244,7 +2034,7 @@ static INPUT_PORTS_START( orangec )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2270,7 +2060,7 @@ static INPUT_PORTS_START( orangec )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2280,21 +2070,11 @@ static INPUT_PORTS_START( orangec )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( orangeci )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2320,7 +2100,7 @@ static INPUT_PORTS_START( orangeci )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2346,7 +2126,7 @@ static INPUT_PORTS_START( orangeci )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2356,21 +2136,11 @@ static INPUT_PORTS_START( orangeci )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( vipclub )
- PORT_START /* (1) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2396,7 +2166,7 @@ static INPUT_PORTS_START( vipclub )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2422,7 +2192,7 @@ static INPUT_PORTS_START( vipclub )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2432,21 +2202,11 @@ static INPUT_PORTS_START( vipclub )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( livegal )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2472,7 +2232,7 @@ static INPUT_PORTS_START( livegal )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2498,7 +2258,7 @@ static INPUT_PORTS_START( livegal )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2508,21 +2268,11 @@ static INPUT_PORTS_START( livegal )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( ojousan )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -2548,7 +2298,7 @@ static INPUT_PORTS_START( ojousan )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2574,7 +2324,7 @@ static INPUT_PORTS_START( ojousan )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2584,21 +2334,11 @@ static INPUT_PORTS_START( ojousan )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( ojousanm )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2624,7 +2364,7 @@ static INPUT_PORTS_START( ojousanm )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2650,7 +2390,7 @@ static INPUT_PORTS_START( ojousanm )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2660,21 +2400,11 @@ static INPUT_PORTS_START( ojousanm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( korinai )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2700,7 +2430,7 @@ static INPUT_PORTS_START( korinai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2726,7 +2456,7 @@ static INPUT_PORTS_START( korinai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2736,21 +2466,11 @@ static INPUT_PORTS_START( korinai )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( korinaim )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2776,7 +2496,7 @@ static INPUT_PORTS_START( korinaim )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2802,7 +2522,7 @@ static INPUT_PORTS_START( korinaim )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2812,21 +2532,11 @@ static INPUT_PORTS_START( korinaim )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( crystalg )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2852,7 +2562,7 @@ static INPUT_PORTS_START( crystalg )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2878,7 +2588,7 @@ static INPUT_PORTS_START( crystalg )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2888,21 +2598,11 @@ static INPUT_PORTS_START( crystalg )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) // OPTION (?)
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( crystal2 )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x0f, 0x0d, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x0d, "1 (Easy)" )
PORT_DIPSETTING( 0x0a, "2" )
@@ -2926,7 +2626,7 @@ static INPUT_PORTS_START( crystal2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x00, "Number of last chance" )
PORT_DIPSETTING( 0x03, "0" )
PORT_DIPSETTING( 0x02, "1" )
@@ -2950,7 +2650,7 @@ static INPUT_PORTS_START( crystal2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2960,21 +2660,11 @@ static INPUT_PORTS_START( crystal2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) // OPTION (?)
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( apparel )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3000,7 +2690,7 @@ static INPUT_PORTS_START( apparel )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3026,7 +2716,7 @@ static INPUT_PORTS_START( apparel )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -3036,21 +2726,11 @@ static INPUT_PORTS_START( apparel )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( nightlov )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3076,7 +2756,7 @@ static INPUT_PORTS_START( nightlov )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3102,7 +2782,7 @@ static INPUT_PORTS_START( nightlov )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -3112,17 +2792,7 @@ static INPUT_PORTS_START( nightlov )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
diff --git a/src/mame/drivers/nbmj8891.c b/src/mame/drivers/nbmj8891.c
index 11dadf0679e..fb9b5935299 100644
--- a/src/mame/drivers/nbmj8891.c
+++ b/src/mame/drivers/nbmj8891.c
@@ -768,7 +768,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( hanamomo )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -794,7 +794,7 @@ static INPUT_PORTS_START( hanamomo )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -820,7 +820,7 @@ static INPUT_PORTS_START( hanamomo )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -830,21 +830,11 @@ static INPUT_PORTS_START( hanamomo )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( mjcamerb )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -870,7 +860,7 @@ static INPUT_PORTS_START( mjcamerb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -896,7 +886,7 @@ static INPUT_PORTS_START( mjcamerb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -906,21 +896,11 @@ static INPUT_PORTS_START( mjcamerb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( mmcamera )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -946,7 +926,7 @@ static INPUT_PORTS_START( mmcamera )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -972,7 +952,7 @@ static INPUT_PORTS_START( mmcamera )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -982,21 +962,11 @@ static INPUT_PORTS_START( mmcamera )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( msjiken )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1022,7 +992,7 @@ static INPUT_PORTS_START( msjiken )
PORT_DIPSETTING( 0x80, "ROYAL" )
PORT_DIPSETTING( 0x00, "JAMMA" )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1048,7 +1018,7 @@ static INPUT_PORTS_START( msjiken )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1058,19 +1028,9 @@ static INPUT_PORTS_START( msjiken )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
+ PORT_INCLUDE( nbmjcontrols )
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
-
- PORT_START /* (13) JAMMA-1 */
+ PORT_START_TAG("JAMMA1") /* (13) JAMMA-1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1080,7 +1040,7 @@ static INPUT_PORTS_START( msjiken )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* (14) JAMMA-2 */
+ PORT_START_TAG("JAMMA2") /* (14) JAMMA-2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_4WAY
@@ -1092,7 +1052,7 @@ static INPUT_PORTS_START( msjiken )
INPUT_PORTS_END
static INPUT_PORTS_START( telmahjn )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1118,7 +1078,7 @@ static INPUT_PORTS_START( telmahjn )
PORT_DIPSETTING( 0x80, "ROYAL" )
PORT_DIPSETTING( 0x00, "JAMMA" )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1144,7 +1104,7 @@ static INPUT_PORTS_START( telmahjn )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1154,19 +1114,9 @@ static INPUT_PORTS_START( telmahjn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
- PORT_START /* (13) JAMMA-1 */
+ PORT_START_TAG("JAMMA1") /* (13) JAMMA-1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1176,7 +1126,7 @@ static INPUT_PORTS_START( telmahjn )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* (14) JAMMA-2 */
+ PORT_START_TAG("JAMMA2") /* (14) JAMMA-2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_4WAY
@@ -1188,7 +1138,7 @@ static INPUT_PORTS_START( telmahjn )
INPUT_PORTS_END
static INPUT_PORTS_START( gionbana )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1213,7 +1163,7 @@ static INPUT_PORTS_START( gionbana )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x00, "Oyaken" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1239,7 +1189,7 @@ static INPUT_PORTS_START( gionbana )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1249,21 +1199,11 @@ static INPUT_PORTS_START( gionbana )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( mgion )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1289,7 +1229,7 @@ static INPUT_PORTS_START( mgion )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (0) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (0) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1315,7 +1255,7 @@ static INPUT_PORTS_START( mgion )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1325,21 +1265,11 @@ static INPUT_PORTS_START( mgion )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( omotesnd )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1365,7 +1295,7 @@ static INPUT_PORTS_START( omotesnd )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (0) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (0) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1391,7 +1321,7 @@ static INPUT_PORTS_START( omotesnd )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1401,21 +1331,11 @@ static INPUT_PORTS_START( omotesnd )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( abunai )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1440,7 +1360,7 @@ static INPUT_PORTS_START( abunai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x00, "Oyaken" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1466,7 +1386,7 @@ static INPUT_PORTS_START( abunai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1476,21 +1396,11 @@ static INPUT_PORTS_START( abunai )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( mgmen89 )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1516,7 +1426,7 @@ static INPUT_PORTS_START( mgmen89 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1542,7 +1452,7 @@ static INPUT_PORTS_START( mgmen89 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1552,24 +1462,14 @@ static INPUT_PORTS_START( mgmen89 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( mjfocus )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1595,7 +1495,7 @@ static INPUT_PORTS_START( mjfocus )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1621,7 +1521,7 @@ static INPUT_PORTS_START( mjfocus )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1631,21 +1531,11 @@ static INPUT_PORTS_START( mjfocus )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( mjfocusm )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, "Game Out" )
PORT_DIPSETTING( 0x07, "95% (Easy)" )
PORT_DIPSETTING( 0x06, "90%" )
@@ -1671,7 +1561,7 @@ static INPUT_PORTS_START( mjfocusm )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_2C ) )
@@ -1695,7 +1585,7 @@ static INPUT_PORTS_START( mjfocusm )
PORT_DIPSETTING( 0x80, "A" )
PORT_DIPSETTING( 0x00, "B" )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1705,21 +1595,11 @@ static INPUT_PORTS_START( mjfocusm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( peepshow )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1745,7 +1625,7 @@ static INPUT_PORTS_START( peepshow )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1771,7 +1651,7 @@ static INPUT_PORTS_START( peepshow )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1781,21 +1661,11 @@ static INPUT_PORTS_START( peepshow )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( scandal )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1821,7 +1691,7 @@ static INPUT_PORTS_START( scandal )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "Character Display Test" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1847,7 +1717,7 @@ static INPUT_PORTS_START( scandal )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1857,21 +1727,11 @@ static INPUT_PORTS_START( scandal )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( scandalm )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, "Game Out" )
PORT_DIPSETTING( 0x07, "90% (Easy)" )
PORT_DIPSETTING( 0x06, "85%" )
@@ -1897,7 +1757,7 @@ static INPUT_PORTS_START( scandalm )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_2C ) )
@@ -1921,7 +1781,7 @@ static INPUT_PORTS_START( scandalm )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1931,21 +1791,11 @@ static INPUT_PORTS_START( scandalm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( mjnanpas )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1971,7 +1821,7 @@ static INPUT_PORTS_START( mjnanpas )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1997,7 +1847,7 @@ static INPUT_PORTS_START( mjnanpas )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2007,21 +1857,11 @@ static INPUT_PORTS_START( mjnanpas )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( mjnanpaa )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -2047,7 +1887,7 @@ static INPUT_PORTS_START( mjnanpaa )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2073,7 +1913,7 @@ static INPUT_PORTS_START( mjnanpaa )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2083,24 +1923,14 @@ static INPUT_PORTS_START( mjnanpaa )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( bananadr )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2126,7 +1956,7 @@ static INPUT_PORTS_START( bananadr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2152,7 +1982,7 @@ static INPUT_PORTS_START( bananadr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2162,21 +1992,11 @@ static INPUT_PORTS_START( bananadr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( club90s )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -2201,7 +2021,7 @@ static INPUT_PORTS_START( club90s )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2227,7 +2047,7 @@ static INPUT_PORTS_START( club90s )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2237,24 +2057,14 @@ static INPUT_PORTS_START( club90s )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( lovehous )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, "Game Out" )
PORT_DIPSETTING( 0x07, "90% (Easy)" )
PORT_DIPSETTING( 0x06, "85%" )
@@ -2280,7 +2090,7 @@ static INPUT_PORTS_START( lovehous )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2304,7 +2114,7 @@ static INPUT_PORTS_START( lovehous )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0-1 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0-1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2314,19 +2124,9 @@ static INPUT_PORTS_START( lovehous )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
+ PORT_INCLUDE( nbmjcontrols )
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
-
- PORT_START /* (13) PORT 0-2 */
+ PORT_START_TAG("PORT0-2") /* (13) PORT 0-2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // OUT COIN
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2338,7 +2138,7 @@ static INPUT_PORTS_START( lovehous )
INPUT_PORTS_END
static INPUT_PORTS_START( mladyhtr )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -2363,7 +2163,7 @@ static INPUT_PORTS_START( mladyhtr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2389,7 +2189,7 @@ static INPUT_PORTS_START( mladyhtr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2399,21 +2199,11 @@ static INPUT_PORTS_START( mladyhtr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( chinmoku )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -2438,7 +2228,7 @@ static INPUT_PORTS_START( chinmoku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2464,7 +2254,7 @@ static INPUT_PORTS_START( chinmoku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2474,21 +2264,11 @@ static INPUT_PORTS_START( chinmoku )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( maiko )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -2514,7 +2294,7 @@ static INPUT_PORTS_START( maiko )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2540,7 +2320,7 @@ static INPUT_PORTS_START( maiko )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0-1 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0-1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) //
@@ -2550,19 +2330,9 @@ static INPUT_PORTS_START( maiko )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
- PORT_START /* (13) PORT 0-2 */
+ PORT_START_TAG("PORT0-2") /* (13) PORT 0-2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // OUT COIN
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2577,7 +2347,7 @@ static INPUT_PORTS_START( mmaiko )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, "Game Out" )
PORT_DIPSETTING( 0x07, "90% (Easy)" )
PORT_DIPSETTING( 0x06, "85%" )
@@ -2601,7 +2371,7 @@ static INPUT_PORTS_START( mmaiko )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
@@ -2626,7 +2396,7 @@ static INPUT_PORTS_START( mmaiko )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0-1 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0-1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2636,19 +2406,9 @@ static INPUT_PORTS_START( mmaiko )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
+ PORT_INCLUDE( nbmjcontrols )
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
-
- PORT_START /* (13) PORT 0-2 */
+ PORT_START_TAG("PORT0-2") /* (13) PORT 0-2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // OUT COIN
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2660,7 +2420,7 @@ static INPUT_PORTS_START( mmaiko )
INPUT_PORTS_END
static INPUT_PORTS_START( hanaoji )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2686,7 +2446,7 @@ static INPUT_PORTS_START( hanaoji )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2712,7 +2472,7 @@ static INPUT_PORTS_START( hanaoji )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* (2) PORT 0-1 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0-1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) //
@@ -2722,19 +2482,9 @@ static INPUT_PORTS_START( hanaoji )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
- PORT_START /* (13) PORT 0-2 */
+ PORT_START_TAG("PORT0-2") /* (13) PORT 0-2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // OUT COIN
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2746,7 +2496,7 @@ static INPUT_PORTS_START( hanaoji )
INPUT_PORTS_END
static INPUT_PORTS_START( pairsnb )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, DEF_STR( Easy ) ) // Hearts : 10 - Time : 60/60
PORT_DIPSETTING( 0x02, DEF_STR( Medium ) ) // Hearts : 7 - Time : 44/60
@@ -2771,7 +2521,7 @@ static INPUT_PORTS_START( pairsnb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2797,7 +2547,7 @@ static INPUT_PORTS_START( pairsnb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2807,7 +2557,7 @@ static INPUT_PORTS_START( pairsnb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // not in "test mode"
- PORT_START /* (3) PORT 1 */
+ PORT_START_TAG("P1") /* (3) PORT 1 */
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_JOYSTICK_RIGHT ) PORT_PLAYER(1) PORT_4WAY
@@ -2817,7 +2567,7 @@ static INPUT_PORTS_START( pairsnb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* (4) PORT 2 */
+ PORT_START_TAG("P2") /* (4) PORT 2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) PORT_4WAY
@@ -2829,7 +2579,7 @@ static INPUT_PORTS_START( pairsnb )
INPUT_PORTS_END
static INPUT_PORTS_START( taiwanmb )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, "Game Out" )
PORT_DIPSETTING( 0x07, "95% (Easy)" )
PORT_DIPSETTING( 0x06, "90%" )
@@ -2853,7 +2603,7 @@ static INPUT_PORTS_START( taiwanmb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x00, "Last Chance" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2877,7 +2627,7 @@ static INPUT_PORTS_START( taiwanmb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) DIPSW-C */
+ PORT_START_TAG("DSWC") /* (2) DIPSW-C */
PORT_DIPNAME( 0x03, 0x03, "?? cut" )
PORT_DIPSETTING( 0x03, DEF_STR( Off ) )
PORT_DIPSETTING( 0x02, "16 - ?H??" )
@@ -2900,7 +2650,7 @@ static INPUT_PORTS_START( taiwanmb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (3) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (3) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -2910,105 +2660,51 @@ static INPUT_PORTS_START( taiwanmb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
- PORT_START /* (4) PORT 1-1 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_INCLUDE( nbmjcontrols )
+
+ PORT_MODIFY("KEY0")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_M )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_I )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_E )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_A )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START /* (5) PORT 1-2 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
+
+ PORT_MODIFY("KEY1")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_P )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_J )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_F )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_B )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* (6) PORT 1-3 */
+ PORT_MODIFY("KEY2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_NAME("P1 Mahjong Reach(?)")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_Q )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_O )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_K )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_G )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_C )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* (7) PORT 1-4 */
+ PORT_MODIFY("KEY3")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) PORT_NAME("P1 Mahjong Small(?)")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_BIG ) PORT_NAME("P1 Mahjong Big(?)")
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_N )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_L )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_H )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_D )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* (8) PORT 1-5 */
+ PORT_MODIFY("KEY4")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START /* (9) PORT 2-1 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START /* (10) PORT 2-2 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2)
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_P )PORT_PLAYER(2)
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START /* (11) PORT 2-3 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_NAME("P2 Mahjong Reach(?)")PORT_PLAYER(2)
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_Q )PORT_PLAYER(2)
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_O )PORT_PLAYER(2)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START /* (12) PORT 2-4 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) PORT_NAME("P2 Mahjong Small(?)")PORT_PLAYER(2)
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_BIG ) PORT_NAME("P2 Mahjong Big(?)")PORT_PLAYER(2)
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START /* (13) PORT 2-5 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_MODIFY("KEY5")
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) PORT_PLAYER(2)
+
+ PORT_MODIFY("KEY6")
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_P ) PORT_PLAYER(2)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2)
+
+ PORT_MODIFY("KEY7")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_NAME("P2 Mahjong Reach(?)") PORT_PLAYER(2)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_Q ) PORT_PLAYER(2)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_O ) PORT_PLAYER(2)
+
+ PORT_MODIFY("KEY8")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) PORT_NAME("P2 Mahjong Small(?)") PORT_PLAYER(2)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_BIG ) PORT_NAME("P2 Mahjong Big(?)") PORT_PLAYER(2)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_N ) PORT_PLAYER(2)
+
+ PORT_MODIFY("KEY9")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) PORT_PLAYER(2)
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) PORT_PLAYER(2)
INPUT_PORTS_END
diff --git a/src/mame/drivers/nbmj8991.c b/src/mame/drivers/nbmj8991.c
index d36ddcb8fea..4327f084d86 100644
--- a/src/mame/drivers/nbmj8991.c
+++ b/src/mame/drivers/nbmj8991.c
@@ -440,7 +440,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( pstadium )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1 (Easy)" )
PORT_DIPSETTING( 0x02, "2" )
@@ -465,7 +465,7 @@ static INPUT_PORTS_START( pstadium )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -491,7 +491,7 @@ static INPUT_PORTS_START( pstadium )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -501,21 +501,11 @@ static INPUT_PORTS_START( pstadium )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( triplew1 )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1 (Easy)" )
PORT_DIPSETTING( 0x02, "2" )
@@ -540,7 +530,7 @@ static INPUT_PORTS_START( triplew1 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -566,7 +556,7 @@ static INPUT_PORTS_START( triplew1 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -576,21 +566,11 @@ static INPUT_PORTS_START( triplew1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( ntopstar )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1 (Easy)" )
PORT_DIPSETTING( 0x02, "2" )
@@ -615,7 +595,7 @@ static INPUT_PORTS_START( ntopstar )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -641,7 +621,7 @@ static INPUT_PORTS_START( ntopstar )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -651,21 +631,11 @@ static INPUT_PORTS_START( ntopstar )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( mjlstory )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1 (Easy)" )
PORT_DIPSETTING( 0x02, "2" )
@@ -690,7 +660,7 @@ static INPUT_PORTS_START( mjlstory )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -716,7 +686,7 @@ static INPUT_PORTS_START( mjlstory )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -726,21 +696,11 @@ static INPUT_PORTS_START( mjlstory )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( vanilla )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1 (Easy)" )
PORT_DIPSETTING( 0x02, "2" )
@@ -765,7 +725,7 @@ static INPUT_PORTS_START( vanilla )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -791,7 +751,7 @@ static INPUT_PORTS_START( vanilla )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -801,24 +761,14 @@ static INPUT_PORTS_START( vanilla )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( finalbny )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, "Game Out" )
PORT_DIPSETTING( 0x07, "90% (Easy)" )
PORT_DIPSETTING( 0x06, "85%" )
@@ -844,7 +794,7 @@ static INPUT_PORTS_START( finalbny )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -868,7 +818,7 @@ static INPUT_PORTS_START( finalbny )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -878,21 +828,11 @@ static INPUT_PORTS_START( finalbny )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( qmhayaku )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1 (Easy)" )
PORT_DIPSETTING( 0x02, "2" )
@@ -917,7 +857,7 @@ static INPUT_PORTS_START( qmhayaku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -943,7 +883,7 @@ static INPUT_PORTS_START( qmhayaku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -953,21 +893,11 @@ static INPUT_PORTS_START( qmhayaku )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( galkoku )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -993,7 +923,7 @@ static INPUT_PORTS_START( galkoku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1019,7 +949,7 @@ static INPUT_PORTS_START( galkoku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1029,24 +959,14 @@ static INPUT_PORTS_START( galkoku )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( hyouban )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1072,7 +992,7 @@ static INPUT_PORTS_START( hyouban )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1098,7 +1018,7 @@ static INPUT_PORTS_START( hyouban )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1108,24 +1028,14 @@ static INPUT_PORTS_START( hyouban )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( galkaika )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1151,7 +1061,7 @@ static INPUT_PORTS_START( galkaika )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1177,7 +1087,7 @@ static INPUT_PORTS_START( galkaika )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1187,24 +1097,14 @@ static INPUT_PORTS_START( galkaika )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( tokyogal )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1230,7 +1130,7 @@ static INPUT_PORTS_START( tokyogal )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1256,7 +1156,7 @@ static INPUT_PORTS_START( tokyogal )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1266,24 +1166,14 @@ static INPUT_PORTS_START( tokyogal )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( tokimbsj )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1309,7 +1199,7 @@ static INPUT_PORTS_START( tokimbsj )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1335,7 +1225,7 @@ static INPUT_PORTS_START( tokimbsj )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1345,24 +1235,14 @@ static INPUT_PORTS_START( tokimbsj )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( mcontest )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1388,7 +1268,7 @@ static INPUT_PORTS_START( mcontest )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1414,7 +1294,7 @@ static INPUT_PORTS_START( mcontest )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1424,24 +1304,14 @@ static INPUT_PORTS_START( mcontest )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( uchuuai )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1467,7 +1337,7 @@ static INPUT_PORTS_START( uchuuai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1493,7 +1363,7 @@ static INPUT_PORTS_START( uchuuai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1503,24 +1373,14 @@ static INPUT_PORTS_START( uchuuai )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( mjgottub )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1546,7 +1406,7 @@ static INPUT_PORTS_START( mjgottub )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1572,7 +1432,7 @@ static INPUT_PORTS_START( mjgottub )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1582,21 +1442,11 @@ static INPUT_PORTS_START( mjgottub )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( av2mj1bb )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1621,7 +1471,7 @@ static INPUT_PORTS_START( av2mj1bb )
PORT_DIPSETTING( 0x40, "Type-C" )
PORT_DIPSETTING( 0x00, "Type-D" )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x03, "Attract mode" )
PORT_DIPSETTING( 0x03, "No attract mode" )
PORT_DIPSETTING( 0x02, "Once per 10min." )
@@ -1646,7 +1496,7 @@ static INPUT_PORTS_START( av2mj1bb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1656,24 +1506,14 @@ static INPUT_PORTS_START( av2mj1bb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( av2mj2rg )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -1698,7 +1538,7 @@ static INPUT_PORTS_START( av2mj2rg )
PORT_DIPSETTING( 0x40, "Type-C" )
PORT_DIPSETTING( 0x00, "Type-D" )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x03, "Attract mode" )
PORT_DIPSETTING( 0x03, "No attract mode" )
PORT_DIPSETTING( 0x02, "Once per 10min." )
@@ -1723,7 +1563,7 @@ static INPUT_PORTS_START( av2mj2rg )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -1733,17 +1573,7 @@ static INPUT_PORTS_START( av2mj2rg )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c
index 8cd14751a9c..d05a6b01577 100644
--- a/src/mame/drivers/nbmj9195.c
+++ b/src/mame/drivers/nbmj9195.c
@@ -21,6 +21,7 @@ Notes:
#include "driver.h"
#include "machine/z80ctc.h"
+#include "nb1413m3.h" // needed for mahjong input controller
#include "sound/3812intf.h"
#include "sound/dac.h"
#include "cpu/z80/z80daisy.h"
@@ -118,7 +119,7 @@ static WRITE8_HANDLER( nbmj9195_inputportsel_w )
static int nbmj9195_dipsw_r(running_machine *machine)
{
- return ((((input_port_read_indexed(machine, 0) & 0xff) | ((input_port_read_indexed(machine, 1) & 0xff) << 8)) >> nbmj9195_dipswbitsel) & 0x01);
+ return ((((input_port_read(machine, "DSWA") & 0xff) | ((input_port_read(machine, "DSWB") & 0xff) << 8)) >> nbmj9195_dipswbitsel) & 0x01);
}
static void nbmj9195_dipswbitsel_w(int data)
@@ -148,19 +149,19 @@ static void mscoutm_inputportsel_w(int data)
static READ8_HANDLER( mscoutm_dipsw_0_r )
{
// DIPSW A
- return (((input_port_read_indexed(machine, 0) & 0x01) << 7) | ((input_port_read_indexed(machine, 0) & 0x02) << 5) |
- ((input_port_read_indexed(machine, 0) & 0x04) << 3) | ((input_port_read_indexed(machine, 0) & 0x08) << 1) |
- ((input_port_read_indexed(machine, 0) & 0x10) >> 1) | ((input_port_read_indexed(machine, 0) & 0x20) >> 3) |
- ((input_port_read_indexed(machine, 0) & 0x40) >> 5) | ((input_port_read_indexed(machine, 0) & 0x80) >> 7));
+ return (((input_port_read(machine, "DSWA") & 0x01) << 7) | ((input_port_read(machine, "DSWA") & 0x02) << 5) |
+ ((input_port_read(machine, "DSWA") & 0x04) << 3) | ((input_port_read(machine, "DSWA") & 0x08) << 1) |
+ ((input_port_read(machine, "DSWA") & 0x10) >> 1) | ((input_port_read(machine, "DSWA") & 0x20) >> 3) |
+ ((input_port_read(machine, "DSWA") & 0x40) >> 5) | ((input_port_read(machine, "DSWA") & 0x80) >> 7));
}
static READ8_HANDLER( mscoutm_dipsw_1_r )
{
// DIPSW B
- return (((input_port_read_indexed(machine, 1) & 0x01) << 7) | ((input_port_read_indexed(machine, 1) & 0x02) << 5) |
- ((input_port_read_indexed(machine, 1) & 0x04) << 3) | ((input_port_read_indexed(machine, 1) & 0x08) << 1) |
- ((input_port_read_indexed(machine, 1) & 0x10) >> 1) | ((input_port_read_indexed(machine, 1) & 0x20) >> 3) |
- ((input_port_read_indexed(machine, 1) & 0x40) >> 5) | ((input_port_read_indexed(machine, 1) & 0x80) >> 7));
+ return (((input_port_read(machine, "DSWB") & 0x01) << 7) | ((input_port_read(machine, "DSWB") & 0x02) << 5) |
+ ((input_port_read(machine, "DSWB") & 0x04) << 3) | ((input_port_read(machine, "DSWB") & 0x08) << 1) |
+ ((input_port_read(machine, "DSWB") & 0x10) >> 1) | ((input_port_read(machine, "DSWB") & 0x20) >> 3) |
+ ((input_port_read(machine, "DSWB") & 0x40) >> 5) | ((input_port_read(machine, "DSWB") & 0x80) >> 7));
}
@@ -181,29 +182,30 @@ static int tmpz84c011_pio_r(running_machine *machine, int offset)
{
case 0: /* PA_0 */
// COIN IN, ETC...
- portdata = input_port_read_indexed(machine, 2);
+ portdata = input_port_read(machine, "SYSTEM");
break;
case 1: /* PB_0 */
// PLAYER1 KEY, DIPSW A/B
switch (mscoutm_inputport)
{
case 0x01:
- portdata = input_port_read_indexed(machine, 3);
+ portdata = input_port_read(machine, "KEY0");
break;
case 0x02:
- portdata = input_port_read_indexed(machine, 4);
+ portdata = input_port_read(machine, "KEY1");
break;
case 0x04:
- portdata = input_port_read_indexed(machine, 5);
+ portdata = input_port_read(machine, "KEY2");
break;
case 0x08:
- portdata = input_port_read_indexed(machine, 6);
+ portdata = input_port_read(machine, "KEY3");
break;
case 0x10:
- portdata = input_port_read_indexed(machine, 7);
+ portdata = input_port_read(machine, "KEY4");
break;
default:
- portdata = (input_port_read_indexed(machine, 3) & input_port_read_indexed(machine, 4) & input_port_read_indexed(machine, 5) & input_port_read_indexed(machine, 6) & input_port_read_indexed(machine, 7));
+ portdata = (input_port_read(machine, "KEY0") & input_port_read(machine, "KEY1") & input_port_read(machine, "KEY2")
+ & input_port_read(machine, "KEY3") & input_port_read(machine, "KEY4"));
break;
}
break;
@@ -212,22 +214,23 @@ static int tmpz84c011_pio_r(running_machine *machine, int offset)
switch (mscoutm_inputport)
{
case 0x01:
- portdata = input_port_read_indexed(machine, 8);
+ portdata = input_port_read(machine, "KEY5");
break;
case 0x02:
- portdata = input_port_read_indexed(machine, 9);
+ portdata = input_port_read(machine, "KEY6");
break;
case 0x04:
- portdata = input_port_read_indexed(machine, 10);
+ portdata = input_port_read(machine, "KEY7");
break;
case 0x08:
- portdata = input_port_read_indexed(machine, 11);
+ portdata = input_port_read(machine, "KEY8");
break;
case 0x10:
- portdata = input_port_read_indexed(machine, 12);
+ portdata = input_port_read(machine, "KEY9");
break;
default:
- portdata = (input_port_read_indexed(machine, 8) & input_port_read_indexed(machine, 9) & input_port_read_indexed(machine, 10) & input_port_read_indexed(machine, 11) & input_port_read_indexed(machine, 12));
+ portdata = (input_port_read(machine, "KEY5") & input_port_read(machine, "KEY6") & input_port_read(machine, "KEY7")
+ & input_port_read(machine, "KEY8") & input_port_read(machine, "KEY9"));
break;
}
break;
@@ -266,29 +269,29 @@ static int tmpz84c011_pio_r(running_machine *machine, int offset)
{
case 0: /* PA_0 */
// COIN IN, ETC...
- portdata = ((input_port_read_indexed(machine, 2) & 0xfe) | nbmj9195_outcoin_flag);
+ portdata = ((input_port_read(machine, "SYSTEM") & 0xfe) | nbmj9195_outcoin_flag);
break;
case 1: /* PB_0 */
// PLAYER1 KEY, DIPSW A/B
switch (nbmj9195_inputport)
{
case 0x01:
- portdata = input_port_read_indexed(machine, 3);
+ portdata = input_port_read(machine, "KEY0");
break;
case 0x02:
- portdata = input_port_read_indexed(machine, 4);
+ portdata = input_port_read(machine, "KEY1");
break;
case 0x04:
- portdata = input_port_read_indexed(machine, 5);
+ portdata = input_port_read(machine, "KEY2");
break;
case 0x08:
- portdata = input_port_read_indexed(machine, 6);
+ portdata = input_port_read(machine, "KEY3");
break;
case 0x10:
- portdata = ((input_port_read_indexed(machine, 7) & 0x7f) | (nbmj9195_dipsw_r(machine) << 7));
+ portdata = ((input_port_read(machine, "KEY4") & 0x7f) | (nbmj9195_dipsw_r(machine) << 7));
break;
default:
- portdata = (input_port_read_indexed(machine, 3) & input_port_read_indexed(machine, 4) & input_port_read_indexed(machine, 5) & input_port_read_indexed(machine, 6) & (input_port_read_indexed(machine, 12) & 0x7f));
+ portdata = (input_port_read(machine, "KEY0") & input_port_read(machine, "KEY1") & input_port_read(machine, "KEY2") & input_port_read(machine, "KEY3") & (input_port_read(machine, "KEY4") & 0x7f));
break;
}
break;
@@ -297,22 +300,22 @@ static int tmpz84c011_pio_r(running_machine *machine, int offset)
switch (nbmj9195_inputport)
{
case 0x01:
- portdata = input_port_read_indexed(machine, 8);
+ portdata = input_port_read(machine, "KEY5");
break;
case 0x02:
- portdata = input_port_read_indexed(machine, 9);
+ portdata = input_port_read(machine, "KEY6");
break;
case 0x04:
- portdata = input_port_read_indexed(machine, 10);
+ portdata = input_port_read(machine, "KEY7");
break;
case 0x08:
- portdata = input_port_read_indexed(machine, 11);
+ portdata = input_port_read(machine, "KEY8");
break;
case 0x10:
- portdata = input_port_read_indexed(machine, 12) & 0x7f;
+ portdata = input_port_read(machine, "KEY9") & 0x7f;
break;
default:
- portdata = (input_port_read_indexed(machine, 8) & input_port_read_indexed(machine, 9) & input_port_read_indexed(machine, 10) & input_port_read_indexed(machine, 11) & (input_port_read_indexed(machine, 12) & 0x7f));
+ portdata = (input_port_read(machine, "KEY5") & input_port_read(machine, "KEY6") & input_port_read(machine, "KEY7") & input_port_read(machine, "KEY8") & (input_port_read(machine, "KEY9") & 0x7f));
break;
}
break;
@@ -1751,231 +1754,29 @@ static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-#define MJCTRL_NBMJ9195_TYPE1_PORT1 \
- PORT_START /* (3) PORT 1-0 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )\
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_M )\
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_I )\
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_E )\
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_A )\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define MJCTRL_NBMJ9195_TYPE1_PORT2 \
- PORT_START /* (4) PORT 1-1 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_BET )\
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )\
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_N )\
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_J )\
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_F )\
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_B )\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define MJCTRL_NBMJ9195_TYPE1_PORT3 \
- PORT_START /* (5) PORT 1-2 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_RON )\
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )\
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_K )\
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_G )\
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_C )\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define MJCTRL_NBMJ9195_TYPE1_PORT4 \
- PORT_START /* (6) PORT 1-3 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_PON )\
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_L )\
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_H )\
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_D )\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define MJCTRL_NBMJ9195_TYPE1_PORT5 \
- PORT_START /* (7) PORT 1-4 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )\
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )\
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )\
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )\
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )\
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define MJCTRL_NBMJ9195_TYPE1_PORT6 \
- PORT_START /* (8) PORT 2-0 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 ) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2)\
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_M ) PORT_PLAYER(2)\
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_PLAYER(2)\
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)\
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define MJCTRL_NBMJ9195_TYPE1_PORT7 \
- PORT_START /* (9) PORT 2-1 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2)\
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)\
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)\
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)\
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)\
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define MJCTRL_NBMJ9195_TYPE1_PORT8 \
- PORT_START /* (10) PORT 2-2 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)\
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)\
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)\
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)\
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define MJCTRL_NBMJ9195_TYPE1_PORT9 \
- PORT_START /* (11) PORT 2-3 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)\
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)\
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)\
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define MJCTRL_NBMJ9195_TYPE1_PORT10 \
- PORT_START /* (12) PORT 2-4 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)\
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)\
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)\
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)\
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)\
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
-
-#define MJCTRL_NBMJ9195_TYPE2_PORT1 \
- PORT_START /* (3) PORT 1-0 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )\
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_M )\
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_I )\
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_E )\
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_A )\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define MJCTRL_NBMJ9195_TYPE2_PORT2 \
- PORT_START /* (4) PORT 1-1 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_BET )\
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )\
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_N )\
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_J )\
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_F )\
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_B )\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define MJCTRL_NBMJ9195_TYPE2_PORT3 \
- PORT_START /* (5) PORT 1-2 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_RON )\
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )\
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_K )\
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_G )\
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_C )\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define MJCTRL_NBMJ9195_TYPE2_PORT4 \
- PORT_START /* (6) PORT 1-3 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_PON )\
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_L )\
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_H )\
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_D )\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define MJCTRL_NBMJ9195_TYPE2_PORT5 \
- PORT_START /* (7) PORT 1-4 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )\
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )\
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )\
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )\
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )\
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )\
- PORT_SERVICE( 0x40, IP_ACTIVE_LOW ) \
+/********************************************************************************
+These Nichibutsu Mahjong games use two different but very similar control ports:
+ - the 1st type is the common control panel used by many other nbmj* drivers
+ - the 2nd type also include coins and service bits
+********************************************************************************/
+
+static INPUT_PORTS_START( nbmjtype2 )
+ PORT_INCLUDE( nbmjcontrols )
+
+ PORT_MODIFY("KEY4")
+ PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
-#define MJCTRL_NBMJ9195_TYPE2_PORT6 \
- PORT_START /* (8) PORT 2-0 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 ) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2)\
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_M ) PORT_PLAYER(2)\
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_PLAYER(2)\
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)\
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define MJCTRL_NBMJ9195_TYPE2_PORT7 \
- PORT_START /* (9) PORT 2-1 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2)\
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)\
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)\
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)\
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)\
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define MJCTRL_NBMJ9195_TYPE2_PORT8 \
- PORT_START /* (10) PORT 2-2 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)\
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)\
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)\
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)\
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define MJCTRL_NBMJ9195_TYPE2_PORT9 \
- PORT_START /* (11) PORT 2-3 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)\
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)\
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)\
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define MJCTRL_NBMJ9195_TYPE2_PORT10 \
- PORT_START /* (12) PORT 2-4 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)\
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)\
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)\
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)\
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)\
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
+ PORT_MODIFY("KEY9")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
+INPUT_PORTS_END
static INPUT_PORTS_START( mjuraden )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2001,7 +1802,7 @@ static INPUT_PORTS_START( mjuraden )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2027,7 +1828,7 @@ static INPUT_PORTS_START( mjuraden )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2037,24 +1838,14 @@ static INPUT_PORTS_START( mjuraden )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- MJCTRL_NBMJ9195_TYPE1_PORT1
- MJCTRL_NBMJ9195_TYPE1_PORT2
- MJCTRL_NBMJ9195_TYPE1_PORT3
- MJCTRL_NBMJ9195_TYPE1_PORT4
- MJCTRL_NBMJ9195_TYPE1_PORT5
-
- MJCTRL_NBMJ9195_TYPE1_PORT6
- MJCTRL_NBMJ9195_TYPE1_PORT7
- MJCTRL_NBMJ9195_TYPE1_PORT8
- MJCTRL_NBMJ9195_TYPE1_PORT9
- MJCTRL_NBMJ9195_TYPE1_PORT10
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( koinomp )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2080,7 +1871,7 @@ static INPUT_PORTS_START( koinomp )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2106,7 +1897,7 @@ static INPUT_PORTS_START( koinomp )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2116,24 +1907,14 @@ static INPUT_PORTS_START( koinomp )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- MJCTRL_NBMJ9195_TYPE1_PORT1
- MJCTRL_NBMJ9195_TYPE1_PORT2
- MJCTRL_NBMJ9195_TYPE1_PORT3
- MJCTRL_NBMJ9195_TYPE1_PORT4
- MJCTRL_NBMJ9195_TYPE1_PORT5
-
- MJCTRL_NBMJ9195_TYPE1_PORT6
- MJCTRL_NBMJ9195_TYPE1_PORT7
- MJCTRL_NBMJ9195_TYPE1_PORT8
- MJCTRL_NBMJ9195_TYPE1_PORT9
- MJCTRL_NBMJ9195_TYPE1_PORT10
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( patimono )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2159,7 +1940,7 @@ static INPUT_PORTS_START( patimono )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2185,7 +1966,7 @@ static INPUT_PORTS_START( patimono )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2195,24 +1976,14 @@ static INPUT_PORTS_START( patimono )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- MJCTRL_NBMJ9195_TYPE1_PORT1
- MJCTRL_NBMJ9195_TYPE1_PORT2
- MJCTRL_NBMJ9195_TYPE1_PORT3
- MJCTRL_NBMJ9195_TYPE1_PORT4
- MJCTRL_NBMJ9195_TYPE1_PORT5
-
- MJCTRL_NBMJ9195_TYPE1_PORT6
- MJCTRL_NBMJ9195_TYPE1_PORT7
- MJCTRL_NBMJ9195_TYPE1_PORT8
- MJCTRL_NBMJ9195_TYPE1_PORT9
- MJCTRL_NBMJ9195_TYPE1_PORT10
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( janbari )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2238,7 +2009,7 @@ static INPUT_PORTS_START( janbari )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -2264,7 +2035,7 @@ static INPUT_PORTS_START( janbari )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2274,24 +2045,14 @@ static INPUT_PORTS_START( janbari )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- MJCTRL_NBMJ9195_TYPE1_PORT1
- MJCTRL_NBMJ9195_TYPE1_PORT2
- MJCTRL_NBMJ9195_TYPE1_PORT3
- MJCTRL_NBMJ9195_TYPE1_PORT4
- MJCTRL_NBMJ9195_TYPE1_PORT5
-
- MJCTRL_NBMJ9195_TYPE1_PORT6
- MJCTRL_NBMJ9195_TYPE1_PORT7
- MJCTRL_NBMJ9195_TYPE1_PORT8
- MJCTRL_NBMJ9195_TYPE1_PORT9
- MJCTRL_NBMJ9195_TYPE1_PORT10
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( mjanbari )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2317,7 +2078,7 @@ static INPUT_PORTS_START( mjanbari )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -2343,7 +2104,7 @@ static INPUT_PORTS_START( mjanbari )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2353,24 +2114,14 @@ static INPUT_PORTS_START( mjanbari )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- MJCTRL_NBMJ9195_TYPE1_PORT1
- MJCTRL_NBMJ9195_TYPE1_PORT2
- MJCTRL_NBMJ9195_TYPE1_PORT3
- MJCTRL_NBMJ9195_TYPE1_PORT4
- MJCTRL_NBMJ9195_TYPE1_PORT5
-
- MJCTRL_NBMJ9195_TYPE1_PORT6
- MJCTRL_NBMJ9195_TYPE1_PORT7
- MJCTRL_NBMJ9195_TYPE1_PORT8
- MJCTRL_NBMJ9195_TYPE1_PORT9
- MJCTRL_NBMJ9195_TYPE1_PORT10
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( mmehyou )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2396,7 +2147,7 @@ static INPUT_PORTS_START( mmehyou )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -2422,7 +2173,7 @@ static INPUT_PORTS_START( mmehyou )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2432,24 +2183,14 @@ static INPUT_PORTS_START( mmehyou )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- MJCTRL_NBMJ9195_TYPE1_PORT1
- MJCTRL_NBMJ9195_TYPE1_PORT2
- MJCTRL_NBMJ9195_TYPE1_PORT3
- MJCTRL_NBMJ9195_TYPE1_PORT4
- MJCTRL_NBMJ9195_TYPE1_PORT5
-
- MJCTRL_NBMJ9195_TYPE1_PORT6
- MJCTRL_NBMJ9195_TYPE1_PORT7
- MJCTRL_NBMJ9195_TYPE1_PORT8
- MJCTRL_NBMJ9195_TYPE1_PORT9
- MJCTRL_NBMJ9195_TYPE1_PORT10
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( ultramhm )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2475,7 +2216,7 @@ static INPUT_PORTS_START( ultramhm )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2501,7 +2242,7 @@ static INPUT_PORTS_START( ultramhm )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2511,24 +2252,14 @@ static INPUT_PORTS_START( ultramhm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- MJCTRL_NBMJ9195_TYPE1_PORT1
- MJCTRL_NBMJ9195_TYPE1_PORT2
- MJCTRL_NBMJ9195_TYPE1_PORT3
- MJCTRL_NBMJ9195_TYPE1_PORT4
- MJCTRL_NBMJ9195_TYPE1_PORT5
-
- MJCTRL_NBMJ9195_TYPE1_PORT6
- MJCTRL_NBMJ9195_TYPE1_PORT7
- MJCTRL_NBMJ9195_TYPE1_PORT8
- MJCTRL_NBMJ9195_TYPE1_PORT9
- MJCTRL_NBMJ9195_TYPE1_PORT10
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( gal10ren )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2554,7 +2285,7 @@ static INPUT_PORTS_START( gal10ren )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2580,7 +2311,7 @@ static INPUT_PORTS_START( gal10ren )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2590,24 +2321,14 @@ static INPUT_PORTS_START( gal10ren )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- MJCTRL_NBMJ9195_TYPE1_PORT1
- MJCTRL_NBMJ9195_TYPE1_PORT2
- MJCTRL_NBMJ9195_TYPE1_PORT3
- MJCTRL_NBMJ9195_TYPE1_PORT4
- MJCTRL_NBMJ9195_TYPE1_PORT5
-
- MJCTRL_NBMJ9195_TYPE1_PORT6
- MJCTRL_NBMJ9195_TYPE1_PORT7
- MJCTRL_NBMJ9195_TYPE1_PORT8
- MJCTRL_NBMJ9195_TYPE1_PORT9
- MJCTRL_NBMJ9195_TYPE1_PORT10
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( renaiclb )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2633,7 +2354,7 @@ static INPUT_PORTS_START( renaiclb )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2659,7 +2380,7 @@ static INPUT_PORTS_START( renaiclb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2669,21 +2390,11 @@ static INPUT_PORTS_START( renaiclb )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- MJCTRL_NBMJ9195_TYPE1_PORT1
- MJCTRL_NBMJ9195_TYPE1_PORT2
- MJCTRL_NBMJ9195_TYPE1_PORT3
- MJCTRL_NBMJ9195_TYPE1_PORT4
- MJCTRL_NBMJ9195_TYPE1_PORT5
-
- MJCTRL_NBMJ9195_TYPE1_PORT6
- MJCTRL_NBMJ9195_TYPE1_PORT7
- MJCTRL_NBMJ9195_TYPE1_PORT8
- MJCTRL_NBMJ9195_TYPE1_PORT9
- MJCTRL_NBMJ9195_TYPE1_PORT10
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( mjlaman )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -2708,7 +2419,7 @@ static INPUT_PORTS_START( mjlaman )
PORT_DIPSETTING( 0x20, "7" )
PORT_DIPSETTING( 0x00, "8 (Hard)" )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2734,7 +2445,7 @@ static INPUT_PORTS_START( mjlaman )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2744,21 +2455,11 @@ static INPUT_PORTS_START( mjlaman )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- MJCTRL_NBMJ9195_TYPE1_PORT1
- MJCTRL_NBMJ9195_TYPE1_PORT2
- MJCTRL_NBMJ9195_TYPE1_PORT3
- MJCTRL_NBMJ9195_TYPE1_PORT4
- MJCTRL_NBMJ9195_TYPE1_PORT5
-
- MJCTRL_NBMJ9195_TYPE1_PORT6
- MJCTRL_NBMJ9195_TYPE1_PORT7
- MJCTRL_NBMJ9195_TYPE1_PORT8
- MJCTRL_NBMJ9195_TYPE1_PORT9
- MJCTRL_NBMJ9195_TYPE1_PORT10
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( mkeibaou )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -2783,7 +2484,7 @@ static INPUT_PORTS_START( mkeibaou )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2809,7 +2510,7 @@ static INPUT_PORTS_START( mkeibaou )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2819,21 +2520,11 @@ static INPUT_PORTS_START( mkeibaou )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- MJCTRL_NBMJ9195_TYPE1_PORT1
- MJCTRL_NBMJ9195_TYPE1_PORT2
- MJCTRL_NBMJ9195_TYPE1_PORT3
- MJCTRL_NBMJ9195_TYPE1_PORT4
- MJCTRL_NBMJ9195_TYPE1_PORT5
-
- MJCTRL_NBMJ9195_TYPE1_PORT6
- MJCTRL_NBMJ9195_TYPE1_PORT7
- MJCTRL_NBMJ9195_TYPE1_PORT8
- MJCTRL_NBMJ9195_TYPE1_PORT9
- MJCTRL_NBMJ9195_TYPE1_PORT10
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( pachiten )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, "Game Out" )
PORT_DIPSETTING( 0x07, "90% (Easy)" )
PORT_DIPSETTING( 0x06, "85%" )
@@ -2859,7 +2550,7 @@ static INPUT_PORTS_START( pachiten )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -2883,7 +2574,7 @@ static INPUT_PORTS_START( pachiten )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2893,21 +2584,11 @@ static INPUT_PORTS_START( pachiten )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- MJCTRL_NBMJ9195_TYPE1_PORT1
- MJCTRL_NBMJ9195_TYPE1_PORT2
- MJCTRL_NBMJ9195_TYPE1_PORT3
- MJCTRL_NBMJ9195_TYPE1_PORT4
- MJCTRL_NBMJ9195_TYPE1_PORT5
-
- MJCTRL_NBMJ9195_TYPE1_PORT6
- MJCTRL_NBMJ9195_TYPE1_PORT7
- MJCTRL_NBMJ9195_TYPE1_PORT8
- MJCTRL_NBMJ9195_TYPE1_PORT9
- MJCTRL_NBMJ9195_TYPE1_PORT10
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( sailorws )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -2932,7 +2613,7 @@ static INPUT_PORTS_START( sailorws )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2958,7 +2639,7 @@ static INPUT_PORTS_START( sailorws )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -2968,21 +2649,11 @@ static INPUT_PORTS_START( sailorws )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- MJCTRL_NBMJ9195_TYPE1_PORT1
- MJCTRL_NBMJ9195_TYPE1_PORT2
- MJCTRL_NBMJ9195_TYPE1_PORT3
- MJCTRL_NBMJ9195_TYPE1_PORT4
- MJCTRL_NBMJ9195_TYPE1_PORT5
-
- MJCTRL_NBMJ9195_TYPE1_PORT6
- MJCTRL_NBMJ9195_TYPE1_PORT7
- MJCTRL_NBMJ9195_TYPE1_PORT8
- MJCTRL_NBMJ9195_TYPE1_PORT9
- MJCTRL_NBMJ9195_TYPE1_PORT10
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( sailorwr )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, "Game Out" )
PORT_DIPSETTING( 0x07, "90% (Easy)" )
PORT_DIPSETTING( 0x06, "85%" )
@@ -3008,7 +2679,7 @@ static INPUT_PORTS_START( sailorwr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
@@ -3032,7 +2703,7 @@ static INPUT_PORTS_START( sailorwr )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -3042,21 +2713,11 @@ static INPUT_PORTS_START( sailorwr )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- MJCTRL_NBMJ9195_TYPE1_PORT1
- MJCTRL_NBMJ9195_TYPE1_PORT2
- MJCTRL_NBMJ9195_TYPE1_PORT3
- MJCTRL_NBMJ9195_TYPE1_PORT4
- MJCTRL_NBMJ9195_TYPE1_PORT5
-
- MJCTRL_NBMJ9195_TYPE1_PORT6
- MJCTRL_NBMJ9195_TYPE1_PORT7
- MJCTRL_NBMJ9195_TYPE1_PORT8
- MJCTRL_NBMJ9195_TYPE1_PORT9
- MJCTRL_NBMJ9195_TYPE1_PORT10
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( psailor1 )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -3081,7 +2742,7 @@ static INPUT_PORTS_START( psailor1 )
PORT_DIPSETTING( 0x20, "7" )
PORT_DIPSETTING( 0x00, "8 (Hard)" )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x03, "Start Score" )
PORT_DIPSETTING( 0x00, "5000" )
PORT_DIPSETTING( 0x01, "3000" )
@@ -3106,7 +2767,7 @@ static INPUT_PORTS_START( psailor1 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -3116,21 +2777,11 @@ static INPUT_PORTS_START( psailor1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- MJCTRL_NBMJ9195_TYPE1_PORT1
- MJCTRL_NBMJ9195_TYPE1_PORT2
- MJCTRL_NBMJ9195_TYPE1_PORT3
- MJCTRL_NBMJ9195_TYPE1_PORT4
- MJCTRL_NBMJ9195_TYPE1_PORT5
-
- MJCTRL_NBMJ9195_TYPE1_PORT6
- MJCTRL_NBMJ9195_TYPE1_PORT7
- MJCTRL_NBMJ9195_TYPE1_PORT8
- MJCTRL_NBMJ9195_TYPE1_PORT9
- MJCTRL_NBMJ9195_TYPE1_PORT10
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( psailor2 )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
@@ -3155,7 +2806,7 @@ static INPUT_PORTS_START( psailor2 )
PORT_DIPSETTING( 0x20, "7" )
PORT_DIPSETTING( 0x00, "8 (Hard)" )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x03, "Start Score" )
PORT_DIPSETTING( 0x00, "5000" )
PORT_DIPSETTING( 0x01, "3000" )
@@ -3180,7 +2831,7 @@ static INPUT_PORTS_START( psailor2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -3190,24 +2841,14 @@ static INPUT_PORTS_START( psailor2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- MJCTRL_NBMJ9195_TYPE1_PORT1
- MJCTRL_NBMJ9195_TYPE1_PORT2
- MJCTRL_NBMJ9195_TYPE1_PORT3
- MJCTRL_NBMJ9195_TYPE1_PORT4
- MJCTRL_NBMJ9195_TYPE1_PORT5
-
- MJCTRL_NBMJ9195_TYPE1_PORT6
- MJCTRL_NBMJ9195_TYPE1_PORT7
- MJCTRL_NBMJ9195_TYPE1_PORT8
- MJCTRL_NBMJ9195_TYPE1_PORT9
- MJCTRL_NBMJ9195_TYPE1_PORT10
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( otatidai )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -3232,7 +2873,7 @@ static INPUT_PORTS_START( otatidai )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_3C ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x03, "Start Score" )
PORT_DIPSETTING( 0x00, "5000" )
PORT_DIPSETTING( 0x01, "3000" )
@@ -3257,7 +2898,7 @@ static INPUT_PORTS_START( otatidai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -3267,24 +2908,14 @@ static INPUT_PORTS_START( otatidai )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- MJCTRL_NBMJ9195_TYPE1_PORT1
- MJCTRL_NBMJ9195_TYPE1_PORT2
- MJCTRL_NBMJ9195_TYPE1_PORT3
- MJCTRL_NBMJ9195_TYPE1_PORT4
- MJCTRL_NBMJ9195_TYPE1_PORT5
-
- MJCTRL_NBMJ9195_TYPE1_PORT6
- MJCTRL_NBMJ9195_TYPE1_PORT7
- MJCTRL_NBMJ9195_TYPE1_PORT8
- MJCTRL_NBMJ9195_TYPE1_PORT9
- MJCTRL_NBMJ9195_TYPE1_PORT10
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( wcatcher )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -3309,7 +2940,7 @@ static INPUT_PORTS_START( wcatcher )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_3C ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3335,7 +2966,7 @@ static INPUT_PORTS_START( wcatcher )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -3345,24 +2976,14 @@ static INPUT_PORTS_START( wcatcher )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- MJCTRL_NBMJ9195_TYPE1_PORT1
- MJCTRL_NBMJ9195_TYPE1_PORT2
- MJCTRL_NBMJ9195_TYPE1_PORT3
- MJCTRL_NBMJ9195_TYPE1_PORT4
- MJCTRL_NBMJ9195_TYPE1_PORT5
-
- MJCTRL_NBMJ9195_TYPE1_PORT6
- MJCTRL_NBMJ9195_TYPE1_PORT7
- MJCTRL_NBMJ9195_TYPE1_PORT8
- MJCTRL_NBMJ9195_TYPE1_PORT9
- MJCTRL_NBMJ9195_TYPE1_PORT10
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( yosimoto )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -3387,7 +3008,7 @@ static INPUT_PORTS_START( yosimoto )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x03, "Start Score" )
PORT_DIPSETTING( 0x00, "5000" )
PORT_DIPSETTING( 0x01, "3000" )
@@ -3412,7 +3033,7 @@ static INPUT_PORTS_START( yosimoto )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -3422,24 +3043,14 @@ static INPUT_PORTS_START( yosimoto )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- MJCTRL_NBMJ9195_TYPE1_PORT1
- MJCTRL_NBMJ9195_TYPE1_PORT2
- MJCTRL_NBMJ9195_TYPE1_PORT3
- MJCTRL_NBMJ9195_TYPE1_PORT4
- MJCTRL_NBMJ9195_TYPE1_PORT5
-
- MJCTRL_NBMJ9195_TYPE1_PORT6
- MJCTRL_NBMJ9195_TYPE1_PORT7
- MJCTRL_NBMJ9195_TYPE1_PORT8
- MJCTRL_NBMJ9195_TYPE1_PORT9
- MJCTRL_NBMJ9195_TYPE1_PORT10
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( jituroku )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3465,7 +3076,7 @@ static INPUT_PORTS_START( jituroku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3491,7 +3102,7 @@ static INPUT_PORTS_START( jituroku )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -3501,21 +3112,11 @@ static INPUT_PORTS_START( jituroku )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- MJCTRL_NBMJ9195_TYPE1_PORT1
- MJCTRL_NBMJ9195_TYPE1_PORT2
- MJCTRL_NBMJ9195_TYPE1_PORT3
- MJCTRL_NBMJ9195_TYPE1_PORT4
- MJCTRL_NBMJ9195_TYPE1_PORT5
-
- MJCTRL_NBMJ9195_TYPE1_PORT6
- MJCTRL_NBMJ9195_TYPE1_PORT7
- MJCTRL_NBMJ9195_TYPE1_PORT8
- MJCTRL_NBMJ9195_TYPE1_PORT9
- MJCTRL_NBMJ9195_TYPE1_PORT10
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( ngpgal )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -3541,7 +3142,7 @@ static INPUT_PORTS_START( ngpgal )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3567,7 +3168,7 @@ static INPUT_PORTS_START( ngpgal )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -3577,21 +3178,11 @@ static INPUT_PORTS_START( ngpgal )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- MJCTRL_NBMJ9195_TYPE1_PORT1
- MJCTRL_NBMJ9195_TYPE1_PORT2
- MJCTRL_NBMJ9195_TYPE1_PORT3
- MJCTRL_NBMJ9195_TYPE1_PORT4
- MJCTRL_NBMJ9195_TYPE1_PORT5
-
- MJCTRL_NBMJ9195_TYPE1_PORT6
- MJCTRL_NBMJ9195_TYPE1_PORT7
- MJCTRL_NBMJ9195_TYPE1_PORT8
- MJCTRL_NBMJ9195_TYPE1_PORT9
- MJCTRL_NBMJ9195_TYPE1_PORT10
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( mjgottsu )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -3616,7 +3207,7 @@ static INPUT_PORTS_START( mjgottsu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3642,7 +3233,7 @@ static INPUT_PORTS_START( mjgottsu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -3652,21 +3243,11 @@ static INPUT_PORTS_START( mjgottsu )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- MJCTRL_NBMJ9195_TYPE1_PORT1
- MJCTRL_NBMJ9195_TYPE1_PORT2
- MJCTRL_NBMJ9195_TYPE1_PORT3
- MJCTRL_NBMJ9195_TYPE1_PORT4
- MJCTRL_NBMJ9195_TYPE1_PORT5
-
- MJCTRL_NBMJ9195_TYPE1_PORT6
- MJCTRL_NBMJ9195_TYPE1_PORT7
- MJCTRL_NBMJ9195_TYPE1_PORT8
- MJCTRL_NBMJ9195_TYPE1_PORT9
- MJCTRL_NBMJ9195_TYPE1_PORT10
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( bakuhatu )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -3691,7 +3272,7 @@ static INPUT_PORTS_START( bakuhatu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3717,7 +3298,7 @@ static INPUT_PORTS_START( bakuhatu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -3727,21 +3308,11 @@ static INPUT_PORTS_START( bakuhatu )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- MJCTRL_NBMJ9195_TYPE1_PORT1
- MJCTRL_NBMJ9195_TYPE1_PORT2
- MJCTRL_NBMJ9195_TYPE1_PORT3
- MJCTRL_NBMJ9195_TYPE1_PORT4
- MJCTRL_NBMJ9195_TYPE1_PORT5
-
- MJCTRL_NBMJ9195_TYPE1_PORT6
- MJCTRL_NBMJ9195_TYPE1_PORT7
- MJCTRL_NBMJ9195_TYPE1_PORT8
- MJCTRL_NBMJ9195_TYPE1_PORT9
- MJCTRL_NBMJ9195_TYPE1_PORT10
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( cmehyou )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -3767,7 +3338,7 @@ static INPUT_PORTS_START( cmehyou )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3793,7 +3364,7 @@ static INPUT_PORTS_START( cmehyou )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -3803,21 +3374,11 @@ static INPUT_PORTS_START( cmehyou )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- MJCTRL_NBMJ9195_TYPE1_PORT1
- MJCTRL_NBMJ9195_TYPE1_PORT2
- MJCTRL_NBMJ9195_TYPE1_PORT3
- MJCTRL_NBMJ9195_TYPE1_PORT4
- MJCTRL_NBMJ9195_TYPE1_PORT5
-
- MJCTRL_NBMJ9195_TYPE1_PORT6
- MJCTRL_NBMJ9195_TYPE1_PORT7
- MJCTRL_NBMJ9195_TYPE1_PORT8
- MJCTRL_NBMJ9195_TYPE1_PORT9
- MJCTRL_NBMJ9195_TYPE1_PORT10
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( mjkoiura )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -3843,7 +3404,7 @@ static INPUT_PORTS_START( mjkoiura )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3869,7 +3430,7 @@ static INPUT_PORTS_START( mjkoiura )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN OUT
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
@@ -3879,21 +3440,11 @@ static INPUT_PORTS_START( mjkoiura )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- MJCTRL_NBMJ9195_TYPE1_PORT1
- MJCTRL_NBMJ9195_TYPE1_PORT2
- MJCTRL_NBMJ9195_TYPE1_PORT3
- MJCTRL_NBMJ9195_TYPE1_PORT4
- MJCTRL_NBMJ9195_TYPE1_PORT5
-
- MJCTRL_NBMJ9195_TYPE1_PORT6
- MJCTRL_NBMJ9195_TYPE1_PORT7
- MJCTRL_NBMJ9195_TYPE1_PORT8
- MJCTRL_NBMJ9195_TYPE1_PORT9
- MJCTRL_NBMJ9195_TYPE1_PORT10
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( mscoutm )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -3918,7 +3469,7 @@ static INPUT_PORTS_START( mscoutm )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3944,7 +3495,7 @@ static INPUT_PORTS_START( mscoutm )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -3954,21 +3505,11 @@ static INPUT_PORTS_START( mscoutm )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
- MJCTRL_NBMJ9195_TYPE2_PORT1
- MJCTRL_NBMJ9195_TYPE2_PORT2
- MJCTRL_NBMJ9195_TYPE2_PORT3
- MJCTRL_NBMJ9195_TYPE2_PORT4
- MJCTRL_NBMJ9195_TYPE2_PORT5
-
- MJCTRL_NBMJ9195_TYPE2_PORT6
- MJCTRL_NBMJ9195_TYPE2_PORT7
- MJCTRL_NBMJ9195_TYPE2_PORT8
- MJCTRL_NBMJ9195_TYPE2_PORT9
- MJCTRL_NBMJ9195_TYPE2_PORT10
+ PORT_INCLUDE( nbmjtype2 )
INPUT_PORTS_END
static INPUT_PORTS_START( imekura )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -3993,7 +3534,7 @@ static INPUT_PORTS_START( imekura )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_3C ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -4019,7 +3560,7 @@ static INPUT_PORTS_START( imekura )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -4029,21 +3570,11 @@ static INPUT_PORTS_START( imekura )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
- MJCTRL_NBMJ9195_TYPE2_PORT1
- MJCTRL_NBMJ9195_TYPE2_PORT2
- MJCTRL_NBMJ9195_TYPE2_PORT3
- MJCTRL_NBMJ9195_TYPE2_PORT4
- MJCTRL_NBMJ9195_TYPE2_PORT5
-
- MJCTRL_NBMJ9195_TYPE2_PORT6
- MJCTRL_NBMJ9195_TYPE2_PORT7
- MJCTRL_NBMJ9195_TYPE2_PORT8
- MJCTRL_NBMJ9195_TYPE2_PORT9
- MJCTRL_NBMJ9195_TYPE2_PORT10
+ PORT_INCLUDE( nbmjtype2 )
INPUT_PORTS_END
static INPUT_PORTS_START( mjegolf )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x07, "1 (Easy)" )
PORT_DIPSETTING( 0x06, "2" )
@@ -4068,7 +3599,7 @@ static INPUT_PORTS_START( mjegolf )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_3C ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -4094,7 +3625,7 @@ static INPUT_PORTS_START( mjegolf )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -4104,17 +3635,7 @@ static INPUT_PORTS_START( mjegolf )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE2 ) // ANALYZER
- MJCTRL_NBMJ9195_TYPE2_PORT1
- MJCTRL_NBMJ9195_TYPE2_PORT2
- MJCTRL_NBMJ9195_TYPE2_PORT3
- MJCTRL_NBMJ9195_TYPE2_PORT4
- MJCTRL_NBMJ9195_TYPE2_PORT5
-
- MJCTRL_NBMJ9195_TYPE2_PORT6
- MJCTRL_NBMJ9195_TYPE2_PORT7
- MJCTRL_NBMJ9195_TYPE2_PORT8
- MJCTRL_NBMJ9195_TYPE2_PORT9
- MJCTRL_NBMJ9195_TYPE2_PORT10
+ PORT_INCLUDE( nbmjtype2 )
INPUT_PORTS_END
diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c
index 87fcd20bfe8..92226ed1f2b 100644
--- a/src/mame/drivers/niyanpai.c
+++ b/src/mame/drivers/niyanpai.c
@@ -247,27 +247,27 @@ static READ16_HANDLER( niyanpai_dipsw_r )
{
UINT8 dipsw_a, dipsw_b;
- dipsw_a = (((input_port_read_indexed(machine, 0) & 0x01) << 7) | ((input_port_read_indexed(machine, 0) & 0x02) << 5) |
- ((input_port_read_indexed(machine, 0) & 0x04) << 3) | ((input_port_read_indexed(machine, 0) & 0x08) << 1) |
- ((input_port_read_indexed(machine, 0) & 0x10) >> 1) | ((input_port_read_indexed(machine, 0) & 0x20) >> 3) |
- ((input_port_read_indexed(machine, 0) & 0x40) >> 5) | ((input_port_read_indexed(machine, 0) & 0x80) >> 7));
+ dipsw_a = (((input_port_read(machine, "DSWA") & 0x01) << 7) | ((input_port_read(machine, "DSWA") & 0x02) << 5) |
+ ((input_port_read(machine, "DSWA") & 0x04) << 3) | ((input_port_read(machine, "DSWA") & 0x08) << 1) |
+ ((input_port_read(machine, "DSWA") & 0x10) >> 1) | ((input_port_read(machine, "DSWA") & 0x20) >> 3) |
+ ((input_port_read(machine, "DSWA") & 0x40) >> 5) | ((input_port_read(machine, "DSWA") & 0x80) >> 7));
- dipsw_b = (((input_port_read_indexed(machine, 1) & 0x01) << 7) | ((input_port_read_indexed(machine, 1) & 0x02) << 5) |
- ((input_port_read_indexed(machine, 1) & 0x04) << 3) | ((input_port_read_indexed(machine, 1) & 0x08) << 1) |
- ((input_port_read_indexed(machine, 1) & 0x10) >> 1) | ((input_port_read_indexed(machine, 1) & 0x20) >> 3) |
- ((input_port_read_indexed(machine, 1) & 0x40) >> 5) | ((input_port_read_indexed(machine, 1) & 0x80) >> 7));
+ dipsw_b = (((input_port_read(machine, "DSWB") & 0x01) << 7) | ((input_port_read(machine, "DSWB") & 0x02) << 5) |
+ ((input_port_read(machine, "DSWB") & 0x04) << 3) | ((input_port_read(machine, "DSWB") & 0x08) << 1) |
+ ((input_port_read(machine, "DSWB") & 0x10) >> 1) | ((input_port_read(machine, "DSWB") & 0x20) >> 3) |
+ ((input_port_read(machine, "DSWB") & 0x40) >> 5) | ((input_port_read(machine, "DSWB") & 0x80) >> 7));
return ((dipsw_a << 8) | dipsw_b);
}
static READ16_HANDLER( niyanpai_inputport_0_r )
{
- return ((input_port_read_indexed(machine, 3) << 8) | (input_port_read_indexed(machine, 4) << 0));
+ return ((input_port_read(machine, "P1") << 8) | (input_port_read(machine, "P2") << 0));
}
static READ16_HANDLER( niyanpai_inputport_1_r )
{
- return ((input_port_read_indexed(machine, 2) << 8) | 0xff);
+ return ((input_port_read(machine, "SYSTEM") << 8) | 0xff);
}
static READ16_HANDLER( musobana_inputport_0_r )
@@ -276,12 +276,14 @@ static READ16_HANDLER( musobana_inputport_0_r )
switch ((musobana_inputport ^ 0xff00) >> 8)
{
- case 0x01: portdata = ((input_port_read_indexed(machine, 3) << 8) | (input_port_read_indexed(machine, 8))); break;
- case 0x02: portdata = ((input_port_read_indexed(machine, 4) << 8) | (input_port_read_indexed(machine, 9))); break;
- case 0x04: portdata = ((input_port_read_indexed(machine, 5) << 8) | (input_port_read_indexed(machine, 10))); break;
- case 0x08: portdata = ((input_port_read_indexed(machine, 6) << 8) | (input_port_read_indexed(machine, 11))); break;
- case 0x10: portdata = ((input_port_read_indexed(machine, 7) << 8) | (input_port_read_indexed(machine, 12))); break;
- default: portdata = (((input_port_read_indexed(machine, 3) << 8) | (input_port_read_indexed(machine, 8)))) & (((input_port_read_indexed(machine, 4) << 8) | (input_port_read_indexed(machine, 9)))) & (((input_port_read_indexed(machine, 5) << 8) | (input_port_read_indexed(machine, 10)))) & (((input_port_read_indexed(machine, 6) << 8) | (input_port_read_indexed(machine, 11)))) & (((input_port_read_indexed(machine, 7) << 8) | (input_port_read_indexed(machine, 12)))); break;
+ case 0x01: portdata = ((input_port_read(machine, "KEY0") << 8) | (input_port_read(machine, "KEY5"))); break;
+ case 0x02: portdata = ((input_port_read(machine, "KEY1") << 8) | (input_port_read(machine, "KEY6"))); break;
+ case 0x04: portdata = ((input_port_read(machine, "KEY2") << 8) | (input_port_read(machine, "KEY7"))); break;
+ case 0x08: portdata = ((input_port_read(machine, "KEY3") << 8) | (input_port_read(machine, "KEY8"))); break;
+ case 0x10: portdata = ((input_port_read(machine, "KEY4") << 8) | (input_port_read(machine, "KEY9"))); break;
+ default: portdata = (((input_port_read(machine, "KEY0") << 8) | (input_port_read(machine, "KEY5")))) & (((input_port_read(machine, "KEY1") << 8) | (input_port_read(machine, "KEY6"))))
+ & (((input_port_read(machine, "KEY2") << 8) | (input_port_read(machine, "KEY7")))) & (((input_port_read(machine, "KEY3") << 8) | (input_port_read(machine, "KEY8"))))
+ & (((input_port_read(machine, "KEY4") << 8) | (input_port_read(machine, "KEY9")))); break;
}
return (portdata);
@@ -297,7 +299,7 @@ static READ16_HANDLER( musobana_inputport_1_r )
if (tmp68301_parallel_interface_r(machine, 0x0005, 0x00ff) & 0x0004) musobana_outcoin_flag ^= 1;
else musobana_outcoin_flag = 1;
- return (((input_port_read_indexed(machine, 2) & 0xdf) | ((musobana_outcoin_flag & 0x01) << 5)) << 8);
+ return (((input_port_read(machine, "SYSTEM") & 0xdf) | ((musobana_outcoin_flag & 0x01) << 5)) << 8);
}
static WRITE16_HANDLER ( musobana_inputport_w )
@@ -536,7 +538,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( niyanpai )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -560,7 +562,7 @@ static INPUT_PORTS_START( niyanpai )
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x80, DEF_STR( Cocktail ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x00, "Nudity" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -569,7 +571,7 @@ static INPUT_PORTS_START( niyanpai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
@@ -579,7 +581,7 @@ static INPUT_PORTS_START( niyanpai )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ?
PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) // TEST
- PORT_START /* (3) PLAYER-1 */
+ PORT_START_TAG("P1") /* (3) PLAYER-1 */
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_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
@@ -589,7 +591,7 @@ static INPUT_PORTS_START( niyanpai )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* (4) PLAYER-2 */
+ PORT_START_TAG("P2") /* (4) PLAYER-2 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
@@ -604,7 +606,7 @@ static INPUT_PORTS_START( musobana )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, "Game Out" )
PORT_DIPSETTING( 0x03, "90% (Easy)" )
PORT_DIPSETTING( 0x02, "80%" )
@@ -628,7 +630,7 @@ static INPUT_PORTS_START( musobana )
PORT_DIPSETTING( 0x80, "Medal Type" )
PORT_DIPSETTING( 0x00, "Credit Type" )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x03, "Bet Min" )
PORT_DIPSETTING( 0x03, "1" )
PORT_DIPSETTING( 0x02, "2" )
@@ -652,7 +654,7 @@ static INPUT_PORTS_START( musobana )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
@@ -662,24 +664,14 @@ static INPUT_PORTS_START( musobana )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) // TEST
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( 4psimasy )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -705,7 +697,7 @@ static INPUT_PORTS_START( 4psimasy )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -731,7 +723,7 @@ static INPUT_PORTS_START( 4psimasy )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
@@ -741,24 +733,14 @@ static INPUT_PORTS_START( 4psimasy )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) // TEST
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
static INPUT_PORTS_START( mhhonban )
// I don't have manual for this game.
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -784,7 +766,7 @@ static INPUT_PORTS_START( mhhonban )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -810,7 +792,7 @@ static INPUT_PORTS_START( mhhonban )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (2) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) // COIN1
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) // COIN2
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START3 ) // CREDIT CLEAR
@@ -820,17 +802,7 @@ static INPUT_PORTS_START( mhhonban )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW ) // TEST
- NBMJCTRL_PORT1 /* (3) PORT 1-1 */
- NBMJCTRL_PORT2 /* (4) PORT 1-2 */
- NBMJCTRL_PORT3 /* (5) PORT 1-3 */
- NBMJCTRL_PORT4 /* (6) PORT 1-4 */
- NBMJCTRL_PORT5 /* (7) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (8) PORT 2-1 */
- NBMJCTRL_PORT7 /* (9) PORT 2-2 */
- NBMJCTRL_PORT8 /* (10) PORT 2-3 */
- NBMJCTRL_PORT9 /* (11) PORT 2-4 */
- NBMJCTRL_PORT10 /* (12) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
diff --git a/src/mame/drivers/pastelg.c b/src/mame/drivers/pastelg.c
index 775bc2851d0..fa0de9a25da 100644
--- a/src/mame/drivers/pastelg.c
+++ b/src/mame/drivers/pastelg.c
@@ -77,7 +77,7 @@ static ADDRESS_MAP_START( readport_pastelg, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xb0, 0xb0) AM_READ(nb1413m3_inputport2_r)
AM_RANGE(0xc0, 0xc0) AM_READ(pastelg_sndrom_r)
AM_RANGE(0xd0, 0xd0) AM_READ(SMH_NOP) // unknown
- AM_RANGE(0xe0, 0xe0) AM_READ(input_port_2_r)
+ AM_RANGE(0xe0, 0xe0) AM_READ_PORT("DSWC")
ADDRESS_MAP_END
static ADDRESS_MAP_START( writeport_pastelg, ADDRESS_SPACE_IO, 8 )
@@ -94,7 +94,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( pastelg )
- PORT_START /* (0) DIPSW-A */
+ PORT_START_TAG("DSWA") /* (0) DIPSW-A */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x03, "1 (Easy)" )
PORT_DIPSETTING( 0x02, "2" )
@@ -119,7 +119,7 @@ static INPUT_PORTS_START( pastelg )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (1) DIPSW-B */
+ PORT_START_TAG("DSWB") /* (1) DIPSW-B */
PORT_DIPNAME( 0x03, 0x00, "Number of last chance" )
PORT_DIPSETTING( 0x03, "0" )
PORT_DIPSETTING( 0x02, "1" )
@@ -143,7 +143,7 @@ static INPUT_PORTS_START( pastelg )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (2) DIPSW-C */
+ PORT_START_TAG("DSWC") /* (2) DIPSW-C */
PORT_DIPNAME( 0x03, 0x03, "Change Rate" )
PORT_DIPSETTING( 0x03, "Type-A" )
PORT_DIPSETTING( 0x02, "Type-B" )
@@ -167,7 +167,7 @@ static INPUT_PORTS_START( pastelg )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* (3) PORT 0 */
+ PORT_START_TAG("SYSTEM") /* (3) PORT 0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) // DRAW BUSY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) //
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE3 ) // MEMORY RESET
@@ -177,17 +177,7 @@ static INPUT_PORTS_START( pastelg )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE4 ) // CREDIT CLEAR
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // SERVICE
- NBMJCTRL_PORT1 /* (4) PORT 1-1 */
- NBMJCTRL_PORT2 /* (5) PORT 1-2 */
- NBMJCTRL_PORT3 /* (6) PORT 1-3 */
- NBMJCTRL_PORT4 /* (7) PORT 1-4 */
- NBMJCTRL_PORT5 /* (8) PORT 1-5 */
-
- NBMJCTRL_PORT6 /* (9) PORT 2-1 */
- NBMJCTRL_PORT7 /* (10) PORT 2-2 */
- NBMJCTRL_PORT8 /* (11) PORT 2-3 */
- NBMJCTRL_PORT9 /* (12) PORT 2-4 */
- NBMJCTRL_PORT10 /* (13) PORT 2-5 */
+ PORT_INCLUDE( nbmjcontrols )
INPUT_PORTS_END
diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c
index 948aa41cb5a..a41b3c500a9 100644
--- a/src/mame/drivers/rabbit.c
+++ b/src/mame/drivers/rabbit.c
@@ -448,7 +448,7 @@ static READ32_HANDLER( rabbit_input_r )
{
int rv;
- rv = (input_port_read_indexed(machine, 1)<<16)|(input_port_read_indexed(machine, 0));
+ rv = (input_port_read(machine, "IN1")<<16)|(input_port_read(machine, "IN0"));
rv &= ~1;
rv |= eeprom_read_bit(); // as per code at 4d932
return rv;
@@ -458,7 +458,7 @@ static READ32_HANDLER( tmmjprd_input_r )
{
int rv;
- rv = (input_port_read_indexed(machine, 1)<<16)|(input_port_read_indexed(machine, 0));
+ rv = (input_port_read(machine, "IN1")<<16)|(input_port_read(machine, "IN0"));
rv &= ~0x80;
rv |= (eeprom_read_bit()<<7); // as per code at 778
return rv;
@@ -826,7 +826,7 @@ static ADDRESS_MAP_START( tmmjprd_writemem, ADDRESS_SPACE_PROGRAM, 32 )
ADDRESS_MAP_END
static INPUT_PORTS_START( rabbit )
- PORT_START /* 16bit */
+ PORT_START_TAG("IN0") /* 16bit */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SPECIAL ) // Eeprom
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unlabeled in input test
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -844,7 +844,7 @@ static INPUT_PORTS_START( rabbit )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
- PORT_START /* 16bit */
+ PORT_START_TAG("IN1") /* 16bit */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -880,7 +880,7 @@ static INPUT_PORTS_START( rabbit )
INPUT_PORTS_END
static INPUT_PORTS_START( tmmjprd )
- PORT_START /* 16bit */
+ PORT_START_TAG("IN0") /* 16bit */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unlabeled in input test
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
@@ -898,7 +898,7 @@ static INPUT_PORTS_START( tmmjprd )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
- PORT_START /* 16bit */
+ PORT_START_TAG("IN1") /* 16bit */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c
index d559e30a9d3..b48599b7436 100644
--- a/src/mame/drivers/raiden2.c
+++ b/src/mame/drivers/raiden2.c
@@ -770,7 +770,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( raiden2 )
SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */
- PORT_START /* IN0 */
+ PORT_START_TAG("P1") /* IN0 */
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)
@@ -780,7 +780,7 @@ static INPUT_PORTS_START( raiden2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN1 */
+ PORT_START_TAG("P2") /* IN1 */
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)
@@ -790,7 +790,7 @@ static INPUT_PORTS_START( raiden2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* Dip switch A */
+ PORT_START_TAG("DSWA") /* Dip switch A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ))
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ))
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ))
@@ -816,7 +816,7 @@ static INPUT_PORTS_START( raiden2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* Dip switch B */
+ PORT_START_TAG("DSWB") /* Dip switch B */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ))
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
@@ -839,7 +839,7 @@ static INPUT_PORTS_START( raiden2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* START BUTTONS */
+ PORT_START_TAG("SYSTEM") /* START BUTTONS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -850,7 +850,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( raidendx )
SEIBU_COIN_INPUTS /* coin inputs read through sound cpu */
- PORT_START /* IN0 */
+ PORT_START_TAG("P1") /* IN0 */
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)
@@ -860,7 +860,7 @@ static INPUT_PORTS_START( raidendx )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN1 */
+ PORT_START_TAG("P2") /* IN1 */
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)
@@ -870,7 +870,7 @@ static INPUT_PORTS_START( raidendx )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* Dip switch A */
+ PORT_START_TAG("DSWA") /* Dip switch A */
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ))
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ))
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ))
@@ -896,7 +896,7 @@ static INPUT_PORTS_START( raidendx )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* Dip switch B */
+ PORT_START_TAG("DSWB") /* Dip switch B */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ))
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
@@ -920,7 +920,7 @@ static INPUT_PORTS_START( raidendx )
PORT_DIPSETTING( 0x80, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* START BUTTONS */
+ PORT_START_TAG("SYSTEM") /* START BUTTONS */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1950,7 +1950,7 @@ static WRITE16_HANDLER( rdx_v33_eeprom_w )
static READ16_HANDLER( rdx_v33_eeprom_r )
{
- return input_port_read_indexed(machine, 0) | (eeprom_read_bit()<<4);
+ return input_port_read(machine, "SYSTEM") | (eeprom_read_bit()<<4);
}
@@ -1984,7 +1984,7 @@ static WRITE16_HANDLER( mcu_prog_offs_w )
static READ16_HANDLER( r2_playerin_r )
{
- return input_port_read_indexed(machine, 1);
+ return input_port_read(machine, "INPUT");
}
static READ16_HANDLER( rdx_v33_oki_r )
{
@@ -2081,7 +2081,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( rdx_v33 )
- 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 )
@@ -2093,7 +2093,7 @@ static INPUT_PORTS_START( rdx_v33 )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_BIT( 0xff80, IP_ACTIVE_LOW, IPT_UNUSED )
- 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)
diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c
index 7051655434e..80883fe9c1b 100644
--- a/src/mame/drivers/rbmk.c
+++ b/src/mame/drivers/rbmk.c
@@ -87,7 +87,7 @@ static WRITE16_HANDLER( gms_write3 )
static READ16_HANDLER( eeprom_r )
{
- return (eeprom_read_bit() << 15)|(input_port_read_indexed(machine,3)&0x7fff);
+ return (eeprom_read_bit() << 15)|(input_port_read(machine, "IN3") & 0x7fff);
}
static WRITE16_HANDLER( eeprom_w )
@@ -112,18 +112,18 @@ static ADDRESS_MAP_START( rbmk_mem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x900000, 0x900fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16)
AM_RANGE(0x9c0000, 0x9c0fff) AM_RAM AM_BASE(&gms_vidram)
AM_RANGE(0xb00000, 0xb00001) AM_WRITE(eeprom_w)
- AM_RANGE(0xC00000, 0xC00001) AM_READ(input_port_0_word_r) AM_WRITE(gms_write1)
- AM_RANGE(0xC08000, 0xC08001) AM_READ(input_port_1_word_r) AM_WRITE(gms_write2)
+ AM_RANGE(0xC00000, 0xC00001) AM_READ_PORT("IN0") AM_WRITE(gms_write1)
+ AM_RANGE(0xC08000, 0xC08001) AM_READ_PORT("IN1") AM_WRITE(gms_write2)
AM_RANGE(0xC10000, 0xC10001) AM_READ(eeprom_r)
AM_RANGE(0xC18080, 0xC18081) AM_READ(gms_read)
- AM_RANGE(0xC20000, 0xC20001) AM_READ(input_port_2_word_r)
+ AM_RANGE(0xC20000, 0xC20001) AM_READ_PORT("IN2")
AM_RANGE(0xC28000, 0xC28001) AM_WRITE(gms_write3)
ADDRESS_MAP_END
static INPUT_PORTS_START( rbmk )
- PORT_START /* 16bit */
+ PORT_START_TAG("IN0") /* 16bit */
PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Controls ) )
PORT_DIPSETTING( 0x0080, DEF_STR( Joystick ) )
PORT_DIPSETTING( 0x0000, "Keyboard" )
@@ -177,7 +177,7 @@ static INPUT_PORTS_START( rbmk )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START /* 16bit */
+ PORT_START_TAG("IN1") /* 16bit */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -211,7 +211,7 @@ static INPUT_PORTS_START( rbmk )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START /* 16bit */
+ PORT_START_TAG("IN2") /* 16bit */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -262,7 +262,7 @@ static INPUT_PORTS_START( rbmk )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START /* 16bit */
+ PORT_START_TAG("IN3") /* 16bit */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -312,7 +312,7 @@ static INPUT_PORTS_START( rbmk )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START /* 16bit */
+ PORT_START_TAG("IN4") /* 16bit */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -362,7 +362,7 @@ static INPUT_PORTS_START( rbmk )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START /* 16bit */
+ PORT_START_TAG("IN5") /* 16bit */
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/rcasino.c b/src/mame/drivers/rcasino.c
index 2aa4681c7e0..c0a19e3b8fc 100644
--- a/src/mame/drivers/rcasino.c
+++ b/src/mame/drivers/rcasino.c
@@ -165,7 +165,7 @@ static READ8_HANDLER( rcasino_port_11_r )
pulse = 0;
else pulse = 0x04;
}
- return input_port_read_indexed(machine, 1) + pulse;
+ return input_port_read(machine, "IN1") + pulse;
}
static ADDRESS_MAP_START( rcasino_map, ADDRESS_SPACE_PROGRAM, 8 )
@@ -180,8 +180,8 @@ static ADDRESS_MAP_START( rcasino_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x01, 0x01) AM_READ(AY8910_read_port_0_r)
AM_RANGE(0x02, 0x02) AM_WRITE(AY8910_write_port_0_w)
AM_RANGE(0x03, 0x03) AM_WRITE(AY8910_control_port_0_w)
- AM_RANGE(0x10, 0x10) AM_READWRITE(input_port_0_r, rcasino_port_10_w)
-// AM_RANGE(0x11, 0x11) AM_READWRITE(input_port_1_r, rcasino_port_11_w)
+ AM_RANGE(0x10, 0x10) AM_READ_PORT("IN0") AM_WRITE(rcasino_port_10_w)
+// AM_RANGE(0x11, 0x11) AM_READ_PORT("IN1") AM_WRITE(rcasino_port_11_w)
AM_RANGE(0x11, 0x11) AM_READWRITE(rcasino_port_11_r, rcasino_port_11_w)
AM_RANGE(0x12, 0x12) AM_WRITE(rcasino_lamp_w)
AM_RANGE(0x13, 0x13) AM_WRITE(rcasino_coin_counter_w)
diff --git a/src/mame/drivers/realbrk.c b/src/mame/drivers/realbrk.c
index a132cef5246..51172d0a7b4 100644
--- a/src/mame/drivers/realbrk.c
+++ b/src/mame/drivers/realbrk.c
@@ -53,15 +53,15 @@ static UINT16 *realbrk_dsw_select;
static READ16_HANDLER( realbrk_dsw_r )
{
UINT16 sel = ~realbrk_dsw_select[0];
- if (sel & 0x01) return (input_port_read_indexed(machine, 2) & 0x00ff) << 8; // DSW1 low bits
- if (sel & 0x02) return (input_port_read_indexed(machine, 3) & 0x00ff) << 8; // DSW2 low bits
- if (sel & 0x04) return (input_port_read_indexed(machine, 4) & 0x00ff) << 8; // DSW3 low bits
- if (sel & 0x08) return (input_port_read_indexed(machine, 5) & 0x00ff) << 8; // DSW4 low bits
+ if (sel & 0x01) return (input_port_read(machine, "SW1") & 0x00ff) << 8; // DSW1 low bits
+ if (sel & 0x02) return (input_port_read(machine, "SW2") & 0x00ff) << 8; // DSW2 low bits
+ if (sel & 0x04) return (input_port_read(machine, "SW3") & 0x00ff) << 8; // DSW3 low bits
+ if (sel & 0x08) return (input_port_read(machine, "SW4") & 0x00ff) << 8; // DSW4 low bits
- if (sel & 0x10) return ((input_port_read_indexed(machine, 2) & 0x0300) << 0) | // DSWs high 2 bits
- ((input_port_read_indexed(machine, 3) & 0x0300) << 2) |
- ((input_port_read_indexed(machine, 4) & 0x0300) << 4) |
- ((input_port_read_indexed(machine, 5) & 0x0300) << 6) ;
+ if (sel & 0x10) return ((input_port_read(machine, "SW1") & 0x0300) << 0) | // DSWs high 2 bits
+ ((input_port_read(machine, "SW2") & 0x0300) << 2) |
+ ((input_port_read(machine, "SW3") & 0x0300) << 4) |
+ ((input_port_read(machine, "SW4") & 0x0300) << 6) ;
logerror("CPU #0 PC %06X: read with unknown dsw_select = %02x\n",activecpu_get_pc(),realbrk_dsw_select[0]);
return 0xffff;
@@ -73,14 +73,14 @@ static READ16_HANDLER( pkgnsh_input_r )
{
case 0x00/2: return 0xffff;
case 0x02/2: return 0xffff;
- case 0x04/2: return input_port_read_indexed(machine,0);/*Service buttons*/
- case 0x06/2: return input_port_read_indexed(machine,1);/*DIP 2*/
- case 0x08/2: return input_port_read_indexed(machine,2);/*DIP 1*/
- case 0x0a/2: return input_port_read_indexed(machine,3);/*DIP 1+2 Hi-Bits*/
- case 0x0c/2: return input_port_read_indexed(machine,4);/*Handle 1p*/
- case 0x0e/2: return input_port_read_indexed(machine,5);/*Buttons 1p*/
- case 0x10/2: return input_port_read_indexed(machine,6);/*Handle 2p*/
- case 0x12/2: return input_port_read_indexed(machine,7);/*Buttons 2p*/
+ case 0x04/2: return input_port_read(machine, "IN0"); /*Service buttons*/
+ case 0x06/2: return input_port_read(machine, "SW1"); /*DIP 2*/
+ case 0x08/2: return input_port_read(machine, "SW2"); /*DIP 1*/
+ case 0x0a/2: return input_port_read(machine, "SW3"); /*DIP 1+2 Hi-Bits*/
+ case 0x0c/2: return input_port_read(machine, "PADDLE1"); /*Handle 1p*/
+ case 0x0e/2: return input_port_read(machine, "P1"); /*Buttons 1p*/
+ case 0x10/2: return input_port_read(machine, "PADDLE2"); /*Handle 2p*/
+ case 0x12/2: return input_port_read(machine, "P2"); /*Buttons 2p*/
}
return 0xffff;
}
@@ -92,22 +92,22 @@ static READ16_HANDLER( pkgnshdx_input_r )
switch(offset)
{
case 0x00/2: return 0xffff;
- case 0x02/2: return input_port_read_indexed(machine,0);/*Service buttons*/
+ case 0x02/2: return input_port_read(machine, "IN0"); /*Service buttons*/
/*DSW,same handling as realbrk*/
case 0x04/2:
- if (sel & 0x01) return (input_port_read_indexed(machine,1) & 0x00ff) << 8; // DSW1 low bits
- if (sel & 0x02) return (input_port_read_indexed(machine,2) & 0x00ff) << 8; // DSW2 low bits
- if (sel & 0x04) return (input_port_read_indexed(machine,3) & 0x00ff) << 8; // DSW3 low bits
- if (sel & 0x08) return (input_port_read_indexed(machine,4) & 0x00ff) << 8; // DSW4 low bits
+ if (sel & 0x01) return (input_port_read(machine, "SW1") & 0x00ff) << 8; // DSW1 low bits
+ if (sel & 0x02) return (input_port_read(machine, "SW2") & 0x00ff) << 8; // DSW2 low bits
+ if (sel & 0x04) return (input_port_read(machine, "SW3") & 0x00ff) << 8; // DSW3 low bits
+ if (sel & 0x08) return (input_port_read(machine, "SW4") & 0x00ff) << 8; // DSW4 low bits
- if (sel & 0x10) return ((input_port_read_indexed(machine,1) & 0x0300) << 0) | // DSWs high 2 bits
- ((input_port_read_indexed(machine,2) & 0x0300) << 2) |
- ((input_port_read_indexed(machine,3) & 0x0300) << 4) |
- ((input_port_read_indexed(machine,4) & 0x0300) << 6) ;
+ if (sel & 0x10) return ((input_port_read(machine, "SW1") & 0x0300) << 0) | // DSWs high 2 bits
+ ((input_port_read(machine, "SW2") & 0x0300) << 2) |
+ ((input_port_read(machine, "SW3") & 0x0300) << 4) |
+ ((input_port_read(machine, "SW4") & 0x0300) << 6) ;
return 0xffff;
- case 0x06/2: return input_port_read_indexed(machine,6);/*Buttons+Handle 2p*/
- case 0x08/2: return input_port_read_indexed(machine,5);/*Buttons+Handle 1p*/
+ case 0x06/2: return input_port_read(machine, "P2");/*Buttons+Handle 2p*/
+ case 0x08/2: return input_port_read(machine, "P1");/*Buttons+Handle 1p*/
case 0x0a/2: return 0xffff;
case 0x0c/2: return 0xffff;
case 0x0e/2: return 0xffff;
@@ -172,9 +172,9 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( realbrk_mem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x800008, 0x800009) AM_WRITE(YM2413_register_port_0_lsb_w ) // YM2413
AM_RANGE(0x80000a, 0x80000b) AM_WRITE(YM2413_data_port_0_lsb_w ) //
- AM_RANGE(0xc00000, 0xc00001) AM_READ(input_port_0_word_r ) // P1 & P2 (Inputs)
- AM_RANGE(0xc00002, 0xc00003) AM_READ(input_port_1_word_r ) // Coins
- AM_RANGE(0xc00004, 0xc00005) AM_READWRITE(realbrk_dsw_r,SMH_RAM) AM_BASE(&realbrk_dsw_select ) // DSW select
+ AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("IN0") // P1 & P2 (Inputs)
+ AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("IN1") // Coins
+ AM_RANGE(0xc00004, 0xc00005) AM_READWRITE(realbrk_dsw_r,SMH_RAM) AM_BASE(&realbrk_dsw_select) // DSW select
AM_RANGE(0xff0000, 0xfffbff) AM_RAM // RAM
AM_RANGE(0xfffd0a, 0xfffd0b) AM_WRITE(realbrk_flipscreen_w ) // Hack! Parallel port data register
ADDRESS_MAP_END
@@ -198,13 +198,13 @@ ADDRESS_MAP_END
/*dai2kaku specific memory map*/
static ADDRESS_MAP_START( dai2kaku_mem, ADDRESS_SPACE_PROGRAM, 16 )
- AM_RANGE(0x605000, 0x6053ff) AM_READWRITE(SMH_RAM,SMH_RAM) AM_BASE(&realbrk_vram_0ras ) // rasterinfo (0)
- AM_RANGE(0x605400, 0x6057ff) AM_READWRITE(SMH_RAM,SMH_RAM) AM_BASE(&realbrk_vram_1ras ) // rasterinfo (1)
+ AM_RANGE(0x605000, 0x6053ff) AM_READWRITE(SMH_RAM,SMH_RAM) AM_BASE(&realbrk_vram_0ras) // rasterinfo (0)
+ AM_RANGE(0x605400, 0x6057ff) AM_READWRITE(SMH_RAM,SMH_RAM) AM_BASE(&realbrk_vram_1ras) // rasterinfo (1)
AM_RANGE(0x800008, 0x800009) AM_WRITE(YM2413_register_port_0_lsb_w ) // YM2413
AM_RANGE(0x80000a, 0x80000b) AM_WRITE(YM2413_data_port_0_lsb_w ) //
- AM_RANGE(0xc00000, 0xc00001) AM_READ(input_port_0_word_r ) // P1 & P2 (Inputs)
- AM_RANGE(0xc00002, 0xc00003) AM_READ(input_port_1_word_r ) // Coins
- AM_RANGE(0xc00004, 0xc00005) AM_READWRITE(realbrk_dsw_r,SMH_RAM) AM_BASE(&realbrk_dsw_select ) // DSW select
+ AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("IN0") // P1 & P2 (Inputs)
+ AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("IN1") // Coins
+ AM_RANGE(0xc00004, 0xc00005) AM_READWRITE(realbrk_dsw_r,SMH_RAM) AM_BASE(&realbrk_dsw_select) // DSW select
AM_RANGE(0xff0000, 0xfffbff) AM_RAM // RAM
AM_RANGE(0xfffd0a, 0xfffd0b) AM_WRITE(dai2kaku_flipscreen_w ) // Hack! Parallel port data register
ADDRESS_MAP_END
@@ -220,36 +220,36 @@ ADDRESS_MAP_END
***************************************************************************/
static INPUT_PORTS_START( realbrk )
- PORT_START // IN0 - $c00000.w
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
- 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_UNUSED ) // BUTTON3 in test mode
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
- PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED ) // BUTTON3 in test mode
- PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START1 )
-
- PORT_START // IN1 - $c00002.w
- PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_SERVICE1 )
+ PORT_START_TAG("IN0") // IN0 - $c00000.w
+ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
+ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
+ PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
+ 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_UNUSED ) // BUTTON3 in test mode
+ PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 )
+ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
+ PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
+ PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
+ PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
+ PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
+ PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
+ PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED ) // BUTTON3 in test mode
+ PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START1 )
+
+ PORT_START_TAG("IN1") // IN1 - $c00002.w
+ PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 )
+ PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN2 )
+ PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1)
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // the vblank routine wants these 2 bits high
- PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+ PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // the vblank routine wants these 2 bits high
+ PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START // IN2 - $c00004.w (DSW1)
+ PORT_START_TAG("SW1") // IN2 - $c00004.w (DSW1)
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 ) )
@@ -279,7 +279,7 @@ static INPUT_PORTS_START( realbrk )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_SERVICE_DIPLOC( 0x0200, IP_ACTIVE_LOW, "SW1:10" )
- PORT_START // IN3 - $c00004.w (DSW2)
+ PORT_START_TAG("SW2") // IN3 - $c00004.w (DSW2)
PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x0000, "4" )
PORT_DIPSETTING( 0x0001, "5" )
@@ -304,28 +304,28 @@ static INPUT_PORTS_START( realbrk )
PORT_DIPUNUSED_DIPLOC( 0x0100, 0x0100, "SW2:9" ) /* Manual doesn't even show switches 9 & 10 */
PORT_DIPUNUSED_DIPLOC( 0x0200, 0x0200, "SW2:10" )
- PORT_START // IN4 - $c00004.w (DSW3) - Unused
- PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_START_TAG("SW3") // IN4 - $c00004.w (DSW3) - Unused
+ PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START // IN5 - $c00004.w (DSW4) - Unused
- PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_START_TAG("SW4") // IN5 - $c00004.w (DSW4) - Unused
+ PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
static INPUT_PORTS_START( pkgnsh )
- PORT_START // IN0 - $c00002.w
- PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1)
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // the vblank routine wants these 2 bits high
- PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
-
- PORT_START
- PORT_BIT( 0x003f, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x00c0, IP_ACTIVE_HIGH, IPT_UNUSED )/*pkgnsh wants these two bits to be 0*/
+ PORT_START_TAG("IN0") // IN0 - $c00002.w
+ PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 )
+ PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN2 )
+ PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_SERVICE1 )
+ PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1)
+ PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // the vblank routine wants these 2 bits high
+ PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+
+ PORT_START_TAG("SW1")
+ PORT_BIT( 0x003f, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x00c0, IP_ACTIVE_HIGH, IPT_UNUSED )/*pkgnsh wants these two bits to be 0*/
PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0100, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -351,8 +351,8 @@ static INPUT_PORTS_START( pkgnsh )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START // IN3 - $c00004.w (DSW2)
- PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_START_TAG("SW2") // IN3 - $c00004.w (DSW2)
+ PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0100, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -383,8 +383,8 @@ static INPUT_PORTS_START( pkgnsh )
// PORT_DIPSETTING( 0xa000, "100 Balls" ) /* Duplicate Setting for 100 balls */
// PORT_DIPSETTING( 0xb000, "100 Balls" ) /* Duplicate Setting for 100 balls */
- PORT_START
- PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_START_TAG("SW3")
+ PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0100, DEF_STR( On ) )
@@ -397,46 +397,46 @@ static INPUT_PORTS_START( pkgnsh )
PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0800, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START
- PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0xff00, 0x0000, IPT_PADDLE ) PORT_PLAYER(1) PORT_MINMAX(0,0x6400) PORT_SENSITIVITY(15) PORT_KEYDELTA(15) PORT_CENTERDELTA(0) //PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M)
-
- PORT_START
- PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) //F/F
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) //Stop
- PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START
- PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0xff00, 0x0000, IPT_PADDLE ) PORT_PLAYER(2) PORT_MINMAX(0,0x6400) PORT_SENSITIVITY(15) PORT_KEYDELTA(15) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M)
-
- PORT_START
- PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )/*There's the Pay Out SW here IIRC*/
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) //F/F
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) //Stop
- PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
+
+ PORT_START_TAG("PADDLE1")
+ PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0xff00, 0x0000, IPT_PADDLE ) PORT_PLAYER(1) PORT_MINMAX(0,0x6400) PORT_SENSITIVITY(15) PORT_KEYDELTA(15) PORT_CENTERDELTA(0) //PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M)
+
+ PORT_START_TAG("P1")
+ PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) //F/F
+ PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) //Stop
+ PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
+
+ PORT_START_TAG("PADDLE2")
+ PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0xff00, 0x0000, IPT_PADDLE ) PORT_PLAYER(2) PORT_MINMAX(0,0x6400) PORT_SENSITIVITY(15) PORT_KEYDELTA(15) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M)
+
+ PORT_START_TAG("P2")
+ PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )/*There's the Pay Out SW here IIRC*/
+ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START2 )
+ PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) //F/F
+ PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) //Stop
+ PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
static INPUT_PORTS_START( pkgnshdx )
- PORT_START // IN0 - $c00002.w
- PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1)
- PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // the vblank routine wants these 2 bits high
- PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
-
- PORT_START // IN1
+ PORT_START_TAG("IN0") // IN0 - $c00002.w
+ PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 )
+ PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN2 )
+ PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_SERVICE1 )
+ PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME(DEF_STR( Test )) PORT_CODE(KEYCODE_F1)
+ PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // the vblank routine wants these 2 bits high
+ PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+
+ PORT_START_TAG("SW1") // IN1
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -473,7 +473,7 @@ static INPUT_PORTS_START( pkgnshdx )
PORT_DIPSETTING( 0x0200, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START //IN2
+ PORT_START_TAG("SW2") //IN2
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -505,7 +505,7 @@ static INPUT_PORTS_START( pkgnshdx )
PORT_DIPSETTING( 0x0200, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START //IN3
+ PORT_START_TAG("SW3") //IN3
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -537,7 +537,7 @@ static INPUT_PORTS_START( pkgnshdx )
PORT_DIPSETTING( 0x0200, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START //IN4
+ PORT_START_TAG("SW4") //IN4
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -569,33 +569,33 @@ static INPUT_PORTS_START( pkgnshdx )
PORT_DIPSETTING( 0x0200, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_START //IN5
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_START_TAG("P1") //IN5
+ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
PORT_DIPNAME( 0x0002, 0x0002, "Pay-Out SW" )//Not a real DIP-Switch
PORT_DIPSETTING( 0x0002, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED ) //F/F
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) //Stop
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED ) //F/F
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) //Stop
+ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0040, 0x0040, "Analize SW" )//Not a real DIP-Switch
PORT_DIPSETTING( 0x0040, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0xff00, 0x0000, IPT_PADDLE ) PORT_PLAYER(1) PORT_MINMAX(0,0x6400) PORT_SENSITIVITY(15) PORT_KEYDELTA(15) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M)
-
- PORT_START //IN6
- PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED ) //Again Pay-Out SW in test mode,but it doesn't work,maybe it is for Player-2?
- PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED ) //F/F
- PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) //Stop
- PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0xff00, 0x0000, IPT_PADDLE ) PORT_PLAYER(1) PORT_MINMAX(0,0x6400) PORT_SENSITIVITY(15) PORT_KEYDELTA(15) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M)
+
+ PORT_START_TAG("P2") //IN6
+ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START2 )
+ PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED ) //Again Pay-Out SW in test mode,but it doesn't work,maybe it is for Player-2?
+ PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED ) //F/F
+ PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) //Stop
+ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x0040, 0x0040, "Mem Clear SW" )//Not a real DIP-Switch
PORT_DIPSETTING( 0x0040, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0xff00, 0x0000, IPT_PADDLE ) PORT_PLAYER(2) PORT_MINMAX(0,0x6400) PORT_SENSITIVITY(15) PORT_KEYDELTA(15) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M)
+ PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0xff00, 0x0000, IPT_PADDLE ) PORT_PLAYER(2) PORT_MINMAX(0,0x6400) PORT_SENSITIVITY(15) PORT_KEYDELTA(15) PORT_CENTERDELTA(0) PORT_CODE_DEC(KEYCODE_N) PORT_CODE_INC(KEYCODE_M)
INPUT_PORTS_END
/***************************************************************************
diff --git a/src/mame/drivers/redalert.c b/src/mame/drivers/redalert.c
index 8e5ff663963..0d8e7e3d0f7 100644
--- a/src/mame/drivers/redalert.c
+++ b/src/mame/drivers/redalert.c
@@ -85,7 +85,7 @@
static INTERRUPT_GEN( redalert_vblank_interrupt )
{
- if( input_port_read_indexed(machine, 3) )
+ if( input_port_read(machine, "COIN") )
/* the service coin as conntected to the CPU's RDY pin as well */
cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, PULSE_LINE);
diff --git a/src/mame/drivers/redclash.c b/src/mame/drivers/redclash.c
index 7d642fef9b5..97d5b72da27 100644
--- a/src/mame/drivers/redclash.c
+++ b/src/mame/drivers/redclash.c
@@ -44,9 +44,9 @@ extern VIDEO_EOF( redclash );
*/
static INTERRUPT_GEN( redclash_interrupt )
{
- if (input_port_read_indexed(machine, 4) & 1) /* Left Coin */
+ if (input_port_read(machine, "FAKE") & 1) /* Left Coin */
cpunum_set_input_line(machine, 0,0,ASSERT_LINE);
- else if (input_port_read_indexed(machine, 4) & 2) /* Right Coin */
+ else if (input_port_read(machine, "FAKE") & 2) /* Right Coin */
cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, PULSE_LINE);
}
@@ -60,11 +60,11 @@ static WRITE8_HANDLER( irqack_w )
static ADDRESS_MAP_START( zero_readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_READ(SMH_ROM)
AM_RANGE(0x3000, 0x37ff) AM_READ(SMH_RAM)
- AM_RANGE(0x4800, 0x4800) AM_READ(input_port_0_r) /* IN0 */
- AM_RANGE(0x4801, 0x4801) AM_READ(input_port_1_r) /* IN1 */
- AM_RANGE(0x4802, 0x4802) AM_READ(input_port_2_r) /* DSW0 */
- AM_RANGE(0x4803, 0x4803) AM_READ(input_port_3_r) /* DSW1 */
- AM_RANGE(0x4000, 0x43ff) AM_READ(SMH_RAM) /* video RAM */
+ AM_RANGE(0x4800, 0x4800) AM_READ_PORT("IN0") /* IN0 */
+ AM_RANGE(0x4801, 0x4801) AM_READ_PORT("IN1") /* IN1 */
+ AM_RANGE(0x4802, 0x4802) AM_READ_PORT("DSW1") /* DSW0 */
+ AM_RANGE(0x4803, 0x4803) AM_READ_PORT("DSW2") /* DSW1 */
+ AM_RANGE(0x4000, 0x43ff) AM_READ(SMH_RAM) /* video RAM */
ADDRESS_MAP_END
static ADDRESS_MAP_START( zero_writemem, ADDRESS_SPACE_PROGRAM, 8 )
@@ -84,11 +84,11 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_READ(SMH_ROM)
- AM_RANGE(0x4800, 0x4800) AM_READ(input_port_0_r) /* IN0 */
- AM_RANGE(0x4801, 0x4801) AM_READ(input_port_1_r) /* IN1 */
- AM_RANGE(0x4802, 0x4802) AM_READ(input_port_2_r) /* DSW0 */
- AM_RANGE(0x4803, 0x4803) AM_READ(input_port_3_r) /* DSW1 */
- AM_RANGE(0x4000, 0x43ff) AM_READ(SMH_RAM) /* video RAM */
+ AM_RANGE(0x4800, 0x4800) AM_READ_PORT("IN0") /* IN0 */
+ AM_RANGE(0x4801, 0x4801) AM_READ_PORT("IN1") /* IN1 */
+ AM_RANGE(0x4802, 0x4802) AM_READ_PORT("DSW1") /* DSW0 */
+ AM_RANGE(0x4803, 0x4803) AM_READ_PORT("DSW2") /* DSW1 */
+ AM_RANGE(0x4000, 0x43ff) AM_READ(SMH_RAM) /* video RAM */
AM_RANGE(0x6000, 0x67ff) AM_READ(SMH_RAM)
ADDRESS_MAP_END
@@ -112,7 +112,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( redclash )
- PORT_START /* IN0 */
+ PORT_START_TAG("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
@@ -122,7 +122,7 @@ static INPUT_PORTS_START( redclash )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START_TAG("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) 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_RIGHT ) PORT_8WAY PORT_COCKTAIL
@@ -134,7 +134,7 @@ static INPUT_PORTS_START( redclash )
/* them this way is enough to get the game running. */
PORT_BIT( 0xc0, 0x40, IPT_VBLANK )
- PORT_START /* DSW0 */
+ PORT_START_TAG("DSW1") /* DSW0 */
PORT_DIPNAME( 0x03, 0x03, "Difficulty?" )
PORT_DIPSETTING( 0x03, "Easy?" )
PORT_DIPSETTING( 0x02, "Medium?" )
@@ -158,7 +158,7 @@ static INPUT_PORTS_START( redclash )
PORT_DIPSETTING( 0x80, "5" )
PORT_DIPSETTING( 0x40, "7" )
- PORT_START /* DSW1 */
+ PORT_START_TAG("DSW2") /* DSW1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x04, DEF_STR( 6C_1C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 5C_1C ) )
@@ -194,7 +194,7 @@ static INPUT_PORTS_START( redclash )
PORT_DIPSETTING( 0x10, DEF_STR( 1C_8C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_9C ) )
- PORT_START /* FAKE */
+ PORT_START_TAG("FAKE") /* FAKE */
/* The coin slots are not memory mapped. Coin Left causes a NMI, */
/* Coin Right an IRQ. This fake input port is used by the interrupt */
/* handler to be notified of coin insertions. We use IMPULSE to */
@@ -205,7 +205,7 @@ static INPUT_PORTS_START( redclash )
INPUT_PORTS_END
static INPUT_PORTS_START( zerohour )
- PORT_START /* IN0 */
+ PORT_START_TAG("IN0") /* IN0 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
@@ -215,7 +215,7 @@ static INPUT_PORTS_START( zerohour )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN1 */
+ PORT_START_TAG("IN1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) 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_RIGHT ) PORT_8WAY PORT_COCKTAIL
@@ -227,7 +227,7 @@ static INPUT_PORTS_START( zerohour )
/* them this way is enough to get the game running. */
PORT_BIT( 0xc0, 0x40, IPT_VBLANK )
- PORT_START /* DSW0 */
+ PORT_START_TAG("DSW1") /* DSW0 */
PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW1:8" ) /* Switches 6-8 are not used */
PORT_DIPUNUSED_DIPLOC( 0x02, 0x02, "SW1:7" )
PORT_DIPUNUSED_DIPLOC( 0x04, 0x04, "SW1:6" )
@@ -245,7 +245,7 @@ static INPUT_PORTS_START( zerohour )
PORT_DIPSETTING( 0x80, "4" )
PORT_DIPSETTING( 0x40, "5" )
- PORT_START /* DSW1 */
+ PORT_START_TAG("DSW2") /* DSW1 */
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:4,3,2,1")
PORT_DIPSETTING( 0x06, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -269,7 +269,7 @@ static INPUT_PORTS_START( zerohour )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ) )
- PORT_START /* FAKE */
+ PORT_START_TAG("FAKE") /* FAKE */
/* The coin slots are not memory mapped. Coin Left causes a NMI, */
/* Coin Right an IRQ. This fake input port is used by the interrupt */
/* handler to be notified of coin insertions. We use IMPULSE to */
diff --git a/src/mame/drivers/relief.c b/src/mame/drivers/relief.c
index b3770d628f6..6b62642e720 100644
--- a/src/mame/drivers/relief.c
+++ b/src/mame/drivers/relief.c
@@ -104,7 +104,7 @@ static MACHINE_RESET( relief )
static READ16_HANDLER( special_port2_r )
{
- int result = input_port_read_indexed(machine, 2);
+ int result = input_port_read(machine, "260010");
if (atarigen_cpu_to_sound_ready) result ^= 0x0020;
if (!(result & 0x0080) || atarigen_get_hblank(machine->primary_screen)) result ^= 0x0001;
return result;
@@ -200,10 +200,10 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x140030, 0x140031) AM_WRITE(audio_control_w)
AM_RANGE(0x180000, 0x180fff) AM_READWRITE(atarigen_eeprom_upper_r, atarigen_eeprom_w) AM_BASE(&atarigen_eeprom) AM_SIZE(&atarigen_eeprom_size)
AM_RANGE(0x1c0030, 0x1c0031) AM_WRITE(atarigen_eeprom_enable_w)
- AM_RANGE(0x260000, 0x260001) AM_READ(input_port_0_word_r)
- AM_RANGE(0x260002, 0x260003) AM_READ(input_port_1_word_r)
+ AM_RANGE(0x260000, 0x260001) AM_READ_PORT("260000")
+ AM_RANGE(0x260002, 0x260003) AM_READ_PORT("260002")
AM_RANGE(0x260010, 0x260011) AM_READ(special_port2_r)
- AM_RANGE(0x260012, 0x260013) AM_READ(input_port_3_word_r)
+ AM_RANGE(0x260012, 0x260013) AM_READ_PORT("260012")
AM_RANGE(0x2a0000, 0x2a0001) AM_WRITE(watchdog_reset16_w)
AM_RANGE(0x3e0000, 0x3e0fff) AM_RAM_WRITE(atarigen_666_paletteram_w) AM_BASE(&paletteram16)
AM_RANGE(0x3effc0, 0x3effff) AM_READWRITE(relief_atarivc_r, relief_atarivc_w) AM_BASE(&atarivc_data)
@@ -226,7 +226,7 @@ ADDRESS_MAP_END
*************************************/
static INPUT_PORTS_START( relief )
- PORT_START /* 260000 */
+ PORT_START_TAG("260000") /* 260000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Button D0") PORT_CODE(KEYCODE_Z)
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Button D1") PORT_CODE(KEYCODE_X)
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Button D2") PORT_CODE(KEYCODE_C)
@@ -253,7 +253,7 @@ static INPUT_PORTS_START( relief )
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 /* 260002 */
+ PORT_START_TAG("260002") /* 260002 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("White") PORT_CODE(KEYCODE_COMMA)
PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0002, DEF_STR( Off ) )
@@ -278,14 +278,14 @@ static INPUT_PORTS_START( relief )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
- PORT_START /* 260010 */
+ PORT_START_TAG("260010") /* 260010 */
PORT_BIT( 0x001f, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNUSED ) /* tested before writing to 260040 */
PORT_SERVICE( 0x0040, IP_ACTIVE_LOW )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 260012 */
+ PORT_START_TAG("260012") /* 260012 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x000c, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c
index ac59924e896..b0fe0541363 100644
--- a/src/mame/drivers/renegade.c
+++ b/src/mame/drivers/renegade.c
@@ -494,7 +494,7 @@ static INTERRUPT_GEN( renegade_interrupt )
{
/*
static int coin;
- int port = input_port_read_indexed(machine, 1) & 0xc0;
+ int port = input_port_read(machine, "IN1") & 0xc0;
if (port != 0xc0)
{
if (coin == 0)
@@ -524,10 +524,10 @@ static WRITE8_HANDLER( renegade_coin_counter_w )
static ADDRESS_MAP_START( main_readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x37ff) AM_READ(SMH_RAM)
- AM_RANGE(0x3800, 0x3800) AM_READ(input_port_0_r) /* Player#1 controls, P1,P2 start */
- AM_RANGE(0x3801, 0x3801) AM_READ(input_port_1_r) /* Player#2 controls, coin triggers */
- AM_RANGE(0x3802, 0x3802) AM_READ(input_port_2_r) /* DIP2 various IO ports */
- AM_RANGE(0x3803, 0x3803) AM_READ(input_port_3_r) /* DIP1 */
+ AM_RANGE(0x3800, 0x3800) AM_READ_PORT("IN0") /* Player#1 controls, P1,P2 start */
+ AM_RANGE(0x3801, 0x3801) AM_READ_PORT("IN1") /* Player#2 controls, coin triggers */
+ AM_RANGE(0x3802, 0x3802) AM_READ_PORT("DSW2") /* DIP2 various IO ports */
+ AM_RANGE(0x3803, 0x3803) AM_READ_PORT("DSW1") /* DIP1 */
AM_RANGE(0x3804, 0x3804) AM_READ(mcu_r)
AM_RANGE(0x3805, 0x3805) AM_READ(mcu_reset_r)
AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1)
@@ -573,7 +573,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( renegade )
- PORT_START /* IN0 */
+ PORT_START_TAG("IN0") /* IN0 */
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_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -583,7 +583,7 @@ static INPUT_PORTS_START( renegade )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START /* IN1 */
+ PORT_START_TAG("IN1") /* 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)
@@ -593,7 +593,7 @@ static INPUT_PORTS_START( renegade )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
- PORT_START /* DIP2 */
+ PORT_START_TAG("DSW2") /* DIP2 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
@@ -607,7 +607,7 @@ static INPUT_PORTS_START( renegade )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
- PORT_START /* DIP1 */
+ PORT_START_TAG("DSW1") /* DIP1 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c
index ecfa9b44ba7..98b1649a58e 100644
--- a/src/mame/drivers/rmhaihai.c
+++ b/src/mame/drivers/rmhaihai.c
@@ -74,7 +74,9 @@ static int keyboard_cmd;
static READ8_HANDLER( keyboard_r )
{
-logerror("%04x: keyboard_r\n",activecpu_get_pc());
+ static const char *keynames[] = { "KEY0", "KEY1" };
+
+ logerror("%04x: keyboard_r\n",activecpu_get_pc());
switch(activecpu_get_pc())
{
/* read keyboard */
@@ -85,11 +87,11 @@ logerror("%04x: keyboard_r\n",activecpu_get_pc());
{
int i;
- for (i = 0;i < 31;i++)
+ for (i = 0; i < 31; i++)
{
- if (input_port_read_indexed(machine, 2 + i/16) & (1<<(i&15))) return i+1;
+ if (input_port_read(machine, keynames[i/16]) & (1 << (i & 15))) return i+1;
}
- if (input_port_read_indexed(machine, 3) & 0x8000) return 0x80; // coin
+ if (input_port_read(machine, "KEY1") & 0x8000) return 0x80; // coin
return 0;
}
case 0x5c7b: // rmhaihai, rmhaisei, rmhaijin
@@ -229,8 +231,83 @@ static ADDRESS_MAP_START( themj_writeport, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xbc0c, 0xbc0c) AM_WRITE(SMH_NOP) // ??
ADDRESS_MAP_END
+static INPUT_PORTS_START( mjctrl )
+ PORT_START_TAG("KEY0") // fake, handled by keyboard_r()
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_MAHJONG_SMALL )
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_MAHJONG_DOUBLE_UP )
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_MAHJONG_BIG )
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_MAHJONG_SCORE )
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_MAHJONG_FLIP_FLOP )
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_MAHJONG_LAST_CHANCE )
+ PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_MAHJONG_K )
+ PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_MAHJONG_RON )
+ PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_MAHJONG_G )
+ PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_MAHJONG_CHI )
+ PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_MAHJONG_C )
+ PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_MAHJONG_L )
+ PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_MAHJONG_H )
+
+ PORT_START_TAG("KEY1") // fake, handled by keyboard_r()
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_MAHJONG_PON )
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_MAHJONG_D )
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_START1 )
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_MAHJONG_I )
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_MAHJONG_KAN )
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_MAHJONG_E )
+ PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_MAHJONG_M )
+ PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_MAHJONG_A )
+ PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_MAHJONG_BET )
+ PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_MAHJONG_J )
+ PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_MAHJONG_REACH )
+ PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_MAHJONG_F )
+ PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_MAHJONG_N )
+ PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_MAHJONG_B )
+ PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
+
+ PORT_START_TAG("KEY2") // fake, handled by keyboard_r()
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_MAHJONG_SMALL ) PORT_PLAYER(2)
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_MAHJONG_DOUBLE_UP ) PORT_PLAYER(2)
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_MAHJONG_BIG ) PORT_PLAYER(2)
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_MAHJONG_SCORE ) PORT_PLAYER(2)
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_MAHJONG_FLIP_FLOP ) PORT_PLAYER(2)
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_MAHJONG_LAST_CHANCE ) PORT_PLAYER(2)
+ PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_MAHJONG_K ) PORT_PLAYER(2)
+ PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_MAHJONG_RON ) PORT_PLAYER(2)
+ PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_MAHJONG_G ) PORT_PLAYER(2)
+ PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_MAHJONG_CHI ) PORT_PLAYER(2)
+ PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_MAHJONG_C ) PORT_PLAYER(2)
+ PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_MAHJONG_L ) PORT_PLAYER(2)
+ PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_MAHJONG_H ) PORT_PLAYER(2)
+
+
+ PORT_START_TAG("KEY3") // fake, handled by keyboard_r()
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_MAHJONG_PON ) PORT_PLAYER(2)
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_MAHJONG_D ) PORT_PLAYER(2)
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_START2 )
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_MAHJONG_I ) PORT_PLAYER(2)
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_MAHJONG_KAN ) PORT_PLAYER(2)
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_MAHJONG_E ) PORT_PLAYER(2)
+ PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_MAHJONG_M ) PORT_PLAYER(2)
+ PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_MAHJONG_A ) PORT_PLAYER(2)
+ PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_MAHJONG_BET ) PORT_PLAYER(2)
+ PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_MAHJONG_J ) PORT_PLAYER(2)
+ PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_MAHJONG_REACH ) PORT_PLAYER(2)
+ PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_MAHJONG_F ) PORT_PLAYER(2)
+ PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_MAHJONG_N ) PORT_PLAYER(2)
+ PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_MAHJONG_B ) PORT_PLAYER(2)
+ PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(1)
+INPUT_PORTS_END
+
static INPUT_PORTS_START( rmhaihai )
- PORT_START /* dsw2 */
+ PORT_START_TAG("DSW2") /* dsw2 */
PORT_DIPNAME( 0x01, 0x01, "Unknown 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -244,7 +321,7 @@ static INPUT_PORTS_START( rmhaihai )
PORT_DIPSETTING( 0xfa, "7" )
PORT_DIPSETTING( 0xfc, "8 (Difficult)" )
- PORT_START /* dsw1 */
+ PORT_START_TAG("DSW1") /* dsw1 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Free_Play ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -267,82 +344,11 @@ static INPUT_PORTS_START( rmhaihai )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START // fake, handled by keyboard_r()
- PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_MAHJONG_SMALL )
- PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_MAHJONG_BIG )
- PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_MAHJONG_SCORE )
- PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_MAHJONG_K )
- PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_MAHJONG_RON )
- PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_MAHJONG_G )
- PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_MAHJONG_CHI )
- PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_MAHJONG_C )
- PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_MAHJONG_L )
- PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_MAHJONG_H )
-
- PORT_START // fake, handled by keyboard_r()
- PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_MAHJONG_PON )
- PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_MAHJONG_D )
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_MAHJONG_I )
- PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_MAHJONG_KAN )
- PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_MAHJONG_E )
- PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_MAHJONG_M )
- PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_MAHJONG_A )
- PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_MAHJONG_BET )
- PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_MAHJONG_J )
- PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_MAHJONG_REACH )
- PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_MAHJONG_F )
- PORT_BIT(0x1000, IP_ACTIVE_HIGH, IPT_MAHJONG_N )
- PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_MAHJONG_B )
- PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
-
- PORT_START // fake, handled by keyboard_r()
- PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_MAHJONG_H )PORT_PLAYER(2)
-
-
- PORT_START // fake, handled by keyboard_r()
- PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_START2 )
- PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_MAHJONG_BET )PORT_PLAYER(2)
- PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x1000, IP_ACTIVE_HIGH, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(1)
+ PORT_INCLUDE( mjctrl )
INPUT_PORTS_END
static INPUT_PORTS_START( rmhaihib )
- PORT_START /* dsw2 */
+ PORT_START_TAG("DSW2") /* dsw2 */
PORT_DIPNAME( 0x01, 0x01, "Unknown 2-1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -367,7 +373,7 @@ static INPUT_PORTS_START( rmhaihib )
PORT_DIPSETTING( 0x20, "30%" )
PORT_DIPSETTING( 0x00, "20%" )
- PORT_START /* dsw1 */
+ PORT_START_TAG("DSW1") /* dsw1 */
PORT_DIPNAME( 0x03, 0x03, "Bet Max" )
PORT_DIPSETTING( 0x01, "1" )
PORT_DIPSETTING( 0x00, "2" )
@@ -391,79 +397,9 @@ static INPUT_PORTS_START( rmhaihib )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START // fake, handled by keyboard_r()
- PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_MAHJONG_SMALL )
- PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_MAHJONG_BIG )
- PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_MAHJONG_SCORE )
- PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_MAHJONG_K )
- PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_MAHJONG_RON )
- PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_MAHJONG_G )
- PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_MAHJONG_CHI )
- PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_MAHJONG_C )
- PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_MAHJONG_L )
- PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_MAHJONG_H )
-
- PORT_START // fake, handled by keyboard_r()
- PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_MAHJONG_PON )
- PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_MAHJONG_D )
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_MAHJONG_I )
- PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_MAHJONG_KAN )
- PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_MAHJONG_E )
- PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_MAHJONG_M )
- PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_MAHJONG_A )
- PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_MAHJONG_BET )
- PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_MAHJONG_J )
- PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_MAHJONG_REACH )
- PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_MAHJONG_F )
- PORT_BIT(0x1000, IP_ACTIVE_HIGH, IPT_MAHJONG_N )
- PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_MAHJONG_B )
- PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
-
- PORT_START // fake, handled by keyboard_r()
- PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_MAHJONG_H )PORT_PLAYER(2)
-
- PORT_START // fake, handled by keyboard_r()
- PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_START2 )
- PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_MAHJONG_BET )PORT_PLAYER(2)
- PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x1000, IP_ACTIVE_HIGH, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_IMPULSE(1)
+ PORT_INCLUDE( mjctrl )
-// PORT_START // 11
+// PORT_START_TAG("EXTRA") // 11
// PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Pay Out") PORT_CODE(KEYCODE_3)
// PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE4 ) /* RAM clear */
// PORT_SERVICE( 0x04, IP_ACTIVE_LOW )
diff --git a/src/mame/drivers/route16.c b/src/mame/drivers/route16.c
index 37027c4f134..a54bf60f831 100644
--- a/src/mame/drivers/route16.c
+++ b/src/mame/drivers/route16.c
@@ -174,10 +174,10 @@ static READ8_HANDLER( ttmahjng_input_port_matrix_r )
switch (ttmahjng_port_select)
{
- case 1: ret = input_port_read_indexed(machine, 2); break;
- case 2: ret = input_port_read_indexed(machine, 3); break;
- case 4: ret = input_port_read_indexed(machine, 4); break;
- case 8: ret = input_port_read_indexed(machine, 5); break;
+ case 1: ret = input_port_read(machine, "KEY0"); break;
+ case 2: ret = input_port_read(machine, "KEY1"); break;
+ case 4: ret = input_port_read(machine, "KEY2"); break;
+ case 8: ret = input_port_read(machine, "KEY3"); break;
default: break;
}
@@ -228,9 +228,9 @@ static ADDRESS_MAP_START( route16_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
/*AM_RANGE(0x3000, 0x3001) AM_READWRITE(SMH_NOP, SMH_NOP) protection device */
AM_RANGE(0x4000, 0x43ff) AM_READWRITE(sharedram_r, route16_sharedram_w) AM_BASE(&sharedram)
- AM_RANGE(0x4800, 0x4800) AM_READWRITE(input_port_0_r, route16_out0_w)
- AM_RANGE(0x5000, 0x5000) AM_READWRITE(input_port_1_r, route16_out1_w)
- AM_RANGE(0x5800, 0x5800) AM_READ(input_port_2_r)
+ AM_RANGE(0x4800, 0x4800) AM_READ_PORT("DSW") AM_WRITE(route16_out0_w)
+ AM_RANGE(0x5000, 0x5000) AM_READ_PORT("P1") AM_WRITE(route16_out1_w)
+ AM_RANGE(0x5800, 0x5800) AM_READ_PORT("P2")
AM_RANGE(0x8000, 0xbfff) AM_RAM AM_BASE(&route16_videoram1) AM_SIZE(&route16_videoram_size)
ADDRESS_MAP_END
@@ -238,9 +238,9 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( routex_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_READWRITE(sharedram_r, route16_sharedram_w) AM_BASE(&sharedram)
- AM_RANGE(0x4800, 0x4800) AM_READWRITE(input_port_0_r, route16_out0_w)
- AM_RANGE(0x5000, 0x5000) AM_READWRITE(input_port_1_r, route16_out1_w)
- AM_RANGE(0x5800, 0x5800) AM_READ(input_port_2_r)
+ AM_RANGE(0x4800, 0x4800) AM_READ_PORT("DSW") AM_WRITE(route16_out0_w)
+ AM_RANGE(0x5000, 0x5000) AM_READ_PORT("P1") AM_WRITE(route16_out1_w)
+ AM_RANGE(0x5800, 0x5800) AM_READ_PORT("P2")
AM_RANGE(0x6400, 0x6400) AM_READ(routex_prot_read)
AM_RANGE(0x8000, 0xbfff) AM_RAM AM_BASE(&route16_videoram1) AM_SIZE(&route16_videoram_size)
ADDRESS_MAP_END
@@ -249,9 +249,9 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( stratvox_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_READWRITE(sharedram_r, sharedram_w) AM_BASE(&sharedram)
- AM_RANGE(0x4800, 0x4800) AM_READWRITE(input_port_0_r, route16_out0_w)
- AM_RANGE(0x5000, 0x5000) AM_READWRITE(input_port_1_r, route16_out1_w)
- AM_RANGE(0x5800, 0x5800) AM_READ(input_port_2_r)
+ AM_RANGE(0x4800, 0x4800) AM_READ_PORT("DSW") AM_WRITE(route16_out0_w)
+ AM_RANGE(0x5000, 0x5000) AM_READ_PORT("P1") AM_WRITE(route16_out1_w)
+ AM_RANGE(0x5800, 0x5800) AM_READ_PORT("P2")
AM_RANGE(0x8000, 0xbfff) AM_RAM AM_BASE(&route16_videoram1) AM_SIZE(&route16_videoram_size)
ADDRESS_MAP_END
@@ -259,9 +259,9 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( speakres_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_READWRITE(sharedram_r, sharedram_w) AM_BASE(&sharedram)
- AM_RANGE(0x4800, 0x4800) AM_READWRITE(input_port_0_r, route16_out0_w)
- AM_RANGE(0x5000, 0x5000) AM_READWRITE(input_port_1_r, route16_out1_w)
- AM_RANGE(0x5800, 0x5800) AM_READWRITE(input_port_2_r, speakres_out2_w)
+ AM_RANGE(0x4800, 0x4800) AM_READ_PORT("DSW") AM_WRITE(route16_out0_w)
+ AM_RANGE(0x5000, 0x5000) AM_READ_PORT("P1") AM_WRITE(route16_out1_w)
+ AM_RANGE(0x5800, 0x5800) AM_READ_PORT("P2") AM_WRITE(speakres_out2_w)
AM_RANGE(0x6000, 0x6000) AM_READ(speakres_in3_r)
AM_RANGE(0x8000, 0xbfff) AM_RAM AM_BASE(&route16_videoram1) AM_SIZE(&route16_videoram_size)
ADDRESS_MAP_END
@@ -270,8 +270,8 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( ttmahjng_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_READWRITE(sharedram_r, sharedram_w) AM_BASE(&sharedram)
- AM_RANGE(0x4800, 0x4800) AM_READWRITE(input_port_0_r, route16_out0_w)
- AM_RANGE(0x5000, 0x5000) AM_READWRITE(input_port_1_r, route16_out1_w)
+ AM_RANGE(0x4800, 0x4800) AM_READ_PORT("DSW") AM_WRITE(route16_out0_w)
+ AM_RANGE(0x5000, 0x5000) AM_READ_PORT("IN0") AM_WRITE(route16_out1_w)
AM_RANGE(0x5800, 0x5800) AM_READWRITE(ttmahjng_input_port_matrix_r, ttmahjng_input_port_matrix_w)
AM_RANGE(0x6800, 0x6800) AM_WRITE(AY8910_write_port_0_w)
AM_RANGE(0x6900, 0x6900) AM_WRITE(AY8910_control_port_0_w)
@@ -303,7 +303,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( route16 )
- PORT_START /* DSW 1 */
+ PORT_START_TAG("DSW") /* DSW 1 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "5" )
@@ -328,7 +328,7 @@ static INPUT_PORTS_START( route16 )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* Input Port 1 */
+ PORT_START_TAG("P1") /* Input Port 1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY
@@ -338,7 +338,7 @@ static INPUT_PORTS_START( route16 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START /* Input Port 2 */
+ PORT_START_TAG("P2") /* Input Port 2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
@@ -351,7 +351,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( stratvox )
- PORT_START /* IN0 */
+ PORT_START_TAG("DSW") /* IN0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "5" )
@@ -376,7 +376,7 @@ static INPUT_PORTS_START( stratvox )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* IN1 */
+ PORT_START_TAG("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -385,7 +385,7 @@ static INPUT_PORTS_START( stratvox )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START /* IN2 */
+ PORT_START_TAG("P2") /* IN2 */
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( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -397,7 +397,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( speakres )
- PORT_START /* IN0 */
+ PORT_START_TAG("DSW") /* IN0 */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "4" )
@@ -421,7 +421,7 @@ static INPUT_PORTS_START( speakres )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* IN1 */
+ PORT_START_TAG("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -430,7 +430,7 @@ static INPUT_PORTS_START( speakres )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START /* IN2 */
+ PORT_START_TAG("P2") /* IN2 */
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( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -442,7 +442,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( spacecho )
- PORT_START /* IN0 */
+ PORT_START_TAG("DSW") /* IN0 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Lives ) )
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x01, "5" )
@@ -467,7 +467,7 @@ static INPUT_PORTS_START( spacecho )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* IN1 */
+ PORT_START_TAG("P1") /* IN1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_2WAY
PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -476,7 +476,7 @@ static INPUT_PORTS_START( spacecho )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 )
- PORT_START /* IN2 */
+ PORT_START_TAG("P2") /* IN2 */
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( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -488,7 +488,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( ttmahjng )
- PORT_START /* IN0 */
+ PORT_START_TAG("DSW") /* IN0 */
PORT_DIPNAME( 0x01, 0x00, "Unknown 01" )
PORT_DIPSETTING( 0x00, "00" )
PORT_DIPSETTING( 0x01, "01" )
@@ -514,7 +514,7 @@ static INPUT_PORTS_START( ttmahjng )
PORT_DIPSETTING( 0x00, "00" )
PORT_DIPSETTING( 0x80, "80" )
- PORT_START /* IN1 */
+ PORT_START_TAG("IN0") /* 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 )
@@ -524,41 +524,41 @@ static INPUT_PORTS_START( ttmahjng )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_START /* IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
+ PORT_START_TAG("KEY0") /* IN2 */
+ 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 ) // START2?
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN3 */
- 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("KEY1") /* IN3 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) // START1?
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
+ PORT_START_TAG("KEY2") /* IN4 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* IN5 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
+ PORT_START_TAG("KEY3") /* IN5 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c
index 1a9f2314e52..d22552fa0e6 100644
--- a/src/mame/drivers/royalmah.c
+++ b/src/mame/drivers/royalmah.c
@@ -225,26 +225,26 @@ static WRITE8_HANDLER( input_port_select_w )
static READ8_HANDLER( royalmah_player_1_port_r )
{
- int ret = (input_port_read_indexed(machine,0) & 0xc0) | 0x3f;
+ int ret = (input_port_read(machine, "KEY0") & 0xc0) | 0x3f;
- if ((input_port_select & 0x01) == 0) ret &= input_port_read_indexed(machine,0);
- if ((input_port_select & 0x02) == 0) ret &= input_port_read_indexed(machine,1);
- if ((input_port_select & 0x04) == 0) ret &= input_port_read_indexed(machine,2);
- if ((input_port_select & 0x08) == 0) ret &= input_port_read_indexed(machine,3);
- if ((input_port_select & 0x10) == 0) ret &= input_port_read_indexed(machine,4);
+ if ((input_port_select & 0x01) == 0) ret &= input_port_read(machine, "KEY0");
+ if ((input_port_select & 0x02) == 0) ret &= input_port_read(machine, "KEY1");
+ if ((input_port_select & 0x04) == 0) ret &= input_port_read(machine, "KEY2");
+ if ((input_port_select & 0x08) == 0) ret &= input_port_read(machine, "KEY3");
+ if ((input_port_select & 0x10) == 0) ret &= input_port_read(machine, "KEY4");
return ret;
}
static READ8_HANDLER( royalmah_player_2_port_r )
{
- int ret = (input_port_read_indexed(machine,5) & 0xc0) | 0x3f;
+ int ret = (input_port_read(machine, "KEY5") & 0xc0) | 0x3f;
- if ((input_port_select & 0x01) == 0) ret &= input_port_read_indexed(machine,5);
- if ((input_port_select & 0x02) == 0) ret &= input_port_read_indexed(machine,6);
- if ((input_port_select & 0x04) == 0) ret &= input_port_read_indexed(machine,7);
- if ((input_port_select & 0x08) == 0) ret &= input_port_read_indexed(machine,8);
- if ((input_port_select & 0x10) == 0) ret &= input_port_read_indexed(machine,9);
+ if ((input_port_select & 0x01) == 0) ret &= input_port_read(machine, "KEY5");
+ if ((input_port_select & 0x02) == 0) ret &= input_port_read(machine, "KEY6");
+ if ((input_port_select & 0x04) == 0) ret &= input_port_read(machine, "KEY7");
+ if ((input_port_select & 0x08) == 0) ret &= input_port_read(machine, "KEY8");
+ if ((input_port_select & 0x10) == 0) ret &= input_port_read(machine, "KEY9");
return ret;
}
@@ -255,9 +255,9 @@ static READ8_HANDLER ( majs101b_dsw_r )
{
switch (dsw_select)
{
- case 0x00: return input_port_read_indexed(machine, 13); /* DSW3 */
- case 0x20: return input_port_read_indexed(machine, 14); /* DSW4 */
- case 0x40: return input_port_read_indexed(machine, 12); /* DSW2 */
+ case 0x00: return input_port_read(machine, "DSW3"); /* DSW3 */
+ case 0x20: return input_port_read(machine, "DSW4"); /* DSW4 */
+ case 0x40: return input_port_read(machine, "DSW2"); /* DSW2 */
}
return 0;
}
@@ -275,9 +275,9 @@ static READ8_HANDLER ( suzume_dsw_r )
{
switch (suzume_bank)
{
- case 0x08: return input_port_read_indexed(machine, 14); /* DSW4 */
- case 0x10: return input_port_read_indexed(machine, 13); /* DSW3 */
- case 0x18: return input_port_read_indexed(machine, 12); /* DSW2 */
+ case 0x08: return input_port_read(machine, "DSW4"); /* DSW4 */
+ case 0x10: return input_port_read(machine, "DSW3"); /* DSW3 */
+ case 0x18: return input_port_read(machine, "DSW2"); /* DSW2 */
}
return 0;
}
@@ -383,8 +383,8 @@ static ADDRESS_MAP_START( royalmah_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
AM_RANGE( 0x03, 0x03 ) AM_WRITE( AY8910_control_port_0_w )
- AM_RANGE( 0x10, 0x10 ) AM_READWRITE( input_port_11_r, royalmah_palbank_w )
- AM_RANGE( 0x11, 0x11 ) AM_READWRITE( input_port_10_r, input_port_select_w )
+ AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w )
+ AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
ADDRESS_MAP_END
static ADDRESS_MAP_START( ippatsu_iomap, ADDRESS_SPACE_IO, 8 )
@@ -392,10 +392,10 @@ static ADDRESS_MAP_START( ippatsu_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
AM_RANGE( 0x03, 0x03 ) AM_WRITE( AY8910_control_port_0_w )
- AM_RANGE( 0x10, 0x10 ) AM_READWRITE( input_port_11_r, royalmah_palbank_w )
- AM_RANGE( 0x11, 0x11 ) AM_READWRITE( input_port_10_r, input_port_select_w )
- AM_RANGE( 0x12, 0x12 ) AM_READ( input_port_12_r )
- AM_RANGE( 0x13, 0x13 ) AM_READ( input_port_13_r )
+ AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w )
+ AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
+ AM_RANGE( 0x12, 0x12 ) AM_READ_PORT("DSW2")
+ AM_RANGE( 0x13, 0x13 ) AM_READ_PORT("DSW3")
ADDRESS_MAP_END
static ADDRESS_MAP_START( suzume_iomap, ADDRESS_SPACE_IO, 8 )
@@ -403,8 +403,8 @@ static ADDRESS_MAP_START( suzume_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
AM_RANGE( 0x03, 0x03 ) AM_WRITE( AY8910_control_port_0_w )
- AM_RANGE( 0x10, 0x10 ) AM_READWRITE( input_port_11_r, royalmah_palbank_w )
- AM_RANGE( 0x11, 0x11 ) AM_READWRITE( input_port_10_r, input_port_select_w )
+ AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w )
+ AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
AM_RANGE( 0x80, 0x80 ) AM_READ( suzume_dsw_r )
AM_RANGE( 0x81, 0x81 ) AM_WRITE( suzume_bank_w )
ADDRESS_MAP_END
@@ -414,10 +414,10 @@ static ADDRESS_MAP_START( dondenmj_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
AM_RANGE( 0x03, 0x03 ) AM_WRITE(AY8910_control_port_0_w)
- AM_RANGE( 0x10, 0x10 ) AM_READWRITE( input_port_11_r, royalmah_palbank_w )
- AM_RANGE( 0x11, 0x11 ) AM_READWRITE( input_port_10_r, input_port_select_w )
- AM_RANGE( 0x85, 0x85 ) AM_READ( input_port_12_r ) // DSW2
- AM_RANGE( 0x86, 0x86 ) AM_READ( input_port_13_r ) // DSW3
+ AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w )
+ AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
+ AM_RANGE( 0x85, 0x85 ) AM_READ_PORT("DSW2") // DSW2
+ AM_RANGE( 0x86, 0x86 ) AM_READ_PORT("DSW3") // DSW3
AM_RANGE( 0x87, 0x87 ) AM_WRITE( dynax_bank_w )
ADDRESS_MAP_END
@@ -426,11 +426,11 @@ static ADDRESS_MAP_START( mjdiplob_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
AM_RANGE( 0x03, 0x03 ) AM_WRITE( AY8910_control_port_0_w )
- AM_RANGE( 0x10, 0x10 ) AM_READWRITE( input_port_11_r, royalmah_palbank_w )
- AM_RANGE( 0x11, 0x11 ) AM_READWRITE( input_port_10_r, input_port_select_w )
+ AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w )
+ AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
AM_RANGE( 0x61, 0x61 ) AM_WRITE(tontonb_bank_w)
- AM_RANGE( 0x62, 0x62 ) AM_READ( input_port_12_r ) // DSW2
- AM_RANGE( 0x63, 0x63 ) AM_READ( input_port_13_r ) // DSW3
+ AM_RANGE( 0x62, 0x62 ) AM_READ_PORT("DSW2") // DSW2
+ AM_RANGE( 0x63, 0x63 ) AM_READ_PORT("DSW3") // DSW3
ADDRESS_MAP_END
static ADDRESS_MAP_START( tontonb_iomap, ADDRESS_SPACE_IO, 8 )
@@ -438,11 +438,11 @@ static ADDRESS_MAP_START( tontonb_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
AM_RANGE( 0x03, 0x03 ) AM_WRITE( AY8910_control_port_0_w )
- AM_RANGE( 0x10, 0x10 ) AM_READWRITE( input_port_11_r, royalmah_palbank_w )
- AM_RANGE( 0x11, 0x11 ) AM_READWRITE( input_port_10_r, input_port_select_w )
+ AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w )
+ AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
AM_RANGE( 0x44, 0x44 ) AM_WRITE( tontonb_bank_w )
- AM_RANGE( 0x46, 0x46 ) AM_READ( input_port_13_r ) // DSW2
- AM_RANGE( 0x47, 0x47 ) AM_READ( input_port_12_r ) // DSW3
+ AM_RANGE( 0x46, 0x46 ) AM_READ_PORT("DSW2") // DSW2
+ AM_RANGE( 0x47, 0x47 ) AM_READ_PORT("DSW3") // DSW3
ADDRESS_MAP_END
static ADDRESS_MAP_START( majs101b_iomap, ADDRESS_SPACE_IO, 8 )
@@ -450,8 +450,8 @@ static ADDRESS_MAP_START( majs101b_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
AM_RANGE( 0x03, 0x03 ) AM_WRITE( AY8910_control_port_0_w )
- AM_RANGE( 0x10, 0x10 ) AM_READWRITE( input_port_11_r, royalmah_palbank_w )
- AM_RANGE( 0x11, 0x11 ) AM_READWRITE( input_port_10_r, input_port_select_w )
+ AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w )
+ AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
AM_RANGE( 0x00, 0x00 ) AM_READWRITE( majs101b_dsw_r, dynax_bank_w )
ADDRESS_MAP_END
@@ -460,12 +460,12 @@ static ADDRESS_MAP_START( mjderngr_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
AM_RANGE( 0x03, 0x03 ) AM_WRITE( AY8910_control_port_0_w )
-// AM_RANGE( 0x10, 0x10 ) AM_READ( input_port_11_r )
+// AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1")
AM_RANGE( 0x10, 0x10 ) AM_WRITE( mjderngr_coin_w ) // palette bank is set separately
- AM_RANGE( 0x11, 0x11 ) AM_READWRITE( input_port_10_r, input_port_select_w )
+ AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
AM_RANGE( 0x20, 0x20 ) AM_WRITE( dynax_bank_w )
- AM_RANGE( 0x40, 0x40 ) AM_READ( input_port_13_r ) // DSW2
- AM_RANGE( 0x4c, 0x4c ) AM_READ( input_port_12_r ) // DSW3
+ AM_RANGE( 0x40, 0x40 ) AM_READ_PORT("DSW3")
+ AM_RANGE( 0x4c, 0x4c ) AM_READ_PORT("DSW2")
AM_RANGE( 0x60, 0x60 ) AM_WRITE( mjderngr_palbank_w )
ADDRESS_MAP_END
@@ -475,9 +475,9 @@ static ADDRESS_MAP_START( mjapinky_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
AM_RANGE( 0x03, 0x03 ) AM_WRITE( AY8910_control_port_0_w )
- AM_RANGE( 0x04, 0x04 ) AM_READ( input_port_12_r )
- AM_RANGE( 0x10, 0x10 ) AM_READWRITE( input_port_11_r, mjapinky_palbank_w )
- AM_RANGE( 0x11, 0x11 ) AM_READWRITE( input_port_10_r, input_port_select_w )
+ AM_RANGE( 0x04, 0x04 ) AM_READ_PORT("DSW2")
+ AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( mjapinky_palbank_w )
+ AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
ADDRESS_MAP_END
/****************************************************************************
@@ -551,7 +551,7 @@ static ADDRESS_MAP_START( janptr96_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x83, 0x83 ) AM_WRITE( AY8910_control_port_0_w )
AM_RANGE( 0x93, 0x93 ) AM_WRITE( input_port_select_w )
AM_RANGE( 0xd8, 0xd8 ) AM_WRITE( janptr96_coin_counter_w )
- AM_RANGE( 0xd9, 0xd9 ) AM_READ( input_port_10_r )
+ AM_RANGE( 0xd9, 0xd9 ) AM_READ_PORT("SYSTEM")
ADDRESS_MAP_END
/****************************************************************************
@@ -576,10 +576,10 @@ static READ8_HANDLER( mjifb_rom_io_r )
switch(offset)
{
- case 0x8000: return input_port_read_indexed(machine, 14); // dsw 4
- case 0x8200: return input_port_read_indexed(machine, 13); // dsw 3
- case 0x9001: return AY8910_read_port_0_r(machine,0); // inputs
- case 0x9011: return input_port_read_indexed(machine, 10);
+ case 0x8000: return input_port_read(machine, "DSW4"); // dsw 4
+ case 0x8200: return input_port_read(machine, "DSW3"); // dsw 3
+ case 0x9001: return AY8910_read_port_0_r(machine, 0); // inputs
+ case 0x9011: return input_port_read(machine, "SYSTEM");
}
logerror("%04X: unmapped input read at %04X\n", activecpu_get_pc(), offset);
@@ -628,19 +628,19 @@ ADDRESS_MAP_END
static READ8_HANDLER( mjifb_p3_r )
{
- return input_port_read_indexed(machine, 11) >> 6;
+ return input_port_read(machine, "PORT3_5") >> 6;
}
static READ8_HANDLER( mjifb_p5_r )
{
- return input_port_read_indexed(machine, 11);
+ return input_port_read(machine, "PORT3_5");
}
static READ8_HANDLER( mjifb_p6_r )
{
- return input_port_read_indexed(machine, 12);
+ return input_port_read(machine, "PORT6_7");
}
static READ8_HANDLER( mjifb_p7_r )
{
- return input_port_read_indexed(machine, 12) >> 4;
+ return input_port_read(machine, "PORT6_7") >> 4;
}
static READ8_HANDLER( mjifb_p8_r )
{
@@ -683,10 +683,10 @@ static READ8_HANDLER( mjdejavu_rom_io_r )
switch(offset)
{
- case 0x8000: return input_port_read_indexed(machine, 14); // dsw 2
- case 0x8001: return input_port_read_indexed(machine, 13); // dsw 1
- case 0x9001: return AY8910_read_port_0_r(machine,0); // inputs
- case 0x9011: return input_port_read_indexed(machine, 10);
+ case 0x8000: return input_port_read(machine, "DSW2"); // dsw 2
+ case 0x8001: return input_port_read(machine, "DSW1"); // dsw 1
+ case 0x9001: return AY8910_read_port_0_r(machine, 0); // inputs
+ case 0x9011: return input_port_read(machine, "SYSTEM");
}
logerror("%04X: unmapped input read at %04X\n", activecpu_get_pc(), offset);
@@ -756,7 +756,7 @@ static ADDRESS_MAP_START( mjtensin_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x6fc2, 0x6fc2 ) AM_WRITE( AY8910_write_port_0_w )
AM_RANGE( 0x6fc3, 0x6fc3 ) AM_WRITE( AY8910_control_port_0_w )
AM_RANGE( 0x6fd0, 0x6fd0 ) AM_WRITE( janptr96_coin_counter_w )
- AM_RANGE( 0x6fd1, 0x6fd1 ) AM_READWRITE( input_port_10_r, input_port_select_w )
+ AM_RANGE( 0x6fd1, 0x6fd1 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
AM_RANGE( 0x6fe0, 0x6fef ) AM_DEVREADWRITE(MSM6242, "rtc", msm6242_r, msm6242_w)
AM_RANGE( 0x6ff0, 0x6ff0 ) AM_READWRITE( janptr96_dsw_r, janptr96_dswsel_w )
AM_RANGE( 0x6ff1, 0x6ff1 ) AM_WRITE( mjderngr_palbank_w )
@@ -825,7 +825,7 @@ static ADDRESS_MAP_START( cafetime_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x7fc2, 0x7fc2 ) AM_WRITE( AY8910_write_port_0_w )
AM_RANGE( 0x7fc3, 0x7fc3 ) AM_WRITE( AY8910_control_port_0_w )
AM_RANGE( 0x7fd0, 0x7fd0 ) AM_WRITE( janptr96_coin_counter_w )
- AM_RANGE( 0x7fd1, 0x7fd1 ) AM_READWRITE( input_port_10_r, SMH_NOP )
+ AM_RANGE( 0x7fd1, 0x7fd1 ) AM_READ_PORT("SYSTEM") AM_WRITENOP
AM_RANGE( 0x7fd3, 0x7fd3 ) AM_WRITE( input_port_select_w )
AM_RANGE( 0x7fe0, 0x7fe0 ) AM_READ( cafetime_dsw_r )
AM_RANGE( 0x7fe1, 0x7fe1 ) AM_WRITE( cafetime_dsw_w )
@@ -844,226 +844,119 @@ static ADDRESS_MAP_START( cafetime_iomap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static INPUT_PORTS_START( royalmah )
- PORT_START /* P1 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 )
+
+static INPUT_PORTS_START( mjctrl1 )
+ PORT_START_TAG("KEY0") /* P1 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(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Credit Clear") PORT_CODE(KEYCODE_7)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Credit Clear") PORT_CODE(KEYCODE_8)
-
- PORT_START /* P1 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(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Credit Clear") PORT_CODE(KEYCODE_7)
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Credit Clear") PORT_CODE(KEYCODE_8)
+
+ PORT_START_TAG("KEY1") /* P1 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( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* P1 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("KEY2") /* P1 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 /* P1 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("KEY3") /* P1 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 /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
+ PORT_START_TAG("KEY4") /* P1 IN4 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
+ PORT_START_TAG("KEY5") /* P2 IN0 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_PLAYER(2)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_PLAYER(2)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_PLAYER(2)
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M ) PORT_PLAYER(2)
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // "COIN2"
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // "COIN1", but not working
-
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2)
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START_TAG("KEY6") /* P2 IN1 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_PLAYER(2)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_PLAYER(2)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_PLAYER(2)
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N ) PORT_PLAYER(2)
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_PLAYER(2)
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) PORT_PLAYER(2)
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
+ PORT_START_TAG("KEY7") /* P2 IN2 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_PLAYER(2)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_PLAYER(2)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) PORT_PLAYER(2)
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) PORT_PLAYER(2)
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2)
PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
+ PORT_START_TAG("KEY8") /* P2 IN3 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_PLAYER(2)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_PLAYER(2)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_PLAYER(2)
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) PORT_PLAYER(2)
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
+ PORT_START_TAG("KEY9") /* P2 IN4 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) PORT_PLAYER(2)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) PORT_PLAYER(2)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) PORT_PLAYER(2)
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP ) PORT_PLAYER(2)
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG ) PORT_PLAYER(2)
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) PORT_PLAYER(2)
PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN10 */
+ PORT_START_TAG("SYSTEM") /* IN10 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
-
- PORT_START /* DSW (inport $10) */
- PORT_DIPNAME( 0x0f, 0x0f, "Pay Out Rate" )
- PORT_DIPSETTING( 0x0f, "96%" )
- PORT_DIPSETTING( 0x0e, "93%" )
- PORT_DIPSETTING( 0x0d, "90%" )
- PORT_DIPSETTING( 0x0c, "87%" )
- PORT_DIPSETTING( 0x0b, "84%" )
- PORT_DIPSETTING( 0x0a, "81%" )
- PORT_DIPSETTING( 0x09, "78%" )
- PORT_DIPSETTING( 0x08, "75%" )
- PORT_DIPSETTING( 0x07, "71%" )
- PORT_DIPSETTING( 0x06, "68%" )
- PORT_DIPSETTING( 0x05, "65%" )
- PORT_DIPSETTING( 0x04, "62%" )
- PORT_DIPSETTING( 0x03, "59%" )
- PORT_DIPSETTING( 0x02, "56%" )
- PORT_DIPSETTING( 0x01, "53%" )
- PORT_DIPSETTING( 0x00, "50%" )
- PORT_DIPNAME( 0x30, 0x30, "Maximum Bet" )
- PORT_DIPSETTING( 0x00, "1" )
- PORT_DIPSETTING( 0x10, "5" )
- PORT_DIPSETTING( 0x20, "10" )
- PORT_DIPSETTING( 0x30, "20" )
- PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x40, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unused ) )
- PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x80, DEF_STR( On ) )
INPUT_PORTS_END
-static INPUT_PORTS_START( janyoup2 )
- PORT_START /* P1 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(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Credit Clear") PORT_CODE(KEYCODE_7)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Credit Clear") PORT_CODE(KEYCODE_8)
-
- PORT_START /* P1 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(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* P1 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 )
+static INPUT_PORTS_START( mjctrl2 )
+ PORT_INCLUDE( mjctrl1 )
- PORT_START /* P1 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_MODIFY("KEY0")
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Payout") PORT_CODE(KEYCODE_7)
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
+INPUT_PORTS_END
- PORT_START /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
+static INPUT_PORTS_START( royalmah )
+ PORT_INCLUDE( mjctrl1 )
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
+ PORT_MODIFY("KEY5")
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // "COIN2"
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // "COIN1", but not working
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* IN10 */
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
- PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
- PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
-
- PORT_START /* DSW (inport $10) */
+ PORT_START_TAG("DSW1") /* DSW (inport $10) */
PORT_DIPNAME( 0x0f, 0x0f, "Pay Out Rate" )
PORT_DIPSETTING( 0x0f, "96%" )
PORT_DIPSETTING( 0x0e, "93%" )
@@ -1092,8 +985,12 @@ static INPUT_PORTS_START( janyoup2 )
PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unused ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
+INPUT_PORTS_END
- PORT_START /* DSW (inport $12) */
+static INPUT_PORTS_START( janyoup2 )
+ PORT_INCLUDE( royalmah )
+
+ PORT_START_TAG("DSW2") /* DSW (inport $12) */
PORT_DIPNAME( 0x01, 0x01, "Unknown 1-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1119,7 +1016,7 @@ static INPUT_PORTS_START( janyoup2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW (inport $13) */
+ PORT_START_TAG("DSW3") /* DSW (inport $13) */
PORT_DIPNAME( 0x01, 0x01, "Unknown 2-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1147,100 +1044,9 @@ static INPUT_PORTS_START( janyoup2 )
INPUT_PORTS_END
static INPUT_PORTS_START( suzume )
- PORT_START /* P1 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(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Payout") PORT_CODE(KEYCODE_7)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 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(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 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 /* P1 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 /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2) PORT_CODE(KEYCODE_4)
- PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT(0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* IN10 */
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
- PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
- PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
- PORT_BIT(0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_INCLUDE( mjctrl2 )
- PORT_START /* DSW1 */
+ PORT_START_TAG("DSW1") /* DSW1 */
PORT_DIPNAME( 0x0f, 0x0f, "Pay Out Rate" )
PORT_DIPSETTING( 0x00, "50%" )
PORT_DIPSETTING( 0x01, "53%" )
@@ -1270,7 +1076,7 @@ static INPUT_PORTS_START( suzume )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW2 */
+ PORT_START_TAG("DSW2") /* DSW2 */
PORT_DIPNAME( 0x03, 0x03, "Winnings" )
PORT_DIPSETTING( 0x03, "50 30 15 8 5 3 2 1" )
PORT_DIPSETTING( 0x00, "50 30 20 15 8 6 3 2" )
@@ -1295,7 +1101,7 @@ static INPUT_PORTS_START( suzume )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW3 */
+ PORT_START_TAG("DSW3") /* DSW3 */
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "4" )
@@ -1320,7 +1126,7 @@ static INPUT_PORTS_START( suzume )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* DSW4 */
+ PORT_START_TAG("DSW4") /* DSW4 */
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1345,100 +1151,9 @@ static INPUT_PORTS_START( suzume )
INPUT_PORTS_END
static INPUT_PORTS_START( tontonb )
- PORT_START /* P1 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(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Payout") PORT_CODE(KEYCODE_7)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 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(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 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 /* P1 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 /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_INCLUDE( mjctrl2 )
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2) PORT_CODE(KEYCODE_4)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* IN10 */
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
- PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
- PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
-
- PORT_START /* DSW1 (inport $10 -> 0x73b0) */
+ PORT_START_TAG("DSW1") /* DSW1 (inport $10 -> 0x73b0) */
PORT_DIPNAME( 0x0f, 0x0f, "Pay Out Rate" )
PORT_DIPSETTING( 0x0f, "96%" )
PORT_DIPSETTING( 0x0e, "93%" )
@@ -1468,7 +1183,7 @@ static INPUT_PORTS_START( tontonb )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW3 (inport $47 -> 0x73b1) */
+ PORT_START_TAG("DSW3") /* DSW3 (inport $47 -> 0x73b1) */
PORT_DIPNAME( 0x03, 0x03, "Winnings" ) // check code at 0x0e6d
PORT_DIPSETTING( 0x00, "32 24 16 12 8 4 2 1" ) // table at 0x4e7d
PORT_DIPSETTING( 0x03, "50 30 15 8 5 3 2 1" ) // table at 0x4e4d
@@ -1492,7 +1207,7 @@ static INPUT_PORTS_START( tontonb )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* DSW2 (inport $46 -> 0x73b2) */
+ PORT_START_TAG("DSW2") /* DSW2 (inport $46 -> 0x73b2) */
PORT_DIPNAME( 0x01, 0x00, "Special Combinations" ) // see notes
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1520,100 +1235,9 @@ static INPUT_PORTS_START( tontonb )
INPUT_PORTS_END
static INPUT_PORTS_START( mjdiplob )
- PORT_START /* P1 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(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Payout") PORT_CODE(KEYCODE_7)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 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(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 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 /* P1 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 /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2) PORT_CODE(KEYCODE_4)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_INCLUDE( mjctrl2 )
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* IN10 */
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
- PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
- PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
-
- PORT_START /* DSW1 (inport $10 -> 0x76fa) */
+ PORT_START_TAG("DSW1") /* DSW1 (inport $10 -> 0x76fa) */
PORT_DIPNAME( 0x0f, 0x0f, "Pay Out Rate" )
PORT_DIPSETTING( 0x0f, "96%" )
PORT_DIPSETTING( 0x0e, "93%" )
@@ -1643,7 +1267,7 @@ static INPUT_PORTS_START( mjdiplob )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW2 (inport $62 -> 0x76fb) */
+ PORT_START_TAG("DSW2") /* DSW2 (inport $62 -> 0x76fb) */
PORT_DIPNAME( 0x03, 0x03, "Winnings" ) // check code at 0x09cd
PORT_DIPSETTING( 0x00, "32 24 16 12 8 4 2 1" ) // table at 0x4b82
PORT_DIPSETTING( 0x03, "50 30 15 8 5 3 2 1" ) // table at 0x4b52
@@ -1667,7 +1291,7 @@ static INPUT_PORTS_START( mjdiplob )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
- PORT_START /* DSW3 (inport $63 -> 0x76fc) */
+ PORT_START_TAG("DSW3") /* DSW3 (inport $63 -> 0x76fc) */
PORT_DIPNAME( 0x01, 0x00, "Special Combinations" ) // see notes
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1695,100 +1319,9 @@ static INPUT_PORTS_START( mjdiplob )
INPUT_PORTS_END
static INPUT_PORTS_START( majs101b )
- PORT_START /* P1 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(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Payout") PORT_CODE(KEYCODE_7)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 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(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 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 /* P1 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_INCLUDE( mjctrl2 )
- PORT_START /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2) PORT_CODE(KEYCODE_4)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* IN10 */
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
- PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
- PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
-
- PORT_START /* DSW1 (inport $10 -> 0x76fd) */
+ PORT_START_TAG("DSW1") /* DSW1 (inport $10 -> 0x76fd) */
PORT_DIPNAME( 0x0f, 0x0f, "Pay Out Rate" )
PORT_DIPSETTING( 0x0f, "96%" )
PORT_DIPSETTING( 0x0e, "93%" )
@@ -1818,7 +1351,7 @@ static INPUT_PORTS_START( majs101b )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW2 (inport $00 (after out 0,$40) -> 0x76fa) */
+ PORT_START_TAG("DSW2") /* DSW2 (inport $00 (after out 0,$40) -> 0x76fa) */
PORT_DIPNAME( 0x03, 0x03, "Winnings" ) // check code at 0x14e4
PORT_DIPSETTING( 0x00, "32 24 16 12 8 4 2 1" ) // table at 0x1539
PORT_DIPSETTING( 0x03, "50 30 15 8 5 3 2 1" ) // table at 0x1509
@@ -1843,7 +1376,7 @@ static INPUT_PORTS_START( majs101b )
PORT_DIPSETTING( 0x00, "Black" )
PORT_DIPSETTING( 0x80, "Gray" )
- PORT_START /* DSW3 (inport $00 (after out 0,$00) -> 0x76fc) */
+ PORT_START_TAG("DSW3") /* DSW3 (inport $00 (after out 0,$00) -> 0x76fc) */
PORT_DIPNAME( 0x01, 0x00, "Special Combinations" ) // see notes
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1869,7 +1402,7 @@ static INPUT_PORTS_START( majs101b )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW4 (inport $00 (after out 0,$20) -> 0x76fb) */
+ PORT_START_TAG("DSW4") /* DSW4 (inport $00 (after out 0,$20) -> 0x76fb) */
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Unknown ) ) // stored at 0x702f - check code at 0x1713,
PORT_DIPSETTING( 0x00, "0" ) // 0x33d1, 0x3408, 0x3415, 0x347c, 0x3492, 0x350d,
PORT_DIPSETTING( 0x01, "1" ) // 0x4af9, 0x4b1f and 0x61f6
@@ -1894,98 +1427,7 @@ static INPUT_PORTS_START( majs101b )
INPUT_PORTS_END
static INPUT_PORTS_START( mjapinky )
- PORT_START /* P1 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(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Payout") PORT_CODE(KEYCODE_7)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 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(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 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 /* P1 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 /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2) PORT_CODE(KEYCODE_4)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* IN10 */
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
- PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
- PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_INCLUDE( mjctrl2 )
PORT_START_TAG("DSW1") /* IN11 */
PORT_DIPNAME( 0x01, 0x01, "Unknown 1-0" )
@@ -2063,98 +1505,7 @@ static INPUT_PORTS_START( mjapinky )
INPUT_PORTS_END
static INPUT_PORTS_START( janptr96 )
- PORT_START /* P1 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(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Credit Clear") PORT_CODE(KEYCODE_7)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Credit Clear") PORT_CODE(KEYCODE_8)
-
- PORT_START /* P1 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(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 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 /* P1 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 /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2)
- PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT(0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* IN10 */
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
- PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
- PORT_BIT(0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_INCLUDE( mjctrl1 )
PORT_START_TAG("DSW4") /* IN11 */
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) )
@@ -2287,100 +1638,9 @@ static INPUT_PORTS_START( janptr96 )
INPUT_PORTS_END
static INPUT_PORTS_START( mjifb )
- PORT_START /* P1 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(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Payout") PORT_CODE(KEYCODE_7)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_INCLUDE( mjctrl2 )
- PORT_START /* P1 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(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 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 /* P1 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 /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2) PORT_CODE(KEYCODE_4)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* IN10 */
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
- PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
- PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
-
- PORT_START // IN10 - DSW1 (P3 & P5)
+ PORT_START_TAG("PORT3_5") // IN10 - DSW1 (P3 & P5)
PORT_DIPNAME( 0x0f, 0x07, "Pay Out Rate" )
PORT_DIPSETTING( 0x0f, "96%" )
PORT_DIPSETTING( 0x0e, "93%" )
@@ -2409,7 +1669,7 @@ static INPUT_PORTS_START( mjifb )
PORT_DIPSETTING( 0x40, "3" )
PORT_DIPSETTING( 0x00, "4" )
- PORT_START // IN11 - DSW2 (P6 & P7)
+ PORT_START_TAG("PORT6_7") // IN11 - DSW2 (P6 & P7)
PORT_DIPNAME( 0x03, 0x03, "Winnings" )
PORT_DIPSETTING( 0x03, "32 24 16 12 8 4 2 1" )
PORT_DIPSETTING( 0x00, "50 30 15 8 5 3 2 1" )
@@ -2434,7 +1694,7 @@ static INPUT_PORTS_START( mjifb )
PORT_DIPSETTING( 0x00, "1/4" )
PORT_DIPSETTING( 0x80, "2/4" )
- PORT_START // IN13 - DSW3 ($8200)
+ PORT_START_TAG("DSW3") // IN13 - DSW3 ($8200)
PORT_DIPNAME( 0x01, 0x01, "Unknown 3-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2460,7 +1720,7 @@ static INPUT_PORTS_START( mjifb )
PORT_DIPSETTING( 0x80, "Black" )
PORT_DIPSETTING( 0x00, "Blue" )
- PORT_START // IN14 - DSW4 ($8000)
+ PORT_START_TAG("DSW4") // IN14 - DSW4 ($8000)
PORT_DIPNAME( 0x01, 0x01, "Unknown 4-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2488,98 +1748,7 @@ static INPUT_PORTS_START( mjifb )
INPUT_PORTS_END
static INPUT_PORTS_START( mjtensin )
- PORT_START /* P1 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(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Credit Clear") PORT_CODE(KEYCODE_7)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Credit Clear") PORT_CODE(KEYCODE_8)
-
- PORT_START /* P1 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(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 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 /* P1 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 /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2)
- PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT(0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT(0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* IN10 */
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
- PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
- PORT_BIT(0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_INCLUDE( mjctrl1 )
PORT_START_TAG("DSW4") /* IN11 */
PORT_DIPNAME( 0x0f, 0x0f, "Pay Out Rate" )
@@ -2710,98 +1879,7 @@ static INPUT_PORTS_START( mjtensin )
INPUT_PORTS_END
static INPUT_PORTS_START( cafetime )
- PORT_START /* P1 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(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Payout") PORT_CODE(KEYCODE_7)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 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(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 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 /* P1 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 /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2) PORT_CODE(KEYCODE_4)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* IN10 */
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
- PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
- PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_INCLUDE( mjctrl2 )
PORT_START_TAG("DSW1") /* IN11 */
PORT_DIPNAME( 0x0f, 0x07, "Pay Out Rate" )
@@ -2935,100 +2013,14 @@ static INPUT_PORTS_START( cafetime )
INPUT_PORTS_END
static INPUT_PORTS_START( ippatsu )
- PORT_START /* P1 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(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Credit Clear") PORT_CODE(KEYCODE_7)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Credit Clear") PORT_CODE(KEYCODE_8)
-
- PORT_START /* P1 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(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 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 /* P1 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 /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_INCLUDE( mjctrl1 )
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
+ PORT_MODIFY("KEY5")
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) // "COIN2"
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // "COIN1", but not working
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* IN10 */
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
- PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
- PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
-
- PORT_START /* DSW (inport $10) */
+ PORT_START_TAG("DSW1") /* DSW (inport $10) */
PORT_DIPNAME( 0x0f, 0x0f, "Pay Out Rate" )
PORT_DIPSETTING( 0x0f, "96%" )
PORT_DIPSETTING( 0x0e, "93%" )
@@ -3058,7 +2050,7 @@ static INPUT_PORTS_START( ippatsu )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x80, DEF_STR( Yes ) )
- PORT_START /* DSW (inport $12) */
+ PORT_START_TAG("DSW2") /* DSW (inport $12) */
PORT_DIPNAME( 0x03, 0x03, "Cut" )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x02, "2 Bai" )
@@ -3081,7 +2073,7 @@ static INPUT_PORTS_START( ippatsu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START /* DSW (inport $13) */
+ PORT_START_TAG("DSW3") /* DSW (inport $13) */
PORT_DIPNAME( 0x01, 0x01, "Unknown 2-0*" )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x01, DEF_STR( Yes ) )
@@ -3108,100 +2100,9 @@ static INPUT_PORTS_START( ippatsu )
INPUT_PORTS_END
static INPUT_PORTS_START( mjdejavu )
- PORT_START /* P1 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(0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Payout") PORT_CODE(KEYCODE_7)
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 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(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P1 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 /* P1 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 /* P1 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN0 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_E )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_I )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_M )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )PORT_PLAYER(2)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN1 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_B )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_J )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_N )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_BET )PORT_PLAYER(2) PORT_CODE(KEYCODE_4)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN2 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_C )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_G )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_RON )PORT_PLAYER(2)
- PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN3 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_D )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_H )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_L )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON )PORT_PLAYER(2)
- PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* P2 IN4 */
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )PORT_PLAYER(2)
- PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )PORT_PLAYER(2)
- PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
- PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED )
-
- PORT_START /* IN10 */
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) /* "Note" ("Paper Money") = 10 Credits */
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE3 ) /* Memory Reset */
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE2 ) /* Analizer (Statistics) */
- PORT_SERVICE( 0x08, IP_ACTIVE_HIGH )
- PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_INCLUDE( mjctrl2 )
- PORT_START // IN11 - DSW3 (P3 & P5)
+ PORT_START_TAG("PORT3_5") // IN11 - DSW3 (P3 & P5)
PORT_DIPNAME( 0x03, 0x03, "Unknown 3-0&1*" )
PORT_DIPSETTING( 0x00, "1 1" )
PORT_DIPSETTING( 0x02, "3 4" )
@@ -3226,7 +2127,7 @@ static INPUT_PORTS_START( mjdejavu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START // IN12 - DSW4 (P6 & P7)
+ PORT_START_TAG("PORT6_7") // IN12 - DSW4 (P6 & P7)
PORT_DIPNAME( 0x01, 0x01, "Unknown 4-0" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -3252,7 +2153,7 @@ static INPUT_PORTS_START( mjdejavu )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START // IN13 - DSW1 ($8001)
+ PORT_START_TAG("DSW1") // IN13 - DSW1 ($8001)
PORT_DIPNAME( 0x0f, 0x07, "Pay Out Rate" )
PORT_DIPSETTING( 0x0f, "96%" )
PORT_DIPSETTING( 0x0e, "93%" )
@@ -3282,7 +2183,7 @@ static INPUT_PORTS_START( mjdejavu )
PORT_DIPSETTING( 0x80, "Gray" )
PORT_DIPSETTING( 0x00, "Black" )
- PORT_START // IN14 - DSW2 ($8000)
+ PORT_START_TAG("DSW2") // IN14 - DSW2 ($8000)
PORT_DIPNAME( 0x03, 0x03, "Winnings" )
PORT_DIPSETTING( 0x00, "32 24 16 12 8 4 2 1" )
PORT_DIPSETTING( 0x03, "50 30 15 8 5 3 2 1" )
diff --git a/src/mame/drivers/rpunch.c b/src/mame/drivers/rpunch.c
index af749772a91..47e25cb7aa7 100644
--- a/src/mame/drivers/rpunch.c
+++ b/src/mame/drivers/rpunch.c
@@ -165,7 +165,7 @@ static MACHINE_RESET( rpunch )
static READ16_HANDLER( common_port_r )
{
- return input_port_read_indexed(machine, offset) | input_port_read_indexed(machine, 2);
+ return input_port_read(machine, offset ? "P2" : "P1") | input_port_read(machine, "SERVICE");
}
@@ -246,7 +246,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x060000, 0x060fff) AM_READ(SMH_RAM)
AM_RANGE(0x080000, 0x083fff) AM_READ(SMH_RAM)
AM_RANGE(0x0c0018, 0x0c001b) AM_READ(common_port_r)
- AM_RANGE(0x0c001c, 0x0c001d) AM_READ(input_port_3_word_r)
+ AM_RANGE(0x0c001c, 0x0c001d) AM_READ_PORT("DSW")
AM_RANGE(0x0c001e, 0x0c001f) AM_READ(sound_busy_r)
AM_RANGE(0x0a0000, 0x0a07ff) AM_READ(SMH_RAM)
AM_RANGE(0x0fc000, 0x0fffff) AM_READ(SMH_RAM)
diff --git a/src/mame/drivers/runaway.c b/src/mame/drivers/runaway.c
index d3eb0fea7ed..8b8b8699333 100644
--- a/src/mame/drivers/runaway.c
+++ b/src/mame/drivers/runaway.c
@@ -53,11 +53,11 @@ static READ8_HANDLER( runaway_input_r )
{
UINT8 val = 0;
- if (input_port_read_indexed(machine, 0) & (1 << offset))
+ if (input_port_read(machine, "3000D7") & (1 << offset))
{
val |= 0x80;
}
- if (input_port_read_indexed(machine, 1) & (1 << offset))
+ if (input_port_read(machine, "3000D6") & (1 << offset))
{
val |= 0x40;
}
@@ -68,7 +68,7 @@ static READ8_HANDLER( runaway_input_r )
static READ8_HANDLER( runaway_pot_r )
{
- return (input_port_read_indexed(machine, 4) << (7 - offset)) & 0x80;
+ return (input_port_read(machine, "7000") << (7 - offset)) & 0x80;
}
@@ -88,7 +88,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_READ(SMH_RAM)
AM_RANGE(0x0400, 0x07ff) AM_READ(SMH_RAM)
AM_RANGE(0x3000, 0x3007) AM_READ(runaway_input_r)
- AM_RANGE(0x4000, 0x4000) AM_READ(input_port_2_r)
+ AM_RANGE(0x4000, 0x4000) AM_READ_PORT("4000")
AM_RANGE(0x5000, 0x5000) AM_READ(atari_vg_earom_r)
AM_RANGE(0x6000, 0x600f) AM_READ(pokey1_r)
AM_RANGE(0x7000, 0x700f) AM_READ(pokey2_r)
@@ -116,7 +116,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( qwak )
- PORT_START /* 3000 D7 */
+ PORT_START_TAG("3000D7") /* 3000 D7 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -126,7 +126,7 @@ static INPUT_PORTS_START( qwak )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN3 )
- PORT_START /* 3000 D6 */
+ PORT_START_TAG("3000D6") /* 3000 D6 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
@@ -136,7 +136,7 @@ static INPUT_PORTS_START( qwak )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START /* 4000 */
+ PORT_START_TAG("4000") /* 4000 */
PORT_DIPNAME( 0x01, 0x00, "DIP 1" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ))
@@ -162,13 +162,13 @@ static INPUT_PORTS_START( qwak )
PORT_DIPSETTING( 0x80, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ))
- PORT_START /* 6008 not used */
- PORT_START /* 7000 not used */
+ PORT_START_TAG("6008") /* 6008 not used */
+ PORT_START_TAG("7000") /* 7000 not used */
INPUT_PORTS_END
static INPUT_PORTS_START( runaway )
- PORT_START /* 3000 D7 */
+ PORT_START_TAG("3000D7") /* 3000 D7 */
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT ( 0x02, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_TILT )
@@ -178,7 +178,7 @@ static INPUT_PORTS_START( runaway )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN3 )
- PORT_START /* 3000 D6 */
+ PORT_START_TAG("3000D6") /* 3000 D6 */
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -188,7 +188,7 @@ static INPUT_PORTS_START( runaway )
PORT_BIT ( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT ( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START /* 4000 */
+ PORT_START_TAG("4000") /* 4000 */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ))
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ))
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ))
@@ -212,7 +212,7 @@ static INPUT_PORTS_START( runaway )
PORT_DIPSETTING( 0x80, DEF_STR( Off ))
PORT_DIPSETTING( 0x00, DEF_STR( On ))
- PORT_START /* 6008 */
+ PORT_START_TAG("6008") /* 6008 */
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ))
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x01, "3" )
@@ -236,7 +236,7 @@ static INPUT_PORTS_START( runaway )
PORT_DIPSETTING( 0x00, DEF_STR( Off ))
PORT_DIPSETTING( 0x80, DEF_STR( On ))
- PORT_START /* 7000 */
+ PORT_START_TAG("7000") /* 7000 */
PORT_BIT ( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_TOGGLE
PORT_BIT ( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c
index 12b17ba33d2..99987f35152 100644
--- a/src/mame/drivers/rungun.c
+++ b/src/mame/drivers/rungun.c
@@ -93,21 +93,21 @@ static READ16_HANDLER( rng_sysregs_r )
switch (offset)
{
case 0x00/2:
- if (input_port_read_indexed(machine, 1) & 0x20)
- return(input_port_read_indexed(machine, 2) | input_port_read_indexed(machine, 4)<<8);
+ if (input_port_read(machine, "DSW") & 0x20)
+ return(input_port_read(machine, "P1") | input_port_read(machine, "P3")<<8);
else
{
- data = input_port_read_indexed(machine, 2) & input_port_read_indexed(machine, 4);
+ data = input_port_read(machine, "P1") & input_port_read(machine, "P3");
return(data<<8 | data);
}
break;
case 0x02/2:
- if (input_port_read_indexed(machine, 1) & 0x20)
- return(input_port_read_indexed(machine, 3) | input_port_read_indexed(machine, 5)<<8);
+ if (input_port_read(machine, "DSW") & 0x20)
+ return(input_port_read(machine, "P2") | input_port_read(machine, "P4")<<8);
else
{
- data = input_port_read_indexed(machine, 3) & input_port_read_indexed(machine, 5);
+ data = input_port_read(machine, "P2") & input_port_read(machine, "P4");
return(data<<8 | data);
}
break;
@@ -118,13 +118,13 @@ static READ16_HANDLER( rng_sysregs_r )
bit8 : freeze
bit9 : joysticks layout(auto detect???)
*/
- return input_port_read_indexed(machine, 0);
+ return input_port_read(machine, "SYSTEM");
break;
case 0x06/2:
if (ACCESSING_BITS_0_7)
{
- data = input_port_read_indexed(machine, 1) | eeprom_read_bit();
+ data = input_port_read(machine, "DSW") | eeprom_read_bit();
if (init_eeprom_count)
{
@@ -374,7 +374,7 @@ static MACHINE_DRIVER_START( rng )
MACHINE_DRIVER_END
static INPUT_PORTS_START( rng )
- 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_COIN3 )
@@ -390,7 +390,7 @@ static INPUT_PORTS_START( rng )
PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START
+ PORT_START_TAG("DSW")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* EEPROM data */
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SPECIAL ) /* EEPROM ready (always 1) */
PORT_SERVICE_NO_TOGGLE( 0x08, IP_ACTIVE_LOW )
@@ -410,7 +410,7 @@ static INPUT_PORTS_START( rng )
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_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)
@@ -420,7 +420,7 @@ static INPUT_PORTS_START( rng )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
- PORT_START
+ PORT_START_TAG("P2")
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)
@@ -430,7 +430,7 @@ static INPUT_PORTS_START( rng )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
- PORT_START
+ PORT_START_TAG("P3")
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)
@@ -440,7 +440,7 @@ static INPUT_PORTS_START( rng )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 )
- PORT_START
+ PORT_START_TAG("P4")
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)
diff --git a/src/mame/includes/nb1413m3.h b/src/mame/includes/nb1413m3.h
index 977482fe4a4..89ff80a867f 100644
--- a/src/mame/includes/nb1413m3.h
+++ b/src/mame/includes/nb1413m3.h
@@ -117,115 +117,6 @@ enum {
#define NB1413M3_VCR_FFORWARD 0x10
#define NB1413M3_VCR_PAUSE 0x20
-#define NBMJCTRL_PORT1 \
- PORT_START /* (3) PORT 1-1 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) \
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_M ) \
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_I ) \
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_E ) \
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_A ) \
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define NBMJCTRL_PORT2 \
- PORT_START /* (4) PORT 1-2 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) \
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_N ) \
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_J ) \
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_F ) \
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_B ) \
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define NBMJCTRL_PORT3 \
- PORT_START /* (5) PORT 1-3 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) \
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) \
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_K ) \
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_G ) \
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_C ) \
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define NBMJCTRL_PORT4 \
- PORT_START /* (6) PORT 1-4 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) \
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_L ) \
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_H ) \
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_D ) \
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define NBMJCTRL_PORT5 \
- PORT_START /* (7) PORT 1-5 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Mahjong Small") PORT_CODE(KEYCODE_BACKSPACE) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P1 Mahjong Big") PORT_CODE(KEYCODE_ENTER) \
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP ) \
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) \
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) \
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) \
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define NBMJCTRL_PORT6 \
- PORT_START /* (6) PORT 2-1 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 ) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2)\
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_M ) PORT_PLAYER(2)\
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_PLAYER(2)\
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_PLAYER(2)\
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_PLAYER(2)\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define NBMJCTRL_PORT7 \
- PORT_START /* (7) PORT 2-2 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) PORT_PLAYER(2)\
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_PLAYER(2)\
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_N ) PORT_PLAYER(2)\
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_PLAYER(2)\
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_PLAYER(2)\
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_PLAYER(2)\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define NBMJCTRL_PORT8 \
- PORT_START /* (8) PORT 2-3 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2)\
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) PORT_PLAYER(2)\
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_K ) PORT_PLAYER(2)\
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_PLAYER(2)\
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_PLAYER(2)\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define NBMJCTRL_PORT9 \
- PORT_START /* (9) PORT 2-4 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) PORT_PLAYER(2)\
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_PLAYER(2)\
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_PLAYER(2)\
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_PLAYER(2)\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-#define NBMJCTRL_PORT10 \
- PORT_START /* (10) PORT 2-5 */ \
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Mahjong Small") \
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("P2 Mahjong Big") \
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP ) PORT_PLAYER(2)\
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) PORT_PLAYER(2)\
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) PORT_PLAYER(2)\
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) PORT_PLAYER(2)\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
/*----------- defined in machine/nb1413m3.c -----------*/
@@ -252,6 +143,9 @@ READ8_HANDLER( nb1413m3_dipsw3_h_r );
WRITE8_HANDLER( nb1413m3_outcoin_w );
WRITE8_HANDLER( nb1413m3_vcrctrl_w );
+/* used in: hyhoo.c, niyanpai.c, pastelg.c, nbmj8688.c, nbmj8891.c, nbmj8991.c, nbmj9195.c*/
+INPUT_PORTS_EXTERN( nbmjcontrols );
+
extern int nb1413m3_type;
extern int nb1413m3_sndromregion;
extern int nb1413m3_sndrombank1;
diff --git a/src/mame/machine/nb1413m3.c b/src/mame/machine/nb1413m3.c
index 1ec9082b7be..0e327bce4ab 100644
--- a/src/mame/machine/nb1413m3.c
+++ b/src/mame/machine/nb1413m3.c
@@ -380,15 +380,12 @@ READ8_HANDLER( nb1413m3_inputport0_r )
{
switch (nb1413m3_type)
{
- case NB1413M3_PASTELG:
- return ((input_port_read_indexed(machine, 3) & 0xfe) | (nb1413m3_busyflag & 0x01));
- case NB1413M3_TAIWANMB:
- return ((input_port_read_indexed(machine, 3) & 0xfc) | ((nb1413m3_outcoin_flag & 0x01) << 1) | (nb1413m3_busyflag & 0x01));
case NB1413M3_HYHOO:
case NB1413M3_HYHOO2:
- return ((input_port_read_indexed(machine, 2) & 0xfe) | (nb1413m3_busyflag & 0x01));
+ case NB1413M3_PASTELG:
+ return ((input_port_read(machine, "SYSTEM") & 0xfe) | (nb1413m3_busyflag & 0x01));
default:
- return ((input_port_read_indexed(machine, 2) & 0xfc) | ((nb1413m3_outcoin_flag & 0x01) << 1) | (nb1413m3_busyflag & 0x01));
+ return ((input_port_read(machine, "SYSTEM") & 0xfc) | ((nb1413m3_outcoin_flag & 0x01) << 1) | (nb1413m3_busyflag & 0x01));
}
}
@@ -396,58 +393,47 @@ READ8_HANDLER( nb1413m3_inputport1_r )
{
switch (nb1413m3_type)
{
- case NB1413M3_PASTELG:
- case NB1413M3_THREEDS:
- case NB1413M3_TAIWANMB:
- switch ((nb1413m3_inputport ^ 0xff) & 0x1f)
- {
- case 0x01: return input_port_read_indexed(machine, 4);
- case 0x02: return input_port_read_indexed(machine, 5);
- case 0x04: return input_port_read_indexed(machine, 6);
- case 0x08: return input_port_read_indexed(machine, 7);
- case 0x10: return input_port_read_indexed(machine, 8);
- default: return (input_port_read_indexed(machine, 4) & input_port_read_indexed(machine, 5) & input_port_read_indexed(machine, 6) & input_port_read_indexed(machine, 7) & input_port_read_indexed(machine, 8));
- }
- break;
case NB1413M3_HYHOO:
case NB1413M3_HYHOO2:
switch ((nb1413m3_inputport ^ 0xff) & 0x07)
{
- case 0x01: return input_port_read_indexed(machine, 3);
- case 0x02: return input_port_read_indexed(machine, 4);
+ case 0x01: return input_port_read(machine, "IN0");
+ case 0x02: return input_port_read(machine, "IN1");
case 0x04: return 0xff;
default: return 0xff;
}
break;
case NB1413M3_MSJIKEN:
case NB1413M3_TELMAHJN:
- if (input_port_read_indexed(machine, 0) & 0x80)
+ if (input_port_read(machine, "DSWA") & 0x80)
{
switch ((nb1413m3_inputport ^ 0xff) & 0x1f)
{
- 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);
- default: return (input_port_read_indexed(machine, 3) & input_port_read_indexed(machine, 4) & input_port_read_indexed(machine, 5) & input_port_read_indexed(machine, 6) & 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: return (input_port_read(machine, "KEY0") & input_port_read(machine, "KEY1") & input_port_read(machine, "KEY2")
+ & input_port_read(machine, "KEY3") & input_port_read(machine, "KEY4"));
}
}
- else return input_port_read_indexed(machine, 14);
+ else return input_port_read(machine, "JAMMA2");
break;
case NB1413M3_PAIRSNB:
case NB1413M3_PAIRSTEN:
- return input_port_read_indexed(machine, 3);
+ return input_port_read(machine, "P1");
break;
default:
switch ((nb1413m3_inputport ^ 0xff) & 0x1f)
{
- 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);
- default: return (input_port_read_indexed(machine, 3) & input_port_read_indexed(machine, 4) & input_port_read_indexed(machine, 5) & input_port_read_indexed(machine, 6) & 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: return (input_port_read(machine, "KEY0") & input_port_read(machine, "KEY1") & input_port_read(machine, "KEY2")
+ & input_port_read(machine, "KEY3") & input_port_read(machine, "KEY4"));
}
break;
}
@@ -457,58 +443,47 @@ READ8_HANDLER( nb1413m3_inputport2_r )
{
switch (nb1413m3_type)
{
- case NB1413M3_PASTELG:
- case NB1413M3_THREEDS:
- case NB1413M3_TAIWANMB:
- switch ((nb1413m3_inputport ^ 0xff) & 0x1f)
- {
- case 0x01: return input_port_read_indexed(machine, 9);
- case 0x02: return input_port_read_indexed(machine, 10);
- case 0x04: return input_port_read_indexed(machine, 11);
- case 0x08: return input_port_read_indexed(machine, 12);
- case 0x10: return input_port_read_indexed(machine, 13);
- default: return (input_port_read_indexed(machine, 9) & input_port_read_indexed(machine, 10) & input_port_read_indexed(machine, 11) & input_port_read_indexed(machine, 12) & input_port_read_indexed(machine, 13));
- }
- break;
case NB1413M3_HYHOO:
case NB1413M3_HYHOO2:
switch ((nb1413m3_inputport ^ 0xff) & 0x07)
{
case 0x01: return 0xff;
case 0x02: return 0xff;
- case 0x04: return input_port_read_indexed(machine, 5);
+ case 0x04: return input_port_read(machine, "IN2");
default: return 0xff;
}
break;
case NB1413M3_MSJIKEN:
case NB1413M3_TELMAHJN:
- if (input_port_read_indexed(machine, 0) & 0x80)
+ if (input_port_read(machine, "DSWA") & 0x80)
{
switch ((nb1413m3_inputport ^ 0xff) & 0x1f)
{
- case 0x01: return input_port_read_indexed(machine, 8);
- case 0x02: return input_port_read_indexed(machine, 9);
- case 0x04: return input_port_read_indexed(machine, 10);
- case 0x08: return input_port_read_indexed(machine, 11);
- case 0x10: return input_port_read_indexed(machine, 12);
- default: return (input_port_read_indexed(machine, 8) & input_port_read_indexed(machine, 9) & input_port_read_indexed(machine, 10) & input_port_read_indexed(machine, 11) & input_port_read_indexed(machine, 12));
+ case 0x01: return input_port_read(machine, "KEY5");
+ case 0x02: return input_port_read(machine, "KEY6");
+ case 0x04: return input_port_read(machine, "KEY7");
+ case 0x08: return input_port_read(machine, "KEY8");
+ case 0x10: return input_port_read(machine, "KEY9");
+ default: return (input_port_read(machine, "KEY5") & input_port_read(machine, "KEY6") & input_port_read(machine, "KEY7")
+ & input_port_read(machine, "KEY8") & input_port_read(machine, "KEY9"));
}
}
- else return input_port_read_indexed(machine, 13);
+ else return input_port_read(machine, "JAMMA1");
break;
case NB1413M3_PAIRSNB:
case NB1413M3_PAIRSTEN:
- return input_port_read_indexed(machine, 4);
+ return input_port_read(machine, "P2");
break;
default:
switch ((nb1413m3_inputport ^ 0xff) & 0x1f)
{
- case 0x01: return input_port_read_indexed(machine, 8);
- case 0x02: return input_port_read_indexed(machine, 9);
- case 0x04: return input_port_read_indexed(machine, 10);
- case 0x08: return input_port_read_indexed(machine, 11);
- case 0x10: return input_port_read_indexed(machine, 12);
- default: return (input_port_read_indexed(machine, 8) & input_port_read_indexed(machine, 9) & input_port_read_indexed(machine, 10) & input_port_read_indexed(machine, 11) & input_port_read_indexed(machine, 12));
+ case 0x01: return input_port_read(machine, "KEY5");
+ case 0x02: return input_port_read(machine, "KEY6");
+ case 0x04: return input_port_read(machine, "KEY7");
+ case 0x08: return input_port_read(machine, "KEY8");
+ case 0x10: return input_port_read(machine, "KEY9");
+ default: return (input_port_read(machine, "KEY5") & input_port_read(machine, "KEY6") & input_port_read(machine, "KEY7")
+ & input_port_read(machine, "KEY8") & input_port_read(machine, "KEY9"));
}
break;
}
@@ -537,7 +512,7 @@ READ8_HANDLER( nb1413m3_inputport3_r )
case NB1413M3_MAIKO:
case NB1413M3_MMAIKO:
case NB1413M3_HANAOJI:
- return ((input_port_read_indexed(machine, 13) & 0xfd) | ((nb1413m3_outcoin_flag & 0x01) << 1));
+ return ((input_port_read(machine, "PORT0-2") & 0xfd) | ((nb1413m3_outcoin_flag & 0x01) << 1));
break;
default:
return 0xff;
@@ -551,16 +526,16 @@ READ8_HANDLER( nb1413m3_dipsw1_r )
{
case NB1413M3_KANATUEN:
case NB1413M3_KYUHITO:
- return input_port_read_indexed(machine, 1);
+ return input_port_read(machine, "DSWB");
break;
case NB1413M3_TAIWANMB:
- return ((input_port_read_indexed(machine, 0) & 0xf0) | ((input_port_read_indexed(machine, 1) & 0xf0) >> 4));
+ return ((input_port_read(machine, "DSWA") & 0xf0) | ((input_port_read(machine, "DSWB") & 0xf0) >> 4));
break;
case NB1413M3_OTONANO:
case NB1413M3_MJCAMERA:
case NB1413M3_IDHIMITU:
case NB1413M3_KAGUYA2:
- return (((input_port_read_indexed(machine, 0) & 0x0f) << 4) | (input_port_read_indexed(machine, 1) & 0x0f));
+ return (((input_port_read(machine, "DSWA") & 0x0f) << 4) | (input_port_read(machine, "DSWB") & 0x0f));
break;
case NB1413M3_SCANDAL:
case NB1413M3_SCANDALM:
@@ -572,7 +547,7 @@ READ8_HANDLER( nb1413m3_dipsw1_r )
case NB1413M3_UCHUUAI:
case NB1413M3_TOKIMBSJ:
case NB1413M3_TOKYOGAL:
- return ((input_port_read_indexed(machine, 0) & 0x0f) | ((input_port_read_indexed(machine, 1) & 0x0f) << 4));
+ return ((input_port_read(machine, "DSWA") & 0x0f) | ((input_port_read(machine, "DSWB") & 0x0f) << 4));
break;
case NB1413M3_TRIPLEW1:
case NB1413M3_NTOPSTAR:
@@ -583,13 +558,13 @@ READ8_HANDLER( nb1413m3_dipsw1_r )
case NB1413M3_MJLSTORY:
case NB1413M3_QMHAYAKU:
case NB1413M3_MJGOTTUB:
- return (((input_port_read_indexed(machine, 1) & 0x01) >> 0) | ((input_port_read_indexed(machine, 1) & 0x04) >> 1) |
- ((input_port_read_indexed(machine, 1) & 0x10) >> 2) | ((input_port_read_indexed(machine, 1) & 0x40) >> 3) |
- ((input_port_read_indexed(machine, 0) & 0x01) << 4) | ((input_port_read_indexed(machine, 0) & 0x04) << 3) |
- ((input_port_read_indexed(machine, 0) & 0x10) << 2) | ((input_port_read_indexed(machine, 0) & 0x40) << 1));
+ return (((input_port_read(machine, "DSWB") & 0x01) >> 0) | ((input_port_read(machine, "DSWB") & 0x04) >> 1) |
+ ((input_port_read(machine, "DSWB") & 0x10) >> 2) | ((input_port_read(machine, "DSWB") & 0x40) >> 3) |
+ ((input_port_read(machine, "DSWA") & 0x01) << 4) | ((input_port_read(machine, "DSWA") & 0x04) << 3) |
+ ((input_port_read(machine, "DSWA") & 0x10) << 2) | ((input_port_read(machine, "DSWA") & 0x40) << 1));
break;
default:
- return input_port_read_indexed(machine, 0);
+ return input_port_read(machine, "DSWA");
break;
}
}
@@ -600,16 +575,16 @@ READ8_HANDLER( nb1413m3_dipsw2_r )
{
case NB1413M3_KANATUEN:
case NB1413M3_KYUHITO:
- return input_port_read_indexed(machine, 0);
+ return input_port_read(machine, "DSWA");
break;
case NB1413M3_TAIWANMB:
- return (((input_port_read_indexed(machine, 0) & 0x0f) << 4) | (input_port_read_indexed(machine, 1) & 0x0f));
+ return (((input_port_read(machine, "DSWA") & 0x0f) << 4) | (input_port_read(machine, "DSWB") & 0x0f));
break;
case NB1413M3_OTONANO:
case NB1413M3_MJCAMERA:
case NB1413M3_IDHIMITU:
case NB1413M3_KAGUYA2:
- return ((input_port_read_indexed(machine, 0) & 0xf0) | ((input_port_read_indexed(machine, 1) & 0xf0) >> 4));
+ return ((input_port_read(machine, "DSWA") & 0xf0) | ((input_port_read(machine, "DSWB") & 0xf0) >> 4));
break;
case NB1413M3_SCANDAL:
case NB1413M3_SCANDALM:
@@ -621,7 +596,7 @@ READ8_HANDLER( nb1413m3_dipsw2_r )
case NB1413M3_UCHUUAI:
case NB1413M3_TOKIMBSJ:
case NB1413M3_TOKYOGAL:
- return (((input_port_read_indexed(machine, 0) & 0xf0) >> 4) | (input_port_read_indexed(machine, 1) & 0xf0));
+ return (((input_port_read(machine, "DSWA") & 0xf0) >> 4) | (input_port_read(machine, "DSWB") & 0xf0));
break;
case NB1413M3_TRIPLEW1:
case NB1413M3_NTOPSTAR:
@@ -632,25 +607,25 @@ READ8_HANDLER( nb1413m3_dipsw2_r )
case NB1413M3_MJLSTORY:
case NB1413M3_QMHAYAKU:
case NB1413M3_MJGOTTUB:
- return (((input_port_read_indexed(machine, 1) & 0x02) >> 1) | ((input_port_read_indexed(machine, 1) & 0x08) >> 2) |
- ((input_port_read_indexed(machine, 1) & 0x20) >> 3) | ((input_port_read_indexed(machine, 1) & 0x80) >> 4) |
- ((input_port_read_indexed(machine, 0) & 0x02) << 3) | ((input_port_read_indexed(machine, 0) & 0x08) << 2) |
- ((input_port_read_indexed(machine, 0) & 0x20) << 1) | ((input_port_read_indexed(machine, 0) & 0x80) << 0));
+ return (((input_port_read(machine, "DSWB") & 0x02) >> 1) | ((input_port_read(machine, "DSWB") & 0x08) >> 2) |
+ ((input_port_read(machine, "DSWB") & 0x20) >> 3) | ((input_port_read(machine, "DSWB") & 0x80) >> 4) |
+ ((input_port_read(machine, "DSWA") & 0x02) << 3) | ((input_port_read(machine, "DSWA") & 0x08) << 2) |
+ ((input_port_read(machine, "DSWA") & 0x20) << 1) | ((input_port_read(machine, "DSWA") & 0x80) << 0));
break;
default:
- return input_port_read_indexed(machine, 1);
+ return input_port_read(machine, "DSWB");
break;
}
}
READ8_HANDLER( nb1413m3_dipsw3_l_r )
{
- return ((input_port_read_indexed(machine, 2) & 0xf0) >> 4);
+ return ((input_port_read(machine, "DSWC") & 0xf0) >> 4);
}
READ8_HANDLER( nb1413m3_dipsw3_h_r )
{
- return ((input_port_read_indexed(machine, 2) & 0x0f) >> 0);
+ return ((input_port_read(machine, "DSWC") & 0x0f) >> 0);
}
WRITE8_HANDLER( nb1413m3_outcoin_w )
@@ -706,3 +681,106 @@ WRITE8_HANDLER( nb1413m3_vcrctrl_w )
set_led_status(2, 0);
}
}
+
+/* Nichibutsu Mahjong games share a common control panel */
+INPUT_PORTS_START( nbmjcontrols )
+ PORT_START_TAG("KEY0") /* (3) PORT 1-1 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_KAN )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_M )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_I )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_E )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_A )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START_TAG("KEY1") /* (4) PORT 1-2 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_BET )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_REACH )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_N )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_J )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_F )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_B )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START_TAG("KEY2") /* (5) PORT 1-3 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_RON )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_CHI )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_K )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_G )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_C )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START_TAG("KEY3") /* (6) PORT 1-4 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_L )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_H )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_D )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START_TAG("KEY4") /* (7) PORT 1-5 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_BIG )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP )
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE )
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START_TAG("KEY5") /* (6) PORT 2-1 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_M ) PORT_PLAYER(2)
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_PLAYER(2)
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_PLAYER(2)
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_PLAYER(2)
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START_TAG("KEY6") /* (7) PORT 2-2 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_BET ) PORT_PLAYER(2)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_PLAYER(2)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_N ) PORT_PLAYER(2)
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_PLAYER(2)
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_PLAYER(2)
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_PLAYER(2)
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START_TAG("KEY7") /* (8) PORT 2-3 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) PORT_PLAYER(2)
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_K ) PORT_PLAYER(2)
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_PLAYER(2)
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_PLAYER(2)
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START_TAG("KEY8") /* (9) PORT 2-4 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) PORT_PLAYER(2)
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_PLAYER(2)
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_PLAYER(2)
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_PLAYER(2)
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START_TAG("KEY9") /* (10) PORT 2-5 */
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_SMALL ) PORT_PLAYER(2)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_BIG ) PORT_PLAYER(2)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_FLIP_FLOP ) PORT_PLAYER(2)
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_DOUBLE_UP ) PORT_PLAYER(2)
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_MAHJONG_SCORE ) PORT_PLAYER(2)
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_MAHJONG_LAST_CHANCE ) PORT_PLAYER(2)
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+INPUT_PORTS_END