summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/ojankohs.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/ojankohs.c')
-rw-r--r--src/mame/drivers/ojankohs.c269
1 files changed, 93 insertions, 176 deletions
diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c
index a52fb4c2568..1629478dcc0 100644
--- a/src/mame/drivers/ojankohs.c
+++ b/src/mame/drivers/ojankohs.c
@@ -145,18 +145,18 @@ static READ8_HANDLER( ojankohs_keymatrix_r )
int ret;
switch (ojankohs_portselect) {
- case 0x01: ret = input_port_read(machine, "IN4"); break;
- case 0x02: ret = input_port_read(machine, "IN5"); break;
- case 0x04: ret = input_port_read(machine, "IN6"); break;
- case 0x08: ret = input_port_read(machine, "IN7"); break;
- case 0x10: ret = input_port_read(machine, "IN8"); break;
+ case 0x01: ret = input_port_read(machine, "KEY0"); break;
+ case 0x02: ret = input_port_read(machine, "KEY1"); break;
+ case 0x04: ret = input_port_read(machine, "KEY2"); break;
+ case 0x08: ret = input_port_read(machine, "KEY3"); break;
+ case 0x10: ret = input_port_read(machine, "KEY4"); break;
case 0x20: ret = 0xff; break;
case 0x3f: ret = 0xff;
- ret &= input_port_read(machine, "IN4");
- ret &= input_port_read(machine, "IN5");
- ret &= input_port_read(machine, "IN6");
- ret &= input_port_read(machine, "IN7");
- ret &= input_port_read(machine, "IN8");
+ ret &= input_port_read(machine, "KEY0");
+ ret &= input_port_read(machine, "KEY1");
+ ret &= input_port_read(machine, "KEY2");
+ ret &= input_port_read(machine, "KEY3");
+ ret &= input_port_read(machine, "KEY4");
break;
default: ret = 0xff;
logerror("PC:%04X unknown %02X\n", activecpu_get_pc(), ojankohs_portselect);
@@ -170,13 +170,18 @@ static READ8_HANDLER( ojankoc_keymatrix_r )
{
int i;
int ret = 0;
+ static const char *const keynames[2][5] =
+ {
+ { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4" },
+ { "KEY5", "KEY6", "KEY7", "KEY8", "KEY9" }
+ };
for (i = 0; i < 5; i++) {
if (~ojankohs_portselect & (1 << i))
- ret |= input_port_read_indexed(machine, i + offset * 5 + 2);
+ ret |= input_port_read(machine, keynames[offset][i]);
}
- return (ret & 0x3f) | (input_port_read_indexed(machine, 12 + offset) & 0xc0);
+ return (ret & 0x3f) | (input_port_read(machine, offset ? "IN1" : "IN0") & 0xc0);
}
static READ8_HANDLER( ojankohs_ay8910_0_r )
@@ -349,6 +354,57 @@ static ADDRESS_MAP_START( writeport_ojankoc, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xff, 0xff) AM_WRITE(AY8910_control_port_0_w)
ADDRESS_MAP_END
+static INPUT_PORTS_START( mahjong_p1 )
+ PORT_START_TAG("KEY0") /* (4) PORT 1-0 */
+ 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_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START_TAG("KEY1") /* (5) PORT 1-1 */
+ 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_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START_TAG("KEY2") /* (6) PORT 1-2 */
+ 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_TAG("KEY3") /* (7) PORT 1-3 */
+ 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 )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+ PORT_START_TAG("KEY4") /* (8) PORT 1-4 */
+ 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( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+INPUT_PORTS_END
static INPUT_PORTS_START( ojankohs )
PORT_START_TAG("IN0") /* (0) TEST SW */
@@ -408,55 +464,7 @@ static INPUT_PORTS_START( ojankohs )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("IN4") /* (4) PORT 1-0 */
- 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_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("IN5") /* (5) PORT 1-1 */
- 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_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("IN6") /* (6) PORT 1-2 */
- 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_TAG("IN7") /* (7) PORT 1-3 */
- 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 )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("IN8") /* (8) PORT 1-4 */
- 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( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_INCLUDE( mahjong_p1 )
INPUT_PORTS_END
static INPUT_PORTS_START( ojankoy )
@@ -527,55 +535,7 @@ static INPUT_PORTS_START( ojankoy )
PORT_DIPSETTING( 0x80, "Yes / No" )
PORT_DIPSETTING( 0x00, "No / Yes" )
- PORT_START_TAG("IN4") /* (4) PORT 1-0 */
- 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_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("IN5") /* (5) PORT 1-1 */
- 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_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("IN6") /* (6) PORT 1-2 */
- 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_TAG("IN7") /* (7) PORT 1-3 */
- 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 )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("IN8") /* (8) PORT 1-4 */
- 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( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_INCLUDE( mahjong_p1 )
INPUT_PORTS_END
static INPUT_PORTS_START( ccasino )
@@ -651,55 +611,7 @@ static INPUT_PORTS_START( ccasino )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN4") /* (4) PORT 1-0 */
- 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_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("IN5") /* (5) PORT 1-1 */
- 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_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("IN6") /* (6) PORT 1-2 */
- 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_TAG("IN7") /* (7) PORT 1-3 */
- 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 )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
- PORT_START_TAG("IN8") /* (8) PORT 1-4 */
- 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( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_INCLUDE( mahjong_p1 )
PORT_START_TAG("DSW3") /* (9) DIPSW-3 */
PORT_DIPNAME( 0x01, 0x01, "DIPSW 3-1" )
@@ -805,52 +717,57 @@ static INPUT_PORTS_START( ojankoc )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START_TAG("IN2") /* (2) PORT 1-0 */
+ PORT_START_TAG("KEY0") /* (4) PORT 1-0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_A )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_E )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_I )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_MAHJONG_M )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_MAHJONG_KAN )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START1 )
- PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN3") /* (3) PORT 1-1 */
+ PORT_START_TAG("KEY1") /* (5) PORT 1-1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_B )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_F )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_J )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_MAHJONG_N )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_MAHJONG_REACH )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_MAHJONG_BET )
- PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN4") /* (4) PORT 1-2 */
+ PORT_START_TAG("KEY2") /* (6) PORT 1-2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_C )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_G )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_K )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_MAHJONG_CHI )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_MAHJONG_RON )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN5") /* (5) PORT 1-3 */
+ PORT_START_TAG("KEY3") /* (7) PORT 1-3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_D )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_H )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_L )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_MAHJONG_PON )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN6") /* (6) PORT 1-4 */
+ PORT_START_TAG("KEY4") /* (8) PORT 1-4 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_LAST_CHANCE )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_SCORE )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_DOUBLE_UP )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_MAHJONG_FLIP_FLOP )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_MAHJONG_BIG )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_MAHJONG_SMALL )
- PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN7") /* (7) PORT 2-0 */
+ PORT_START_TAG("KEY5") /* (7) PORT 2-0 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_A )PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_E )PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_I )PORT_PLAYER(2)
@@ -859,7 +776,7 @@ static INPUT_PORTS_START( ojankoc )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START2 )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN8") /* (8) PORT 2-1 */
+ PORT_START_TAG("KEY6") /* (8) PORT 2-1 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_B )PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_F )PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_J )PORT_PLAYER(2)
@@ -868,7 +785,7 @@ static INPUT_PORTS_START( ojankoc )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_MAHJONG_BET )PORT_PLAYER(2)
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN9") /* (9) PORT 2-2 */
+ PORT_START_TAG("KEY7") /* (9) PORT 2-2 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_C )PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_G )PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_K )PORT_PLAYER(2)
@@ -877,7 +794,7 @@ static INPUT_PORTS_START( ojankoc )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN10") /* (10) PORT 2-3 */
+ PORT_START_TAG("KEY8") /* (10) PORT 2-3 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_D )PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_H )PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_L )PORT_PLAYER(2)
@@ -886,7 +803,7 @@ static INPUT_PORTS_START( ojankoc )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN11") /* (11) PORT 2-4 */
+ PORT_START_TAG("KEY9") /* (11) PORT 2-4 */
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_MAHJONG_LAST_CHANCE )PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_MAHJONG_SCORE )PORT_PLAYER(2)
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_MAHJONG_DOUBLE_UP )PORT_PLAYER(2)
@@ -895,12 +812,12 @@ static INPUT_PORTS_START( ojankoc )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_MAHJONG_SMALL )PORT_PLAYER(2)
PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
- PORT_START_TAG("IN12") /* IN1 (12) */
+ PORT_START_TAG("IN0") /* IN1 (12) */
PORT_BIT( 0x3f, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
- PORT_START_TAG("IN13") /* IN2 (13) */
+ PORT_START_TAG("IN1") /* IN2 (13) */
PORT_BIT( 0x3f, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )